[icinga-checkins] icinga.org: icinga-web/master: * UI Guidelines: Grid Filter (refs #1558)

[git at icinga.org]

Module: icinga-web
Branch: master
Commit: da0ef1a3bc492c51bb3e0020770faad960aae4a6
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=da0ef1a3bc492c51bb3e0020770faad960aae4a6

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Feb 23 13:54:32 2012 +0100

* UI Guidelines: Grid Filter (refs #1558)

---

 .../Cronks/lib/js/grid/IcingaGridFilterHandler.js  |   22 ++++++++++---------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/modules/Cronks/lib/js/grid/IcingaGridFilterHandler.js b/app/modules/Cronks/lib/js/grid/IcingaGridFilterHandler.js
index 0eb1cc7..2c8db96 100755
--- a/app/modules/Cronks/lib/js/grid/IcingaGridFilterHandler.js
+++ b/app/modules/Cronks/lib/js/grid/IcingaGridFilterHandler.js
@@ -57,7 +57,8 @@ Cronk.util.GridFilterWindow = function() {
 					// layout: 'fit',
 					
 					defaults: {
-						border: false
+						border: false,
+                        padding: 5
 					},
 					
 					listeners: {
@@ -121,8 +122,15 @@ Cronk.util.GridFilterWindow = function() {
 						},
 						scope: pub
 					},
-	
-					bbar: {
+                    tbar: [{
+                        text: _("Reset"),
+                        iconCls: 'icinga-icon-delete',
+                        handler: function(b, y) {
+                            pub.resetFilterForm();
+                        }
+
+                    }],
+					buttons: {
 						items: [{
 							text: _("Apply"),
 							iconCls: 'icinga-icon-accept',
@@ -130,17 +138,11 @@ Cronk.util.GridFilterWindow = function() {
 								pub.applyFilters();
 							}
 						},{
-							text: _("Discard"),
+							text: _("Cancel"),
 							iconCls: 'icinga-icon-cross',
 							handler: function(b, y) {
 								oWin.hide();
 							}
-						}, '-',{
-							text: _("Reset"),
-							iconCls: 'icinga-icon-delete',
-							handler: function(b, y) {
-								pub.resetFilterForm();
-							}
 						}]
 					}
 				});