quick feed add dialog + related interface tweaks

[tt-rss.git] / tt-rss.php

diff --git a/tt-rss.php b/tt-rss.php
index b555179dea77920fc78d82815f77428fb4f6dc98..cf11e564d51d568ad73c7f4acc33919de6e8abeb 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -34,7 +34,7 @@
 <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main">
 <? if (DISPLAY_HEADER) { ?>
 <tr>
-       <td colspan="2">
+       <td colspan="2" class="headerBox">
                <table cellspacing="0" cellpadding="0" width="100%"><tr>
                        <td class="header" valign="middle">     
                                <img src="images/ttrss_logo.png" alt="logo">    
@@ -43,6 +43,14 @@
                                <div id="notify"><span id="notify_body"></div>
                        </td>
                </tr></table>
+
+               <div id="qafDialog">
+                       Feed URL: <input id="qafInput">
+                       <input class="button"
+                               type="submit" onclick="javascript:qafAdd()" value="Add feed">
+                       <input class="button"
+                               type="submit" onclick="javascript:cancelDialog(this)" value="Cancel">
+               </div>
        </td>
 </tr>
 <? } ?>
@@ -56,6 +64,7 @@
                </div>
 
                <iframe frameborder="0" 
+                       src="backend.php?op=error&msg=Loading,%20please wait..."
                        id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe>
        
                <p align="center">All feeds:
@@ -79,6 +88,11 @@
                        <input id="searchbox"
                        onblur="javascript:enableHotkeys()" onfocus="javascript:disableHotkeys()"
                        onchange="javascript:search()">
+               <select id="searchmodebox">
+                       <option>This feed</option>
+                       <option>All feeds</option>
+               </select>
+               
                <input type="submit" 
                        class="button" onclick="javascript:search()" value="Search">
                <!-- <input type="submit" 
@@ -90,27 +104,51 @@
                        <option>All Articles</option>
                        <option>Starred</option>
                        <option selected>Unread</option>
+                       <option>Unread or Starred</option>
+                       <option>Unread or Updated</option>
                </select>
 
                &nbsp;Limit:
 
                <select id="limitbox" onchange="javascript:viewCurrentFeed(0, '')">
-                       <option>15</option>
-                       <option selected>30</option>
-                       <option>60</option>
-                       <option>All</option>
+               
+               <?
+                       $limits = array(15 => 15, 30 => 30, 60 => 60);
+                       
+                       if (DEFAULT_ARTILE_LIMIT >= 0) {
+                               $limits[DEFAULT_ARTICLE_LIMIT] = DEFAULT_ARTICLE_LIMIT; 
+                       }
+                       
+                       asort($limits);
+
+                       array_push($limits, 0);
+
+                       foreach ($limits as $key) {
+                               print "<option";
+                               if ($key == DEFAULT_ARTICLE_LIMIT) { print " selected"; }
+                               print ">";
+                               
+                               if ($limits[$key] == 0) { print "All"; } else { print $limits[$key]; }
+                               
+                               print "</option>";
+                       } ?>
+                       
                </select>
 
                &nbsp;Feed: <input class="button" type="submit"
                        onclick="javascript:viewCurrentFeed(0, 'ForceUpdate')" value="Update">
 
-               <input class="button" type="submit"
+               <input class="button" type="submit" id="btnMarkFeedAsRead"
                        onclick="javascript:viewCurrentFeed(0, 'MarkAllRead')" value="Mark as read">
 
                </td>
                <td align="right">
-                       <input type="submit" onclick="gotoPreferences()" 
-                               class="button" value="Preferences"></td>
+                       <select id="quickMenuChooser">
+                               <option selected>Preferences</option>
+                               <option>Add new feed</option>
+                               <!-- <option>Edit this feed</option> -->
+                       </select>
+                       <input type="submit" class="button" onclick="quickMenuGo()" value="Go">
                </td>
                </tr>
                </table>