quick action to add filter, misc backend improvements

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

diff --git a/tt-rss.php b/tt-rss.php
index 55b06b56a6567b61654f094919a27938a34c4afe..5c15a507baa3f6aa830bd62801ff1958ce81cfc3 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -52,13 +52,13 @@
 <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main">
 <? if (get_pref($link, 'DISPLAY_HEADER')) { ?>
 <tr>
-       <td colspan="2">
+       <td colspan="2" class="headerBox">
                <table cellspacing="0" cellpadding="0" width="100%"><tr>
                        <td rowspan="2" class="header" valign="middle"> 
                                <img src="images/ttrss_logo.png" alt="logo">    
                        </td>
                        <td align="right" valign="top">
-                               <div id="notify"><span id="notify_body"></div>
+                               <div id="notify"><span id="notify_body">&nbsp;</span></div>
                        </td>
 
                        <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
@@ -73,7 +73,10 @@
        </td>
 </tr>
 <? } else { ?>
+<tr><td align="right" colspan="2">
+       <div id="notify"><span id="notify_body">&nbsp;</span></div>
        <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
+</td></tr>
 <? } ?>
 <tr>
        <td valign="top" rowspan="3" class="feeds"> 
@@ -86,16 +89,11 @@
                </td></tr>      
                <tr><td height="100%" width="100%" valign="top">
                
-               <!-- <div id="feeds">&nbsp;</div> -->
-
+               <? if (get_pref($link, 'DISPLAY_FEEDLIST_ACTIONS')) { ?>
 
                <iframe frameborder="0" 
                        src="backend.php?op=error&msg=Loading,%20please wait..."
-                       id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe>
-
-               </td></tr></table>
-
-               <? if (get_pref($link, 'DISPLAY_FEEDLIST_ACTIONS')) { ?>
+                       id="feeds-frame" name="feeds-frame" class="feedsFrameWithActions"> </iframe>
 
                <div align="center">All feeds: 
                
@@ -109,9 +107,16 @@
 
                </div>
                
+               <? } else { ?>
+
+               <iframe frameborder="0" 
+                       src="backend.php?op=error&msg=Loading,%20please wait..."
+                       id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe>
 
                <? } ?>
 
+               </td></tr></table>
+
        </td>
        <td valign="top" class="headlinesToolbarBox">
                <table width="100%" cellpadding="0" cellspacing="0">
@@ -128,9 +133,7 @@
                <input type="submit" 
                        class="button" onclick="javascript:search()" value="Search">
 
-               &nbsp; 
-               
-               View: 
+               &nbsp;View: 
                
                <select id="viewbox" onchange="javascript:viewCurrentFeed(0, '')">
                        <option>All Articles</option>
@@ -171,11 +174,19 @@
                
                </select>
 
+<!--           &nbsp;Selection:
+
+               <select id="headopbox">
+                       <option id="hopToggleRead">Toggle (un)read</option>
+               </select>
+
+               <input class="button" type="submit" onclick="headopGo()" value="Go"> -->
+
                &nbsp;Feed: <input class="button" type="submit"
                        onclick="javascript:viewCurrentFeed(0, 'ForceUpdate')" value="Update">
 
                <input class="button" type="submit" id="btnMarkFeedAsRead"
-                       onclick="javascript:viewCurrentFeed(0, 'MarkAllRead')" value="Mark as read">
+                       onclick="javascript:viewCurrentFeed(0, 'MarkAllRead')" value="Mark as read"> 
 
                </td>
                <td align="right">
@@ -183,14 +194,17 @@
                                <option id="qmcPrefs" selected>Preferences...</option>
                                <option disabled>--------</option>
                                <option style="color : #5050aa" disabled>Feed actions:</option>
-                               <option id="qmcAddFeed">&nbsp;&nbsp;Add new feed</option>
-                               <option id="qmcRemoveFeed">&nbsp;&nbsp;Remove this feed</option>
+                               <option id="qmcAddFeed">&nbsp;&nbsp;Add new feed...</option>
+                               <option id="qmcRemoveFeed">&nbsp;&nbsp;Remove this feed...</option>
                                <!-- <option>Edit this feed</option> -->
                                <option disabled>--------</option>
                                <option style="color : #5050aa" disabled>All feeds:</option>
                                <option id="qmcUpdateFeeds">&nbsp;&nbsp;Update</option>
                                <option id="qmcCatchupAll">&nbsp;&nbsp;Mark as read</option>
                                <option id="qmcShowOnlyUnread">&nbsp;&nbsp;Show only unread</option>
+                               <option disabled>--------</option>
+                               <option style="color : #5050aa" disabled>Other actions:</option>                                
+                               <option id="qmcAddFilter">&nbsp;&nbsp;Add filter...</option>
                        </select>
                        <input type="submit" class="button" onclick="quickMenuGo()" value="Go">
                </td>