]> git.wh0rd.org - tt-rss.git/blobdiff - index.php
css cleanup; remove auxDlg; add separate prefs.css
[tt-rss.git] / index.php
index d958e2b891d76078c4671ce04d4e6db393db3b76..2aa4891eff0be65f3dd3d009e48657eebbce2910 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,15 +1,26 @@
 <?php
+       if (file_exists("install") && !file_exists("config.php")) {
+               header("Location: install/");
+       }
+
        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;
        }
 
+       // 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());
 
-       require_once "functions.php";
        require_once "sessions.php";
+       require_once "functions.php";
        require_once "sanity_check.php";
        require_once "version.php";
        require_once "config.php";
 
        $mobile = new Mobile_Detect();
 
+       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+
+       if (!init_connection($link)) return;
+
+       global $pluginhost;
+
        if (!$_REQUEST['mobile']) {
-               if ($mobile->isTablet()) {
-                       header('Location: digest.php');
+               if ($mobile->isTablet() && $pluginhost->get_plugin("digest")) {
+                       header('Location: backend.php?op=digest');
+                       exit;
+               } else if ($mobile->isMobile() && $pluginhost->get_plugin("mobile")) {
+                       header('Location: backend.php?op=mobile');
                        exit;
-               } else if ($mobile->isMobile()) {
-                       header('Location: mobile/index.php');
+               } else if ($mobile->isMobile() && $pluginhost->get_plugin("digest")) {
+                       header('Location: backend.php?op=digest');
                        exit;
                }
        }
 
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-       if (!init_connection($link)) return;
-
        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"/>
+       <link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.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",
+                               "errors.php?mode=js") as $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>
+               echo javascript_tag($jsfile);
+
+       } ?>
 
        <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"));
+
+               init_js_translations();
        ?>
        </script>
 
        </div>
 </div>
 
-<div id="header">
-       <?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') ?>"
-               title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
-               alt="new_version_icon"/>
-</div>
-
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"></div>
+<div style="display : none" onclick="Element.hide(this)" id="small_article_preview"></div>
 
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
 <div id="cmdline" style="display : none"></div>
-<div id="auxDlg" style="display : none"></div>
 <div id="headlines-tmp" style="display : none"></div>
 
 <div id="main" dojoType="dijit.layout.BorderContainer">
 </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">
                        <option value="marked"><?php echo __('Starred') ?></option>
                        <option value="published"><?php echo __('Published') ?></option>
                        <option value="unread"><?php echo __('Unread') ?></option>
+                       <option value="unread_first"><?php echo __('Unread First') ?></option>
+                       <option value="has_note"><?php echo __('With Note') ?></option>
                        <!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
-                       <option value="updated"><?php echo __('Updated') ?></option>
                </select>
 
                <select title="<?php echo __('Sort articles') ?>"
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
 
-               <button dojoType="dijit.form.Button" name="update"
+               <!-- deprecated -->
+               <button dojoType="dijit.form.Button" name="update" style="display : none"
                        onclick="viewCurrentFeed()">
                        <?php echo __('Update') ?></button>
 
                </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="images/alert.png" />
+                       </button>
+
+                       <button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
+                       <img onclick="newVersionDlg()"
+                               src="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('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
                                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
+                                       <?php if ($pluginhost->get_plugin("digest")) { ?>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
-                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
+                                       <?php } ?>
+                                               <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></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); ?>