Merge branch 'master' of git.fakecake.org:tt-rss

[tt-rss.git] / index.php
diff --git a/index.php b/index.php

index 526ebe772bfaa62c845751b6148cffb354c3297e..f7ff97c688ed8b354ede05ef0c292eecf85955ee 100644 (file)
--- a/index.php
+++ b/index.php
@@ -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");
+               if ($theme && theme_valid("$theme")) {
+                       echo stylesheet_tag(get_theme_path($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,6 +157,10 @@
  <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"
@@ -168,7 +176,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>
@@ -213,13 +220,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">
@@ -251,16 +251,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="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
-               </div>
-
-               <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">