css cleanup; remove auxDlg; add separate prefs.css

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index 4cbd756a39af09de856c00cd7c934485ef47c2f7..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";
@@ -35,13 +39,15 @@
                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);
 
        no_cache_incantation();
@@ -72,6 +78,7 @@
        </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" />
 
        <?php
        foreach (array("lib/prototype.js",
@@ -79,7 +86,6 @@
                                "lib/dojo/dojo.js",
                                "lib/dijit/dijit.js",
                                "lib/dojo/tt-rss-layer.js",
-                               "localized_js.php",
                                "errors.php?mode=js") as $jsfile) {
 
                echo javascript_tag($jsfile);
@@ -101,6 +107,7 @@
                print get_minified_js(array("tt-rss",
                        "functions", "feedlist", "viewfeed", "FeedTree"));
 
+               init_js_translations();
        ?>
        </script>
 
@@ -125,21 +132,10 @@
        </div>
 </div>
 
-<div id="header">
-       <img id="net-alert" style="display : none"
-               title="<?php echo __("Communication problem with server.") ?>"
-               src="images/alert.png"/>
-
-       <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
-               width="13" height="13"
-               src="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">
@@ -172,8 +168,9 @@
                        <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') ?>"