use dijit.form.Buttons in refactored filter/label dialogs

diff --git a/functions.js b/functions.js
index bbfd32e4e2649ed5cf3143b17f37cf3d279e44b6..e9a1f70b60d3d049119eb531b3a18e1598cb5a0c 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -1189,6 +1189,7 @@ function quickAddFilter() {
                                                parameters: dojo.objectToQuery(this.attr('value')),
                                                onComplete: function(transport) {
                                                        this.hide();
+                                                       notify_progress("Savind data...", true);
                                                        notify_info(transport.responseText);
                                                        if (inPreferences()) {
                                                                updateFilterList();                             

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 28f30fa691c687c0a310ab51448a8d9cd73c5ae7..527df08a6b2341eb9e7bdf12d33e6648e54ca2a3 100644 (file)
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -157,7 +157,7 @@
                                         name=\"reg_exp\" style=\"font-size : 16px;\" value=\"$reg_exp\">";
 
                        print "<span id=\"filterDlg_dateChkBox\" $date_ops_invisible>";                 
-                       print "&nbsp;<button onclick=\"return filterDlgCheckDate()\">".
+                       print "&nbsp;<button dojoType=\"dijit.form.Button\" onclick=\"return filterDlgCheckDate()\">".
                                __('Check it')."</button>";
                        print "</span>";
 
@@ -244,14 +244,14 @@
                        $reg_exp = htmlspecialchars($reg_exp, ENT_QUOTES); // second escaping seems to be needed for javascript
 
                        print "<div style=\"float : left\">";
-                       print "<button onclick='return removeFilter($filter_id, \"$reg_exp\")'>".
+                       print "<button dojoType=\"dijit.form.Button\" onclick='return removeFilter($filter_id, \"$reg_exp\")'>".
                                __('Remove')."</button>";
                        print "</div>";
 
-                       print "<button onclick=\"return dijit.byId('filterEditDlg').execute()\">".
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
                                __('Save')."</button> ";
 
-                       print "<button onclick=\"return dijit.byId('filterEditDlg').hide()\">".
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".
                                __('Cancel')."</button>";
 
                        print "</div>";

diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 5e0253856930a7e0358bef8ac5fabf6f4bb41d79..e381d72ff769155d1171d6cf24a6e570a1428e3a 100644 (file)
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -25,7 +25,7 @@
                        $fg_color = $line['fg_color'];
                        $bg_color = $line['bg_color'];
 
-                       print "<span class=\"labelColorIndicator\" id=\"label-editor-indicator\" style='color : $fg_color; background-color : $bg_color'>&alpha;</span>";
+                       print "<span class=\"labelColorIndicator\" id=\"label-editor-indicator\" style='color : $fg_color; background-color : $bg_color; margin-bottom : 4px; margin-right : 4px'>&alpha;</span>";
 
                        print "<input style=\"font-size : 16px\" name=\"caption\" 
                                dojoType=\"dijit.form.ValidationTextBox\"
@@ -74,9 +74,9 @@
 #                      print "</form>";
 
                        print "<div class=\"dlgButtons\">";
-                       print "<button onclick=\"dijit.byId('labelEditDlg').execute()\">".
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelEditDlg').execute()\">".
                                __('Save')."</button>";
-                       print "<button onclick=\"dijit.byId('labelEditDlg').hide()\">".
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelEditDlg').hide()\">".
                                __('Cancel')."</button>";
                        print "</div>";
 

diff --git a/prefs.js b/prefs.js
index fa4804ff474ac381378711e73ad4d2ffcf0c1b4c..fdcf28e873cee2fde3d60254b88616ee48e3b1b3 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -302,6 +302,7 @@ function editFilter(id, event) {
                        execute: function() {
                                if (this.validate()) {
                                        this.hide();
+                                       notify_progress("Savind data...", true);
                                        new Ajax.Request("backend.php", {
                                                parameters: dojo.objectToQuery(this.attr('value')),
                                                onComplete: function(transport) {
@@ -1652,8 +1653,8 @@ function removeFilter(id, title) {
                var ok = confirm(msg);
        
                if (ok) {
-                       closeInfoBox();
-       
+                       dijit.byId("filterEditDlg").hide();
+
                        notify_progress("Removing filter...");
                
                        var query = "?op=pref-filters&subop=remove&ids="+