Merge pull request #107 from ifireball/visible-unread

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index c634235abd99688aaabd29ea136ea716ae989368..371c4aff331b34630ad5498538cce82b85e586bb 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,10 +39,15 @@
                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() && $pluginhost->get_plugin("digest")) {
+                       header('Location: backend.php?op=digest');
+                       exit;
                }
        }
 
-
        login_sequence($link);
 
        no_cache_incantation();
@@ -56,6 +65,14 @@
        <?php echo stylesheet_tag("tt-rss.css"); ?>
        <?php echo stylesheet_tag("cdm.css"); ?>
 
+       <?php if ($_SESSION["uid"]) {
+               $theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
+               if ($theme) {
+                       echo stylesheet_tag("themes/$theme");
+               }
+       }
+       ?>
+
        <?php print_user_stylesheet($link) ?>
 
        <style type="text/css">
@@ -127,7 +144,6 @@
 
 <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">
@@ -161,6 +177,7 @@
                        <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> -->
                </select>
 
@@ -168,9 +185,8 @@
                        onchange="viewModeChanged()"
                        dojoType="dijit.form.Select" name="order_by">
                        <option selected="selected" value="default"><?php echo __('Default') ?></option>
-                       <option value="date"><?php echo __('Date') ?></option>
-                       <option value="title"><?php echo __('Title') ?></option>
-                       <option value="score"><?php echo __('Score') ?></option>
+                       <option value="feed_dates"><?php echo __('Newest first') ?></option>
+                       <option value="date_reverse"><?php echo __('Oldest first') ?></option>
                </select>
 
                <!-- deprecated -->
@@ -178,9 +194,15 @@
                        onclick="viewCurrentFeed()">
                        <?php echo __('Update') ?></button>
 
-               <button dojoType="dijit.form.Button"
-                       onclick="catchupCurrentFeed()">
-                       <?php echo __('Mark as read') ?></button>
+               <select title="<?php echo __('Mark feed as read') ?>"
+                       onchange="catchupCurrentFeed(this)"
+                       dojoType="dijit.form.Select" name="catchup_feed">
+                       <option selected="selected" value="default"><?php echo __('Mark as read') ?></option>
+                       <option value="all"><?php echo __('All articles') ?></option>
+                       <option value="1day"><?php echo __('Older than one day') ?></option>
+                       <option value="1week"><?php echo __('Older than one week') ?></option>
+                       <option value="2weeks"><?php echo __('Older than two weeks') ?></option>
+               </select>
 
                </form>
 
@@ -207,22 +229,20 @@
                                        <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('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
-                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRescoreFeed')"><?php echo __('Rescore feed') ?></div>
+                                       <!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRescoreFeed')"><?php echo __('Rescore feed') ?></div> -->
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
                                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></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")) { ?>
+                                       <!-- <?php if ($pluginhost->get_plugin("digest")) { ?>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></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 } ?>
+                                       <?php } ?> -->
+                                               <!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div> -->
+                                               <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
                                        <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('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>
@@ -245,10 +265,8 @@
                        </div>
                </div>
 
-               <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
                <div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom"
                        style="height : 50%" splitter="true"></div>
-               <?php } ?>
 
        </div>
 </div>