]> git.wh0rd.org - tt-rss.git/blobdiff - index.php
optimize loading of external libraries a bit
[tt-rss.git] / index.php
index f07ee056a7f9f75d7e3c4bba181dc110570de472..6d9608a38439e95565bd1669542b5dbffafc7ff0 100644 (file)
--- a/index.php
+++ b/index.php
@@ -5,6 +5,13 @@
                exit;
        }
 
+       // we need a separate check here because functions.php might get parsed
+       // incorrectly before 5.3 because of :: syntax.
+       if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+               print "<b>Fatal Error</b>: PHP version 5.3.0 or newer required.\n";
+               exit;
+       }
+
        set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
                get_include_path());
 
@@ -37,8 +44,6 @@
 
        login_sequence($link);
 
-       $dt_add = time();
-
        no_cache_incantation();
 
        header('Content-Type: text/html; charset=utf-8');
 <html>
 <head>
        <title>Tiny Tiny RSS</title>
-       <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
-       <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
-       <link rel="stylesheet" type="text/css" href="cdm.css?<?php echo $dt_add ?>"/>
 
-       <?php print_theme_includes($link) ?>
+       <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+       <?php echo stylesheet_tag("tt-rss.css"); ?>
+       <?php echo stylesheet_tag("cdm.css"); ?>
+
        <?php print_user_stylesheet($link) ?>
 
-       <script type="text/javascript">
-       </script>
+       <style type="text/css">
+       <?php
+               foreach ($pluginhost->get_plugins() as $n => $p) {
+                       if (method_exists($p, "get_css")) {
+                               echo $p->get_css();
+                       }
+               }
+       ?>
+       </style>
 
        <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
-       <script type="text/javascript" src="lib/prototype.js"></script>
-       <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
-       <script type="text/javascript" src="lib/dojo/dojo.js"></script>
-       <script type="text/javascript" src="lib/dijit/dijit.js"></script>
-       <script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
+       <?php
+       foreach (array("lib/prototype.js",
+                               "lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls",
+                               "lib/dojo/dojo.js",
+                               "lib/dijit/dijit.js",
+                               "lib/dojo/tt-rss-layer.js",
+                               "localized_js.php",
+                               "errors.php?mode=js") as $jsfile) {
+
+               echo javascript_tag($jsfile);
 
-       <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
+       } ?>
 
        <script type="text/javascript">
        <?php
-               require 'lib/jsmin.php';
+               require 'lib/jshrink/Minifier.php';
 
                global $pluginhost;
 
                foreach ($pluginhost->get_plugins() as $n => $p) {
                        if (method_exists($p, "get_js")) {
-                               echo JSMin::minify($p->get_js());
+                               echo JShrink\Minifier::minify($p->get_js());
                        }
                }
 
-               foreach (array("tt-rss", "functions", "feedlist", "viewfeed", "FeedTree") as $js) {
-                       if (!isset($_GET['debug'])) {
-                               echo JSMin::minify(file_get_contents("js/$js.js"));
-                       } else {
-                               echo file_get_contents("js/$js.js");
-                       }
-               }
+               print get_minified_js(array("tt-rss",
+                       "functions", "feedlist", "viewfeed", "FeedTree"));
+
        ?>
        </script>
 
                title="<?php echo __("Communication problem with server.") ?>"
                src="<?php echo theme_image($link, 'images/alert.png') ?>"/>
 
-       <?php if (!$_SESSION["hide_hello"]) { ?>
-                       <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
-       <?php } ?>
-       <a href="prefs.php"><?php echo __('Preferences') ?></a>
-
-       <?php if (defined('FEEDBACK_URL') && FEEDBACK_URL) { ?>
-               | <a target="_blank" class="feedback" href="<?php echo FEEDBACK_URL ?>">
-                               <?php echo __('Comments?') ?></a>
-       <?php } ?>
-
-       <?php if (!$_SESSION["hide_logout"]) { ?>
-                       | <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
-       <?php } ?>
-
        <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
                width="13" height="13"
                src="<?php echo theme_image($link, 'images/new_version.png') ?>"
 </div>
 
 <div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
-<div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs">
-<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"
-       title="<?php echo __("News") ?>">
+<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap">
 
 <div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
        <div id="main-toolbar" dojoType="dijit.Toolbar">
                </form>
 
                <div class="actionChooser">
+
+                       <button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
+                               title="<?php echo __("Communication problem with server.") ?>">
+                       <img
+                               src="<?php echo theme_image($link, 'images/alert.png') ?>" />
+                       </button>
+
+                       <button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
+                       <img onclick="newVersionDlg()"
+                               src="<?php echo theme_image($link, '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">
+                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcPrefs')"><?php echo __('Preferences...') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcSearch')"><?php echo __('Search...') ?></div>
                                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
                                        <?php } ?>
                                                <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
-                                               <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
-
+                                       <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
+                                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
+                                       <?php } ?>
                                        <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>
+                                       <?php if (!$_SESSION["hide_logout"]) { ?>
+                                               <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcLogout')"><?php echo __('Logout') ?></div>
+                                       <?php } ?>
                                </div>
                        </div>
                </div>
 </div>
 </div>
 </div>
-</div>
 
 <?php db_close($link); ?>