send Last-Modified header with the local image

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index 281f46cf924e019b72044d5041aa340f691da8ff..7c823027351ec0747c73cdfa267233b94a87e0b5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -65,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">
@@ -136,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">
@@ -170,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>
 
@@ -177,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 -->