add jsmin stuff to index.php

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index 5b5560a9a548a2552edf4746db213bf56f960ec7..3109e5b44832c3dc75850a2bbcfc0c2b0bd2fc89 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,5 +1,12 @@
 <?php
-       set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+       if (!file_exists("config.php")) {
+               print "<b>Fatal Error</b>: You forgot to copy
+               <b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
+               exit;
+       }
+
+       set_include_path(get_include_path() . PATH_SEPARATOR .
+               dirname(__FILE__) ."/include");
 
        require_once "functions.php";
        require_once "sessions.php";
@@ -10,7 +17,7 @@
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-       init_connection($link);
+       if (!init_connection($link)) return;
 
        login_sequence($link);
 
@@ -33,6 +40,9 @@
        <?php print_theme_includes($link) ?>
        <?php print_user_stylesheet($link) ?>
 
+       <script type="text/javascript">
+       </script>
+
        <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
        <script type="text/javascript" src="lib/prototype.js"></script>
@@ -42,12 +52,25 @@
        <script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
 
        <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="js/tt-rss.js?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="js/feedlist.js?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="js/viewfeed.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
 
+       <script type="text/javascript">
+       <?php
+               require 'jsmin.php';
+
+               foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
+                       $jsf = "js/".trim($p)."_button.js";
+                       if (file_exists($jsf)) {
+                               echo JSMin::minify(file_get_contents($jsf));
+                       }
+               }
+
+               foreach (array("tt-rss", "functions", "feedlist", "viewfeed", "FeedTree") as $js) {
+                       echo JSMin::minify(file_get_contents("js/$js.js"));
+               }
+       ?>
+       </script>
+
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
        <script type="text/javascript">
@@ -91,9 +114,7 @@
                alt="new_version_icon"/>
 </div>
 
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
-       <?php include "help/3.php" ?>
-</div>
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"></div>
 
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
 <div id="cmdline" style="display : none"></div>
@@ -175,7 +196,6 @@
                                        <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>
-                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAbout')"><?php echo __('About...') ?></div>
                                </div>
                        </div>
                </div>