svn commit: r612698 - /geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp

[ec...@apache.org]

Author: ecraig
Date: Wed Jan 16 19:36:24 2008
New Revision: 612698

URL: http://svn.apache.org/viewvc?rev=612698&view=rev
Log:
GERONIMO-3753

monitoring portlet is not up to date with dojo 1.0
Patch by Viet Nguyen

Modified:
    geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp

Modified: geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp?rev=612698&r1=612697&r2=612698&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp Wed Jan 16 19:36:24 2008
@@ -37,16 +37,16 @@
 String divNameString = graph.getName();
 %>
 
-<style type="text/css">
-    #graph0Container { margin: 0px; width: 670px; height: 240px; }
-</style>
-<script type='text/javascript' src='/dojo/dojo.js'></script>
+<script type='text/javascript' src='/dojo/1.0/dojo/dojo.js' djConfig='isDebug: false, parseOnLoad: true'></script>
 <script type='text/javascript'>
-    var dojoConfig = { isDebug:true };
-    dojo.require("dojo.collections.Store")
-    dojo.require("dojo.charting.Chart")
-    dojo.require("dojo.json")
-    <%=graphString%>
+    dojo.require("dojox.charting.Chart2D");
+    dojo.require("dojox.charting.themes.PlotKit.blue");
+    dojo.require("dojox.fx.easing");
+
+    makeObjects = function() {
+        <%=graphString%>
+    };
+    dojo.addOnLoad(makeObjects);
 </script>
-<div id="<%=divNameString%>Head" "style="background-color: #f2f2f2; border-top: 1px solid #2581c7; margin: 0px; width: 670px; height: 16px;"><div align="left" style="background-color: #f2f2f2; float:left; text-align:left; width:500px;"><%=divNameString%></div><div align=right style="background-color: #f2f2f2; float:left; width:170px; text-align:right;"><a href="#" onClick="hide(\'<%=divNameString%>\')"><img border=0 src="/monitoring/images/min-b.png"></a>&nbsp;<a href="#" onClick="show(\'<%=divNameString%>\')"><img border=0 src="/monitoring/images/max-b.png"></a>&nbsp;<a href="#" onClick="hide(\'<%=divNameString%>\');hide(\'<%=divNameString%>Head\');"><img border=0 src="/monitoring/images/close-b.png"> </a></div></div>
-<%=divImplString %>
\ No newline at end of file
+<div id="<%=graph.getDivName()%>Head" "style="background-color: #f2f2f2; border-top: 1px solid #2581c7; margin: 0px; width: 670px; height: 16px;"><div align="left" style="background-color: #f2f2f2; float:left; text-align:left; width:500px;"><%=divNameString%></div><div align=right style="background-color: #f2f2f2; float:left; width:170px; text-align:right;"><a href="#" onClick="hide(\'<%=graph.getDivName()%>\')"><img border=0 src="/monitoring/images/min-b.png"></a>&nbsp;<a href="#" onClick="show(\'<%=graph.getDivName()%>\')"><img border=0 src="/monitoring/images/max-b.png"></a>&nbsp;<a href="#" onClick="hide(\'<%=graph.getDivName()%>\');hide(\'<%=graph.getDivName()%>Head\');"><img border=0 src="/monitoring/images/close-b.png"> </a></div></div>
+<%=divImplString %>