[icinga-checkins] icinga.org: icinga-web/master: * Tooltipdelay (fixes #1025)

git at icinga.org git at icinga.org
Thu Jan 27 12:00:45 CET 2011


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jan 27 11:59:41 2011 +0100

* Tooltipdelay (fixes #1025)
* Multiline grid columns css class
* Meta col renderer (style, class, ...)

---

 .../Cronks/data/xml/grid/icinga-log-template.xml   |   15 +++++++++++++++
 app/modules/Cronks/lib/js/grid/ColumnRenderer.js   |    7 +++++++
 .../System/ViewProc/js/IcingaColumnRenderer.js     |    2 +-
 pub/styles/icinga.css                              |    4 ++++
 4 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/app/modules/Cronks/data/xml/grid/icinga-log-template.xml b/app/modules/Cronks/data/xml/grid/icinga-log-template.xml
index 78cc4b7..39674db 100644
--- a/app/modules/Cronks/data/xml/grid/icinga-log-template.xml
+++ b/app/modules/Cronks/data/xml/grid/icinga-log-template.xml
@@ -300,6 +300,21 @@
         	<display>
                 <parameter name="visible">true</parameter>
                 <parameter name="label">Message</parameter>
+                
+                <parameter name="width">200</parameter>
+                
+                <parameter name="jsFunc">
+                	<parameter name="namespace">Cronk.grid.ColumnRenderer</parameter>
+                	<parameter name="function">columnMetaData</parameter>
+                	
+                	<!-- renderer/gridevent[cellclick|celldblclick|...] -->
+                	<parameter name="type">renderer</parameter>
+                	
+                	<!-- Sets class for multiline columns -->
+                	<parameter name="arguments">
+                		<parameter name="css"><![CDATA[x-icinga-multiline-column]]></parameter>
+                	</parameter>
+				</parameter>
             </display>
             
             <filter>
diff --git a/app/modules/Cronks/lib/js/grid/ColumnRenderer.js b/app/modules/Cronks/lib/js/grid/ColumnRenderer.js
index 0fe298a..a646eaf 100755
--- a/app/modules/Cronks/lib/js/grid/ColumnRenderer.js
+++ b/app/modules/Cronks/lib/js/grid/ColumnRenderer.js
@@ -84,6 +84,13 @@ Cronk.grid.ColumnRenderer = {
 		}
 	},
 	
+	columnMetaData : function(cfg) {
+		return function(value, metaData, record, rowIndex, colIndex, store) {
+			Ext.apply(metaData, Cronk.grid.ColumnRendererUtil.metaDataObject(cfg));
+			return String.format('{0}', value);
+		}
+	},
+	
 	columnImage : function(cfg) {
 		return function(value, metaData, record, rowIndex, colIndex, store) {
 			var my = cfg;	// local reference
diff --git a/app/modules/Cronks/templates/System/ViewProc/js/IcingaColumnRenderer.js b/app/modules/Cronks/templates/System/ViewProc/js/IcingaColumnRenderer.js
index 03bfa3d..17311b7 100755
--- a/app/modules/Cronks/templates/System/ViewProc/js/IcingaColumnRenderer.js
+++ b/app/modules/Cronks/templates/System/ViewProc/js/IcingaColumnRenderer.js
@@ -58,7 +58,7 @@ Cronk.grid.IcingaColumnRenderer = {
 					target: e.getTarget(),
 					srcId: cfg.src_id,
 					width: 400,
-					delay: 15000,
+					delay: cfg.delay || 15000,
 					filter: cfg.processedFilterData
 				});
 
diff --git a/pub/styles/icinga.css b/pub/styles/icinga.css
index 06ea46f..5f53786 100644
--- a/pub/styles/icinga.css
+++ b/pub/styles/icinga.css
@@ -516,6 +516,10 @@ div#menu {
 	color: #0000cc;	
 }
 
+.x-icinga-multiline-column div {
+	white-space: normal;	
+}
+
 /** Simple box classes **/
 .x-icinga-simplebox-green {
 	padding: 10px;





More information about the icinga-checkins mailing list