[icinga-checkins] icinga.org: icinga-web/jmosshammer/default2: * Changed version (fixes #544)

git at icinga.org git at icinga.org
Mon Jul 19 10:36:01 CEST 2010


Module: icinga-web
Branch: jmosshammer/default2
Commit: 95db31da67359b14192986e6a7cb14c2e15152a3
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=95db31da67359b14192986e6a7cb14c2e15152a3

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 30 09:27:18 2010 +0200

* Changed version (fixes #544)
* Added detailed iso date format (global)
* Removed html encoding from truncated text in grids
* Fixed toggle button for auto refresh in grids
* Added real title for title-less pages in template

---

 app/config/icinga.xml                              |    8 ++++----
 app/config/translation.xml                         |    2 +-
 app/modules/Cronks/lib/js/grid/ColumnRenderer.js   |    4 +++-
 app/modules/Cronks/lib/js/grid/GridPanel.js        |   13 +++++--------
 .../Cronks/templates/System/CronkPortalSuccess.php |    1 +
 app/templates/ExtJsViewport.php                    |    3 +++
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/config/icinga.xml b/app/config/icinga.xml
index 52b7654..dd85631 100755
--- a/app/config/icinga.xml
+++ b/app/config/icinga.xml
@@ -172,11 +172,11 @@
 	
 	<setting name="appkit.version.copyright"><![CDATA[© 2009-2010 Icinga Developer Team]]></setting>
 	<setting name="appkit.version.homeref"><![CDATA[<a href="http://www.icinga.org/">www.icinga.org</a>]]></setting>
-	<setting name="appkit.version.major">0</setting>
-	<setting name="appkit.version.minor">9</setting>
+	<setting name="appkit.version.major">1</setting>
+	<setting name="appkit.version.minor">0</setting>
 	<setting name="appkit.version.patch">1</setting>
-	<setting name="appkit.version.extension">beta</setting>
-	<setting name="appkit.version.releasedate"><![CDATA[2010-03-23]]></setting>
+	<setting name="appkit.version.extension">dev</setting>
+	<setting name="appkit.version.releasedate"><![CDATA[2010-06-30]]></setting>
 	<setting name="appkit.version.name">icinga-web</setting>
 	
 	<!-- PLACEHOLDER -->
diff --git a/app/config/translation.xml b/app/config/translation.xml
index eeb8200..2050d6c 100755
--- a/app/config/translation.xml
+++ b/app/config/translation.xml
@@ -47,7 +47,7 @@
 					<date_formatter>
 						<ae:parameter name="type">date</ae:parameter>
 						<!-- dd.MM.yyyy hh:mm:ss -->
-						<ae:parameter name="format">medium</ae:parameter>
+						<ae:parameter name="format">yyyy-MM-dd hh:mm:ss</ae:parameter>
 					</date_formatter>
 					
 			</translator>
diff --git a/app/modules/Cronks/lib/js/grid/ColumnRenderer.js b/app/modules/Cronks/lib/js/grid/ColumnRenderer.js
index f633d98..53ee637 100755
--- a/app/modules/Cronks/lib/js/grid/ColumnRenderer.js
+++ b/app/modules/Cronks/lib/js/grid/ColumnRenderer.js
@@ -47,9 +47,11 @@ Cronk.grid.ColumnRenderer = {
 			// skip truncate if html is located at the ouput
 			if(value.match(/<.*?>(.*?)<\/.*?>/g))
 				return value;
+
 			var out = Ext.util.Format.ellipsis(value, (cfg.length || 50));
 			if (out.indexOf('...', (out.length-3)) != -1) {
-				metaData.attr = 'ext:qtip="' + encodeURI(value) + '"';
+				// @todo Check if html encoding brings some trouble
+				metaData.attr = 'ext:qtip="' + value + '"';
 			}
 			
 			return out;
diff --git a/app/modules/Cronks/lib/js/grid/GridPanel.js b/app/modules/Cronks/lib/js/grid/GridPanel.js
index 7ea1646..9cdf4c1 100755
--- a/app/modules/Cronks/lib/js/grid/GridPanel.js
+++ b/app/modules/Cronks/lib/js/grid/GridPanel.js
@@ -26,13 +26,11 @@ Cronk.grid.GridPanel = Ext.extend(Ext.grid.GridPanel, {
 				toolTip: _('Grid settings'),
 				menu: {
 					items: [{
-						// xtype: 'button',
 						text: _('Auto refresh'),
-						iconCls: 'silk-database-refresh',
-						enableToggle: true,
-						handler: function(oBtn, e) {
-							
-							if (oBtn.pressed == true) {
+						checked: false,
+
+						checkHandler: function(checkItem, checked) {
+							if (checked == true) {
 								this.trefresh = AppKit.getTr().start({
 									run: function() {
 										this.getStore().reload();
@@ -44,8 +42,7 @@ Cronk.grid.GridPanel = Ext.extend(Ext.grid.GridPanel, {
 							else {
 								AppKit.getTr().stop(this.trefresh);
 								delete this.trefresh;
-							}
-							
+							}	
 						},
 						scope: this
 					},{
diff --git a/app/modules/Cronks/templates/System/CronkPortalSuccess.php b/app/modules/Cronks/templates/System/CronkPortalSuccess.php
index 2248713..517fb61 100755
--- a/app/modules/Cronks/templates/System/CronkPortalSuccess.php
+++ b/app/modules/Cronks/templates/System/CronkPortalSuccess.php
@@ -29,6 +29,7 @@ Cronk.util.initEnvironment('viewport-center', function() {
 			}, {
 				xtype: 'cronk',
 				crname: 'icingaOverallStatus',
+				width: 420,
 				border: false
 			}]
 		}, {
diff --git a/app/templates/ExtJsViewport.php b/app/templates/ExtJsViewport.php
index 5cab684..1dc2e84 100755
--- a/app/templates/ExtJsViewport.php
+++ b/app/templates/ExtJsViewport.php
@@ -6,6 +6,9 @@
 				echo htmlspecialchars($t['title']). ' - '
 				. AgaviConfig::get('core.app_name');
 			}
+			else {
+				echo AgaviConfig::get('core.app_name');
+			}
 		?></title>
 		
 		<meta charset="UTF-8">





More information about the icinga-checkins mailing list