[icinga-checkins] icinga.org: icinga-web/r1.6: * Changed width of div (fixes #2230)

git at icinga.org git at icinga.org
Tue Jan 31 13:51:39 CET 2012


Module: icinga-web
Branch: r1.6
Commit: 385ebcd7247bf263a6f4998ff951eea0f3d4d738
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=385ebcd7247bf263a6f4998ff951eea0f3d4d738

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jan 30 13:27:37 2012 +0100

* Changed width of div (fixes #2230)
* Changed target of SearchHandler key event

---

 .../AppKit/lib/js/search/AppKitSearchBox.js        |    8 ++++----
 app/modules/Cronks/lib/js/Cronks/StatusOverall.js  |   16 +++++++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/modules/AppKit/lib/js/search/AppKitSearchBox.js b/app/modules/AppKit/lib/js/search/AppKitSearchBox.js
index a35753d..f7975b0 100644
--- a/app/modules/AppKit/lib/js/search/AppKitSearchBox.js
+++ b/app/modules/AppKit/lib/js/search/AppKitSearchBox.js
@@ -15,7 +15,7 @@ AppKit.search.Searchbox = Ext.extend(Ext.Panel, {
                 tag : 'div',
                 cls : 'icinga-action-icon-search',
                 html : '',
-                qtip : _('Press CTRL+ALT+F to activate search')
+                qtip : _('Press F to activate search')
             }
         });
     	
@@ -32,10 +32,10 @@ AppKit.search.Searchbox = Ext.extend(Ext.Panel, {
         	this.textfield = this.getWindow().findById('global_search');
         }, this, { single : true });
         
-        this.keymap = new Ext.KeyMap(Ext.getBody(), {
+        this.keymap = new Ext.KeyMap(Ext.getDoc(), {
         	key : Ext.EventObject.F,
-        	ctrl : true,
-        	alt : true,
+        	// ctrl : true,
+        	// alt : true,
         	fn : (function() {
         		
         		var win = this.getSearchbox();
diff --git a/app/modules/Cronks/lib/js/Cronks/StatusOverall.js b/app/modules/Cronks/lib/js/Cronks/StatusOverall.js
index e290ee8..edd0f9a 100644
--- a/app/modules/Cronks/lib/js/Cronks/StatusOverall.js
+++ b/app/modules/Cronks/lib/js/Cronks/StatusOverall.js
@@ -161,7 +161,21 @@ Ext.ns('Icinga.Cronks.System.StatusOverall');
                 itemSelector: 'div.icinga-overall-status-item-instance',
                 prepareData: Icinga.Cronks.System.StatusOverall.renderer.prepareInstanceData,
 
-                tpl: new Ext.XTemplate('<div style="margin-left: 5px;">', '<tpl for=".">', '<div style="width: 100px;">', '<tpl if="id==0">', '<div class="icinga-overall-status-icon-instance icinga-icon-application" ext:qtip="Instances running"></div>', '</tpl>', '<tpl if="id==2">', '<div class="icinga-overall-status-icon-instance icinga-icon-application-minus" ext:qtip="Instances down"></div>', '</tpl>', '<div class="icinga-overall-status-item icinga-overall-status-item-instance">{state}</div>', '<div class="x-clear icinga-overall-status-spacer"></div>', '</div>', '</tpl>', '</div>')
+                tpl: new Ext.XTemplate(
+                    '<div style="margin-left: 5px;">', 
+                    '<tpl for=".">', 
+                    '<div style="min-width: 130px;">', 
+                    '<tpl if="id==0">', 
+                    '<div class="icinga-overall-status-icon-instance icinga-icon-application" ext:qtip="Instances running"></div>', 
+                    '</tpl>', 
+                    '<tpl if="id==2">', 
+                    '<div class="icinga-overall-status-icon-instance icinga-icon-application-minus" ext:qtip="Instances down"></div>', 
+                    '</tpl>', '<div class="icinga-overall-status-item icinga-overall-status-item-instance">{state}</div>', 
+                    '<div class="x-clear icinga-overall-status-spacer"></div>', 
+                    '</div>', 
+                    '</tpl>', 
+                    '</div>'
+                )
             });
 
             this.instanceView.on('click', function (dview, index, node, e) {





More information about the icinga-checkins mailing list