move feedOpToolbar

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 6abf5d43f24b08fc00942360d2e046a66edd6c98..85ed174fbd00baf84835a6adef37b21594e0f7de 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -984,6 +984,21 @@
 
                        print "<p>";
 
+                       print "<div id=\"feedOpToolbar\">";
+
+                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
+
+                               print __('Selection:') . " ";
+
+                               print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
+
+                               print " <input type=\"submit\" class=\"button\" disabled=\"true\"
+                                       onclick=\"javascript:categorizeSelectedFeeds()\" value=\"".
+                                       __('Recategorize')."\">";
+                       }
+                               
+                       print "</div>";
+
                        print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
                                <option value=\"facDefault\" selected>".__('Actions...')."</option>
                                <option disabled>--------</option>
@@ -1001,9 +1016,7 @@
                                        </option>";
                                }
 
-                               print "</select>";
-
-                               print "<span id=\"feedOpToolbar\">";
+                       print "</select>";
 
                        /* print "<input type=\"submit\" class=\"button\" disabled=\"true\"
                                onclick=\"javascript:editSelectedFeed()\" value=\"".__('Edit')."\">
@@ -1011,19 +1024,6 @@
                                onclick=\"javascript:removeSelectedFeeds()\" 
                                value=\"".__('Unsubscribe')."\">"; */
 
-                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
-                               print "&nbsp;|&nbsp;" . __('Selection:') . " ";
-
-                               print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
-
-                               print " <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"javascript:categorizeSelectedFeeds()\" value=\"".
-                                       __('Recategorize')."\">";
-                       }
-                               
-                       print "</span>";
-
 //                     if (get_pref($link, 'ENABLE_FEED_CATS')) {
 
 /*                             print " <input type=\"submit\" class=\"button\"

diff --git a/tt-rss.css b/tt-rss.css
index 60c541f5ead4a68319399ac3dc02d477fda17258..267e112d34d47cd1a5f5a63aa41830c9c88dfaa6 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1694,3 +1694,6 @@ div.autocomplete ul li {
        cursor : pointer;
 }
 
+#feedOpToolbar {
+       float : right;
+}