Merge branch 'master' of git://github.com/syrnon/Tiny-Tiny-RSS into syrnon-master

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index c43d2db4a55101777fc3c91de8cefbe7bea3cccb..222a87ccb8ed8daeb27f136af59ce793fccdbdb0 100644 (file)
--- a/index.php
+++ b/index.php
@@ -57,13 +57,14 @@
        <title>Tiny Tiny RSS</title>
 
        <?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
-       <?php stylesheet_tag("tt-rss.css"); ?>
-       <?php stylesheet_tag("cdm.css"); ?>
+       <?php stylesheet_tag("css/layout.css"); ?>
 
        <?php if ($_SESSION["uid"]) {
                $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
-               if ($theme) {
+               if ($theme && file_exists("themes/$theme")) {
                        stylesheet_tag("themes/$theme");
+               } else {
+                       stylesheet_tag("themes/default.css");
                }
        }
        ?>
@@ -209,7 +210,7 @@
                        <button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
                                title="<?php echo __("Communication problem with server.") ?>">
                        <img
-                               src="images/alert.png" />
+                               src="images/error.png" />
                        </button>
 
                        <button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
@@ -259,6 +260,8 @@
                <div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
                </div>
 
+               <div id="floatingTitle" style="display : none"></div>
+
                <div id="headlines-frame" dojoType="dijit.layout.ContentPane"
                                onscroll="headlines_scroll_handler(this)" region="center">
                        <div id="headlinesInnerContainer">