diff options
author | YoungMin Park <[email protected]> | 2014-11-04 11:49:43 +0900 |
---|---|---|
committer | YoungMin Park <[email protected]> | 2014-11-04 11:49:43 +0900 |
commit | a5bbb2bec133bdee08b361628f32430ae3884107 (patch) | |
tree | b203105149ec234ebe155d5718d2cbb6390b4a45 /index.php | |
parent | 12727ad17d125eb2f3f243231ccca1cb0a5a7b4b (diff) | |
parent | 2f43089de1ead3f164b8b31967d1abbb784319fa (diff) |
Merge pull request #1 from gothfox/master
Update from original
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 31 |
1 files changed, 18 insertions, 13 deletions
@@ -56,15 +56,19 @@ <head> <title>Tiny Tiny RSS</title> - <?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> - <?php stylesheet_tag("css/layout.css"); ?> + <script type="text/javascript"> + var __ttrss_version = "<?php echo VERSION ?>" + </script> + + <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> + <?php echo stylesheet_tag("css/layout.css"); ?> <?php if ($_SESSION["uid"]) { $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false); if ($theme && file_exists("themes/$theme")) { - stylesheet_tag("themes/$theme"); + echo stylesheet_tag("themes/$theme"); } else { - stylesheet_tag("themes/default.css"); + echo stylesheet_tag("themes/default.css"); } } ?> @@ -86,19 +90,19 @@ <?php foreach (array("lib/prototype.js", - "lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls", + "lib/scriptaculous/scriptaculous.js?load=effects,controls", "lib/dojo/dojo.js", "lib/dojo/tt-rss-layer.js", "errors.php?mode=js") as $jsfile) { - javascript_tag($jsfile); + echo javascript_tag($jsfile); } ?> <script type="text/javascript"> require({cache:{}}); <?php - require 'lib/jshrink/Minifier.php'; + require_once 'lib/jshrink/Minifier.php'; print get_minified_js(array("tt-rss", "functions", "feedlist", "viewfeed", "FeedTree", "PluginHost")); @@ -134,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> @@ -153,11 +157,15 @@ <div id="toolbar" dojoType="dijit.layout.ContentPane" region="top"> <div id="main-toolbar" dojoType="dijit.Toolbar"> + <form id="headlines-toolbar" action="" onsubmit='return false'> + + </form> + <form id="main_toolbar_form" action="" onsubmit='return false'> <button dojoType="dijit.form.Button" id="collapse_feeds_btn" onclick="collapse_feedlist()" - title="<?php echo __('Collapse feedlist') ?>" style="display : inline"> + title="<?php echo __('Collapse feedlist') ?>" style="display : none"> <<</button> <select name="view_mode" title="<?php echo __('Show articles') ?>" @@ -210,7 +218,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"> @@ -257,9 +265,6 @@ <div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center"> - <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" |