diff options
| author | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
|---|---|---|
| committer | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
| commit | d9c042c4c536f1afbf206aeea09b0b127b7b6418 (patch) | |
| tree | 9d7ef18c6d9d4c8f8f4d1c9a5dbfceeb9fd5acf4 /index.php | |
| parent | cf42b79120290ee5866136a0c4656e6999f06045 (diff) | |
| parent | 4ca621a36016de1fbb5447e1c1de0b607ba94a7c (diff) | |
Merge branch 'master' into patch-1
Conflicts:
locale/de_DE/LC_MESSAGES/messages.po
Diffstat (limited to 'index.php')
| -rw-r--r-- | index.php | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -65,7 +65,7 @@ <?php if ($_SESSION["uid"]) { $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false); - if ($theme && file_exists("themes/$theme")) { + if ($theme && theme_valid("$theme")) { echo stylesheet_tag("themes/$theme"); } else { echo stylesheet_tag("themes/default.css"); @@ -138,7 +138,7 @@ </div> </div> -<div id="notify" class="notify" style="display : none"></div> +<div id="notify" class="notify"></div> <div id="cmdline" style="display : none"></div> <div id="headlines-tmp" style="display : none"></div> @@ -221,13 +221,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"> @@ -259,13 +252,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"> |