[icinga-checkins] icinga.org: icinga-web/master: * fixed nodes and edges of status map for internet explorer

git at icinga.org git at icinga.org
Fri Oct 23 12:01:37 CEST 2009


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

Author: Christian Doebler <christian.doebler at netways.de>
Date:   Fri Oct 23 11:17:03 2009 +0200

* fixed nodes and edges of status map for internet explorer

---

 app/config/icinga.xml                              |    6 ++++--
 .../Cronks/templates/System/StatusMapSuccess.php   |    7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/config/icinga.xml b/app/config/icinga.xml
index ec96c1c..a4e2987 100644
--- a/app/config/icinga.xml
+++ b/app/config/icinga.xml
@@ -170,6 +170,7 @@
 		<parameter>%core.root_dir%/lib/ext3/examples/ux/SliderTip.js</parameter>
 
 		<!-- JIT - JavaScript InfoVis Toolkit -->
+		<parameter>%core.root_dir%/lib/jit/Extras/excanvas.js</parameter>
 		<parameter>%core.root_dir%/lib/jit/jit-yc.js</parameter>
 
 		<!--AppKit JS -->
@@ -194,9 +195,10 @@
 	-->
 	<setting name="appkit.include_dynamic_javascript">
 		<parameter name="AppKit.Ext.grid.IcingaColumnRenderer">%core.module_dir%/Cronks/templates/System/ViewProc/js/IcingaColumnRenderer.js</parameter>
-		<parameter name="Cronks.CronkTrigger">%core.module_dir%/Cronks/templates/System/js/CronkTrigger.js</parameter>
+		<!-- <parameter name="Cronks.JitExCanvas">%core.root_dir%/lib/jit/Extras/excanvas.js</parameter> -->
+		<!-- <parameter name="Cronks.JitLib">%core.root_dir%/lib/jit/jit-yc.js</parameter> -->
 		<parameter name="Cronks.JitStatusMap">%core.module_dir%/Cronks/templates/System/js/JitStatusMap.js</parameter>
-		<parameter name="Cronks.JitExCanvas">%core.root_dir%/lib/jit/Extras/excanvas.js</parameter>
+		<parameter name="Cronks.CronkTrigger">%core.module_dir%/Cronks/templates/System/js/CronkTrigger.js</parameter>
 	</setting>
 
 	<!--
diff --git a/app/modules/Cronks/templates/System/StatusMapSuccess.php b/app/modules/Cronks/templates/System/StatusMapSuccess.php
index b7f197d..94239b9 100644
--- a/app/modules/Cronks/templates/System/StatusMapSuccess.php
+++ b/app/modules/Cronks/templates/System/StatusMapSuccess.php
@@ -18,10 +18,11 @@ AppKit.Ext.ScriptDynaLoader.on(
 	{ single : true }
 );
 
-if (Ext.isIE) {
-	AppKit.Ext.ScriptDynaLoader.loadScript("<?php echo $ro->gen('appkit.ext.dynamicScriptSource', array('script' => 'Cronks.JitExCanvas')) ?>");
-}
+//if (Ext.isIE) {
+//	AppKit.Ext.ScriptDynaLoader.loadScript("<?php echo $ro->gen('appkit.ext.dynamicScriptSource', array('script' => 'Cronks.JitExCanvas')) ?>");
+//}
 
+//AppKit.Ext.ScriptDynaLoader.loadScript("<?php echo $ro->gen('appkit.ext.dynamicScriptSource', array('script' => 'Cronks.JitLib')) ?>");
 AppKit.Ext.ScriptDynaLoader.loadScript("<?php echo $ro->gen('appkit.ext.dynamicScriptSource', array('script' => 'Cronks.CronkTrigger')) ?>");
 AppKit.Ext.ScriptDynaLoader.loadScript("<?php echo $ro->gen('appkit.ext.dynamicScriptSource', array('script' => 'Cronks.JitStatusMap')) ?>");
 </script>
\ No newline at end of file





More information about the icinga-checkins mailing list