Merge branch 'fix-encl-img-attrs' into 'master'

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index 74498b8f45a7f4a3b1ee47feeba2d74422d03674..10c75480359024d42fde0693de43219f7dc63f8c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -65,8 +65,8 @@
 
        <?php if ($_SESSION["uid"]) {
                $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
-               if ($theme && file_exists("themes/$theme")) {
-                       echo stylesheet_tag("themes/$theme");
+               if ($theme && theme_valid("$theme")) {
+                       echo stylesheet_tag(get_theme_path($theme));
                } else {
                        echo stylesheet_tag("themes/default.css");
                }
@@ -140,7 +140,6 @@
 
 <div id="notify" class="notify"></div>
 <div id="cmdline" style="display : none"></div>
-<div id="headlines-tmp" style="display : none"></div>
 
 <div id="main" dojoType="dijit.layout.BorderContainer">
 
@@ -176,7 +175,6 @@
                        <option value="marked"><?php echo __('Starred') ?></option>
                        <option value="published"><?php echo __('Published') ?></option>
                        <option value="unread"><?php echo __('Unread') ?></option>
-                       <option value="unread_first"><?php echo __('Unread First') ?></option>
                        <option value="has_note"><?php echo __('With Note') ?></option>
                        <!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
                </select>
@@ -221,13 +219,6 @@
                                src="images/error.png" />
                        </button>
 
-                       <button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
-                       <img onclick="newVersionDlg()"
-                               src="images/new_version.png"
-                               title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" />
-                       </button>
-
-
                        <div dojoType="dijit.form.DropDownButton">
                                <span><?php echo __('Actions...') ?></span>
                                <div dojoType="dijit.Menu" style="display: none">
@@ -243,7 +234,6 @@
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
                                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
-                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div>
                                        <!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div> -->
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
@@ -259,13 +249,17 @@
                                        <?php } ?>
                                </div>
                        </div>
+
+                       <button id="updatesIcon" dojoType="dijit.form.Button" style="display : none">
+                               <img src="images/new_version.png" title="<?php echo __('Updates are available from Git.') ?>"/>
+                       </button>
                </div>
        </div> <!-- toolbar -->
 </div> <!-- toolbar pane -->
 
        <div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
 
-               <div id="floatingTitle" style="display : none"></div>
+               <div id="floatingTitle" style="visibility : hidden"></div>
 
                <div id="headlines-frame" dojoType="dijit.layout.ContentPane"
                                onscroll="headlines_scroll_handler(this)" region="center">