Merge pull request #422 from rwetzlmayr/master

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

index bf78be1f3c1f7c0a8616f2ef10dbb54038d695d2..74498b8f45a7f4a3b1ee47feeba2d74422d03674 100644 (file)
--- a/index.php
+++ b/index.php
@@ -56,14 +56,19 @@
  <head>
         <title>Tiny Tiny RSS</title>
  
+       <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("tt-rss.css"); ?>
-       <?php echo stylesheet_tag("cdm.css"); ?>
+       <?php echo 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")) {
                         echo stylesheet_tag("themes/$theme");
+               } else {
+                       echo stylesheet_tag("themes/default.css");
                 }
         }
         ?>
@@ -85,9 +90,8 @@
  
         <?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/dijit/dijit.js",
                                 "lib/dojo/tt-rss-layer.js",
                                 "errors.php?mode=js") as $jsfile) {
  
@@ -96,11 +100,12 @@
         } ?>
  
         <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"));
+                       "functions", "feedlist", "viewfeed", "FeedTree", "PluginHost"));
  
                 foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
                         if (method_exists($p, "get_js")) {
@@ -133,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>
  
@@ -152,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">
                         &lt;&lt;</button>
  
                 <select name="view_mode" title="<?php echo __('Show articles') ?>"
@@ -209,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">
@@ -256,8 +265,7 @@
  
         <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"
                                 onscroll="headlines_scroll_handler(this)" region="center">