option DISPLAY_FEEDLIST_ACTIONS, consolidate actions in one dropbox

diff --git a/config.php-dist b/config.php-dist
index 9d86bddb25d29fb8733cc631fa5cbeaa0c0c9107..a879fddd4372fef3341accae0162d80df5c6cbec 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -61,5 +61,10 @@
        // */30 * * * * /usr/bin/wget -O /dev/null -T 600 "http://username:password@www.your-site.xxx/tt-rss/backend.php?op=rpc&subop=updateAllFeeds&daemon=1"
        //
 
+       define(DISPLAY_FEEDLIST_ACTIONS, false);
+       // display actions dropbox in feedlist, if disabled these actions are
+       // available in the global actions dropbox
+       
+
 ?>
 

diff --git a/tt-rss.js b/tt-rss.js
index 0fb61a117526bee3b22094a74f47dd70c8724d54..1e8b2454cf6f9a800293e1bedeeeac4af28bed8e 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -467,6 +467,22 @@ function quickMenuGo() {
                displayDlg("quickDelFeed", actid);
                return;
        }
+
+       if (opname.match("Update")) {
+               scheduleFeedUpdate(true);
+               return;
+       }
+
+       if (opname.match("Mark as read")) {
+               catchupAllFeeds();
+               return;
+       }
+
+       if (opname.match("Toggle display read")) {
+               toggleDispRead();
+               return;
+       }
+
 }
 
 function qafAdd() {

diff --git a/tt-rss.php b/tt-rss.php
index 34639c64fe33539df91455cc4518f6f07cebc930..8a2154957e60fae5ac994081b74aa49fd85feabf 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -61,7 +61,9 @@
                <iframe frameborder="0" 
                        src="backend.php?op=error&msg=Loading,%20please wait..."
                        id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe>
-       
+
+               <? if (DISPLAY_FEEDLIST_ACTIONS) { ?>
+
                <div align="center">All feeds: 
                
                <select id="allFeedsChooser">
@@ -74,6 +76,8 @@
 
                </div>
 
+               <? } ?>
+
        </td>
        <td valign="top" class="headlinesToolbarBox">
                <table width="100%" cellpadding="0" cellspacing="0">
@@ -139,11 +143,16 @@
                <td align="right">
                        Actions: <select id="quickMenuChooser">
                                <option selected>Preferences</option>
-                               <option disabled>-----</option>
-                               <option disabled>Feed actions:</option>
+                               <option disabled>--------</option>
+                               <option style="color : #5050aa" disabled>Feed actions:</option>
                                <option>&nbsp;&nbsp;Add new feed</option>
                                <option>&nbsp;&nbsp;Remove this feed</option>
                                <!-- <option>Edit this feed</option> -->
+                               <option disabled>--------</option>
+                               <option style="color : #5050aa" disabled>All feeds:</option>
+                               <option>&nbsp;&nbsp;Update</option>
+                               <option>&nbsp;&nbsp;Mark as read</option>
+                               <option>&nbsp;&nbsp;Toggle display read</option>
                        </select>
                        <input type="submit" class="button" onclick="quickMenuGo()" value="Go">
                </td>