actions menu tweaks

diff --git a/feedlist.js b/feedlist.js
index 177f057cd9d87db9ea1a1244f69e289967d0b8d9..0d45893313de19158d4b492747ec69c6ff9234d7 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -554,7 +554,7 @@ function mouse_move_handler(e) {
 }
 
 function enable_selection(b) {
-       disable_selection = !b;
+       selection_disabled = !b;
 }
 
 function enable_resize(b) {
@@ -589,7 +589,7 @@ function mouse_up_handler(e) {
        try {
                mouse_is_down = false;
 
-               if (!disable_selection) {
+               if (!selection_disabled) {
                        document.onselectstart = null;
                        var e = document.getElementById("headlineActionsBody");
                        if (e) Element.hide(e);

diff --git a/tt-rss.php b/tt-rss.php
index 66e59bfd7684674fe0b85a5c26edd144dfa71b3b..35b63dfeac6a4b9e5b5e3c4de1bb3b970c8e14c5 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -150,26 +150,26 @@ window.onload = init;
                <div style="float : right">
                        <select id="quickMenuChooser" onchange="quickMenuChange()">
                                        <option value="qmcDefault" selected="selected"><?php echo __('Actions...') ?></option>
-                                       <option value="qmcSearch"><?php echo __('Search') ?></option>
+                                       <option value="qmcSearch"><?php echo __('Search...') ?></option>
                                        <!-- <option value="qmcPrefs"><?php echo __('Preferences') ?></option> -->
                                        <option disabled="disabled">--------</option>
                                        <option style="color : #5050aa" disabled="disabled"><?php echo __('Feed actions:') ?></option>
-                                       <option value="qmcAddFeed"><?php echo __('&nbsp;&nbsp;Subscribe to feed') ?></option>
-                                       <option value="qmcEditFeed"><?php echo __('&nbsp;&nbsp;Edit this feed') ?></option>
-                                       <!-- <option value="qmcClearFeed"><?php echo __('&nbsp;&nbsp;Clear articles') ?></option> -->
-                                       <option value="qmcRescoreFeed"><?php echo __('&nbsp;&nbsp;Rescore feed') ?></option>
-                                       <option value="qmcRemoveFeed"><?php echo __('&nbsp;&nbsp;Unsubscribe') ?></option>
+                                       <option value="qmcAddFeed">&nbsp;&nbsp;<?php echo __('Subscribe to feed...') ?></option>
+                                       <option value="qmcEditFeed">&nbsp;&nbsp;<?php echo __('Edit this feed...') ?></option>
+                                       <!-- <option value="qmcClearFeed">&nbsp;&nbsp;<?php echo __('Clear articles') ?></option> -->
+                                       <option value="qmcRescoreFeed">&nbsp;&nbsp;<?php echo __('Rescore feed') ?></option>
+                                       <option value="qmcRemoveFeed">&nbsp;&nbsp;<?php echo __('Unsubscribe') ?></option>
                                        <option disabled="disabled">--------</option>
                                        <option style="color : #5050aa" disabled="disabled"><?php echo __('All feeds:') ?></option>
-                                       <option value="qmcCatchupAll"><?php echo __('&nbsp;&nbsp;Mark as read') ?></option>
-                                       <option value="qmcShowOnlyUnread"><?php echo __('&nbsp;&nbsp;(Un)hide read feeds') ?></option>
+                                       <option value="qmcCatchupAll">&nbsp;&nbsp;<?php echo __('Mark as read') ?></option>
+                                       <option value="qmcShowOnlyUnread">&nbsp;&nbsp;<?php echo __('(Un)hide read feeds') ?></option>
                                        <option disabled="disabled">--------</option>
                                        <option style="color : #5050aa" disabled="disabled"><?php echo __('Other actions:') ?></option>                         
 
-                                       <option value="qmcAddLabel"><?php echo __('&nbsp;&nbsp;Create label') ?></option>
-                                       <option value="qmcAddFilter"><?php echo __('&nbsp;&nbsp;Create filter') ?></option>
-                                       <option value="qmcResetUI"><?php echo __('&nbsp;&nbsp;Reset UI layout') ?></option>
-                                       <option value="qmcResetCats"><?php echo __('&nbsp;&nbsp;Reset category order') ?></option>
+                                       <option value="qmcAddLabel">&nbsp;&nbsp;<?php echo __('Create label...') ?></option>
+                                       <option value="qmcAddFilter">&nbsp;&nbsp;<?php echo __('Create filter...') ?></option>
+                                       <option value="qmcResetUI">>&nbsp;&nbsp;<?php echo __('Reset UI layout') ?></option>
+                                       <option value="qmcResetCats">>&nbsp;&nbsp;<?php echo __('Reset category order') ?></option>
 
                                        <option value="qmcHKhelp"><?php echo __('&nbsp;&nbsp;Keyboard shortcuts') ?></option>
                        </select>