Merge remote-tracking branch 'upstream/master'

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

index 4d1ff795b27cca2bb9f13db41e078003703c21bf..840959a18638f281486d3c9c734569ef7fe874f6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@
  
         // 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', '>='))) {
+       if (version_compare(PHP_VERSION, '5.3.0', '<')) {
                 print "<b>Fatal Error</b>: PHP version 5.3.0 or newer required.\n";
                 exit;
         }
@@ -55,15 +55,22 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
  <head>
-       <title>Tiny Tiny RSS</title>
+    <title><?php echo PAGE_TITLE ?></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_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"/>
  
@@ -78,23 +85,19 @@
  
         <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>