Merge remote-tracking branch 'upstream/master'

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index 53d31fc521f081165cda570027d838ccffcfc3cb..840959a18638f281486d3c9c734569ef7fe874f6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -62,8 +62,15 @@
 
        <?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>