[icinga-checkins] icinga.org: icinga-web/master: * Fixed display issues caused by unfinished smartgrid class

git at icinga.org git at icinga.org
Wed Apr 18 16:04:56 CEST 2012


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Apr 13 12:10:07 2012 +0200

* Fixed display issues caused by unfinished smartgrid class

---

 app/modules/Cronks/config/javascript.xml           |    1 +
 .../lib/js/Cronks/Tackle/Information/Head.js       |    9 +++++++--
 .../Cronks/Tackle/Information/LongPluginOutput.js  |   12 ++++++++++++
 .../js/Cronks/Tackle/Information/PluginOutput.js   |    2 +-
 .../Cronks/lib/js/Cronks/Tackle/ObjectGrid.js      |    2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/modules/Cronks/config/javascript.xml b/app/modules/Cronks/config/javascript.xml
index ae69250..41a7d59 100644
--- a/app/modules/Cronks/config/javascript.xml
+++ b/app/modules/Cronks/config/javascript.xml
@@ -53,6 +53,7 @@
             <ae:parameter>%core.module_dir%/Cronks/lib/js/Cronks/Tackle/Information/Head.js</ae:parameter>
             <ae:parameter>%core.module_dir%/Cronks/lib/js/Cronks/Tackle/Information/State.js</ae:parameter>
             <ae:parameter>%core.module_dir%/Cronks/lib/js/Cronks/Tackle/Information/PluginOutput.js</ae:parameter>
+            <ae:parameter>%core.module_dir%/Cronks/lib/js/Cronks/Tackle/Information/LongPluginOutput.js</ae:parameter>
             <ae:parameter>%core.module_dir%/Cronks/lib/js/Cronks/Tackle/Information/Perfdata.js</ae:parameter>
             <ae:parameter>%core.module_dir%/Cronks/lib/js/Cronks/Tackle/Command/Panel.js</ae:parameter>
             <ae:parameter>%core.module_dir%/Cronks/lib/js/Cronks/Tackle/Command/BatchCommandWindow.js</ae:parameter>
diff --git a/app/modules/Cronks/lib/js/Cronks/Tackle/Information/Head.js b/app/modules/Cronks/lib/js/Cronks/Tackle/Information/Head.js
index 4c822b3..3d5df0f 100644
--- a/app/modules/Cronks/lib/js/Cronks/Tackle/Information/Head.js
+++ b/app/modules/Cronks/lib/js/Cronks/Tackle/Information/Head.js
@@ -80,7 +80,12 @@ Ext.ns('Icinga.Cronks.Tackle.Information');
                 flex: 1,
                 layout: 'fit'
             });
-
+            this.pluginLongOutputInfo = new Icinga.Cronks.Tackle.Information.LongPluginOutput({
+                // height : 40,
+                type: this.type,
+                flex: 1,
+                layout: 'fit'
+            });
             this.pluginPerfdataInfo = new Icinga.Cronks.Tackle.Information.Perfdata({
                 // height: 40,
                 type: this.type,
@@ -100,7 +105,7 @@ Ext.ns('Icinga.Cronks.Tackle.Information');
                     pack: 'start'
                 },
                 
-                items: [this.pluginOutputInfo, this.pluginPerfdataInfo]
+                items: [this.pluginOutputInfo, this.pluginLongOutputInfo, this.pluginPerfdataInfo]
             });
 
             this.doLayout();
diff --git a/app/modules/Cronks/lib/js/Cronks/Tackle/Information/LongPluginOutput.js b/app/modules/Cronks/lib/js/Cronks/Tackle/Information/LongPluginOutput.js
new file mode 100644
index 0000000..77efd93
--- /dev/null
+++ b/app/modules/Cronks/lib/js/Cronks/Tackle/Information/LongPluginOutput.js
@@ -0,0 +1,12 @@
+/*global Ext: false, Icinga: false, _: false */
+Ext.ns('Icinga.Cronks.Tackle.Information');
+
+(function () {
+    "use strict";
+
+    Icinga.Cronks.Tackle.Information.LongPluginOutput = Ext.extend(Ext.Panel, {
+        title: _("Long plugin output"),
+        tpl: new Ext.XTemplate('<tpl for=".">', '<div style="margin: 5px;">', '{object_long_output}', '</div>', '</tpl>')
+    });
+
+})();
\ No newline at end of file
diff --git a/app/modules/Cronks/lib/js/Cronks/Tackle/Information/PluginOutput.js b/app/modules/Cronks/lib/js/Cronks/Tackle/Information/PluginOutput.js
index af6a40a..b285409 100644
--- a/app/modules/Cronks/lib/js/Cronks/Tackle/Information/PluginOutput.js
+++ b/app/modules/Cronks/lib/js/Cronks/Tackle/Information/PluginOutput.js
@@ -9,4 +9,4 @@ Ext.ns('Icinga.Cronks.Tackle.Information');
         tpl: new Ext.XTemplate('<tpl for=".">', '<div style="margin: 5px;">', '{object_output}', '</div>', '</tpl>')
     });
 
-})();
\ No newline at end of file
+})()    ;
\ No newline at end of file
diff --git a/app/modules/Cronks/lib/js/Cronks/Tackle/ObjectGrid.js b/app/modules/Cronks/lib/js/Cronks/Tackle/ObjectGrid.js
index 47e785c..045329e 100644
--- a/app/modules/Cronks/lib/js/Cronks/Tackle/ObjectGrid.js
+++ b/app/modules/Cronks/lib/js/Cronks/Tackle/ObjectGrid.js
@@ -1,7 +1,7 @@
 /*global Ext: false, Icinga: false, _: false */
 Ext.ns('Icinga.Cronks.Tackle');
 
-Icinga.Cronks.Tackle.ObjectGrid = Ext.extend(Ext.ux.grid.SmartUpdateGrid, {
+Icinga.Cronks.Tackle.ObjectGrid = Ext.extend(Ext.grid.GridPanel, {
     autoRefresh: true,
     events: ['hostSelected','serviceSelected'],
     viewConfig: {





More information about the icinga-checkins mailing list