prefs: reorganize toolbar buttons

[tt-rss.git] / modules / pref-labels.php

diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 02e5a2be94ce39317c253f9515b1bca43820a069..a6324c7a2b70fb6128fb8402319d2c30547154a7 100644 (file)
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -1,7 +1,7 @@
 <?php
        function module_pref_labels($link) {
 
-               $subop = $_GET["subop"];
+               $subop = $_REQUEST["subop"];
 
                if ($subop == "color-set") {
                        $kind = db_escape_string($_REQUEST["kind"]);
@@ -84,7 +84,7 @@
 
                if ($subop == "remove") {
 
-                       $ids = split(",", db_escape_string($_GET["ids"]));
+                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
 
                        foreach ($ids as $id) {
                                label_remove($link, $id, $_SESSION["uid"]);
@@ -94,7 +94,7 @@
 
                if ($subop == "add") {
 
-                       $caption = db_escape_string($_GET["caption"]);
+                       $caption = db_escape_string($_REQUEST["caption"]);
 
                        if ($caption) {
 
@@ -109,15 +109,15 @@
 
                set_pref($link, "_PREFS_ACTIVE_TAB", "labelConfig");
 
-               $sort = db_escape_string($_GET["sort"]);
+               $sort = db_escape_string($_REQUEST["sort"]);
 
                if (!$sort || $sort == "undefined") {
                        $sort = "caption";
                }
 
-               $label_search = db_escape_string($_GET["search"]);
+               $label_search = db_escape_string($_REQUEST["search"]);
 
-               if (array_key_exists("search", $_GET)) {
+               if (array_key_exists("search", $_REQUEST)) {
                        $_SESSION["prefs_label_search"] = $label_search;
                } else {
                        $label_search = $_SESSION["prefs_label_search"];
@@ -137,7 +137,21 @@
                print"<input type=\"submit\" class=\"button\" 
                        id=\"label_create_btn\"
                        onclick=\"return addLabel()\" 
-                       value=\"".__('Create label')."\"></div>";
+                       value=\"".__('Create label')."\"> ";
+
+                       print "<input type=\"submit\" class=\"button\"
+                               onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">";
+
+                       print "&nbsp;";
+/*                     print "&nbsp;<input type=\"submit\" class=\"button\" disabled=\"true\"
+                               onclick=\"labelColorSet('fg')\" value=\"".__('Fg')."\">&nbsp;";
+                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
+                               onclick=\"labelColorSet('bg')\" value=\"".__('Bg')."\">&nbsp;"; */
+                       print "<input type=\"submit\" class=\"button\"
+                               onclick=\"labelColorReset()\" value=\"".__('Clear colors')."\">";
+
+
+               print "</div>";
 
                if ($label_search) {
 
@@ -233,20 +247,6 @@
 
                        print "</table>";
        
-                       print "<p id=\"labelOpToolbar\">";
-
-                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">";
-
-                       print "&nbsp;";
-/*                     print "&nbsp;<input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"labelColorSet('fg')\" value=\"".__('Fg')."\">&nbsp;";
-                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"labelColorSet('bg')\" value=\"".__('Bg')."\">&nbsp;"; */
-                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"labelColorReset()\" value=\"".__('Clear colors')."\">";
-
-                       print "</p>";
 
                } else {
                        print "<p>";