]> git.wh0rd.org - tt-rss.git/blobdiff - index.php
css cleanup; remove auxDlg; add separate prefs.css
[tt-rss.git] / index.php
index 3d5b2cc435883a57a8aac984dc22ebf5f26d39a9..2aa4891eff0be65f3dd3d009e48657eebbce2910 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,4 +1,8 @@
 <?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";
                if ($mobile->isTablet() && $pluginhost->get_plugin("digest")) {
                        header('Location: backend.php?op=digest');
                        exit;
-               } else if ($mobile->isMobile()) {
-                       header('Location: mobile/index.php');
+               } else if ($mobile->isMobile() && $pluginhost->get_plugin("mobile")) {
+                       header('Location: backend.php?op=mobile');
+                       exit;
+               } else if ($mobile->isMobile() && $pluginhost->get_plugin("digest")) {
+                       header('Location: backend.php?op=digest');
                        exit;
                }
        }
 
-
        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 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) ?>
 
        </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) {
+
+               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"));
+
+               init_js_translations();
        ?>
        </script>
 
        </div>
 </div>
 
-<div id="header">
-       <img id="net-alert" style="display : none"
-               title="<?php echo __("Communication problem with server.") ?>"
-               src="<?php echo theme_image($link, 'images/alert.png') ?>"/>
-
-       <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 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">
                        <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>
 
                        <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') ?>" />
+                               src="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') ?>"
+                               src="images/new_version.png"
                                title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" />
                        </button>