rework actions

2 files changed, 21 insertions, 14 deletions

diff --git a/tt-rss.js b/tt-rss.js
index 5603c01ce..545d7915d 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -401,11 +401,17 @@ function init_second_stage() {
 	}
 }
 
-function quickMenuGo() {
-
+function quickMenuChange() {
 	var chooser = document.getElementById("quickMenuChooser");
 	var opid = chooser[chooser.selectedIndex].id;
 
+	chooser.selectedIndex = 0;
+	quickMenuGo(opid);
+}
+
+function quickMenuGo(opid) {
+
+
 	if (opid == "qmcPrefs") {
 		gotoPreferences();
 	}
@@ -570,11 +576,13 @@ function qfdDelete(feed_id) {
 }
 
 
-function allFeedsMenuGo() {
+function allFeedsMenuChange() {
 	var chooser = document.getElementById("allFeedsChooser");
 
 	var opname = chooser[chooser.selectedIndex].text;
 
+	chooser.selectedIndex = 0;
+
 	if (opname == "Update") {
 		scheduleFeedUpdate(true);
 		return;
diff --git a/tt-rss.php b/tt-rss.php
index f0203e556..821c9b107 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -106,16 +106,15 @@
 			src="backend.php?op=error&msg=Loading,%20please wait..."
 			id="feeds-frame" name="feeds-frame" class="feedsFrameWithActions"> </iframe>
 
-		<div align="center">All feeds: 
+		<div align="center"> 
 		
-		<select id="allFeedsChooser">
+		<select id="allFeedsChooser" onchange="allFeedsMenuChange()">
+			<option selected>All feeds...</option>
 			<option>Update</option>
 			<option>Mark as read</option>
 			<option>Show only unread</option>
 		</select>
 
-		<input type="submit" class="button" onclick="allFeedsMenuGo()" value="Go">
-
 		</div>
 		
 		<? } else { ?>
@@ -208,13 +207,14 @@
 
 		</td>
 		<td align="right">
-			Actions: <select id="quickMenuChooser">
-				<option id="qmcPrefs" selected>Preferences...</option>
-				<option id="qmcSearch">Search...</option>
+			<select id="quickMenuChooser" onchange="quickMenuChange()">
+				<option id="qmcDefault" selected>Actions...</option>
+				<option id="qmcPrefs">Preferences</option>
+				<option id="qmcSearch">Search</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>
@@ -223,9 +223,8 @@
 				<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>
+				<option id="qmcAddFilter">&nbsp;&nbsp;Add filter</option>
 			</select>
-			<input type="submit" class="button" onclick="quickMenuGo()" value="Go">
 		</td>
 		</tr>
 		</table>