geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1148197 - in /geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main: java/org/apache/geronimo/monitoring/console/Constants.java webapp/WEB-INF/view/monitoringPage.jsp webapp/monitoringPopUpGraph.jsp
Date Tue, 19 Jul 2011 07:02:26 GMT
Author: genspring
Date: Tue Jul 19 07:02:25 2011
New Revision: 1148197

URL: http://svn.apache.org/viewvc?rev=1148197&view=rev
Log:
GERONIMO-6076 Graphics cannot be displayed on monitoring porlet.  Patch from Yi Xiao.

Modified:
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java?rev=1148197&r1=1148196&r2=1148197&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/Constants.java
Tue Jul 19 07:02:25 2011
@@ -25,4 +25,5 @@ package org.apache.geronimo.monitoring.c
  */
 public interface Constants {
     static String DOJO_JS = "/console/dojo/dojo/dojo.js";
+    static String DOJOX_JS = "/console/dojo/dojox/dojox.js";
 }

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp?rev=1148197&r1=1148196&r2=1148197&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
Tue Jul 19 07:02:25 2011
@@ -34,6 +34,8 @@
 <!-- <head> -->
     <script type='text/javascript' src='<%=Constants.DOJO_JS%>' djConfig='isDebug:
false, parseOnLoad: true'>
     </script>
+    <script type='text/javascript' src='<%=Constants.DOJOX_JS%>'>
+    </script>
         <script type = "text/javascript">
 <!--
 function hide(x) {
@@ -54,6 +56,12 @@ makeObjects = function(){
        out.println(graph.getJS());
 
     %>
+    var nodes = dojo.query('div[id $= Container]');
+    nodes.forEach(function(node, index, arr) {
+    	dojo.attr(node, 'style', {
+    		'float': 'left'
+    	})
+    })
 };
 
 dojo.addOnLoad(makeObjects);

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp?rev=1148197&r1=1148196&r2=1148197&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp
Tue Jul 19 07:02:25 2011
@@ -29,6 +29,7 @@ String divNameString = graph.getName();
 %>
 
 <script type='text/javascript' src='<%=Constants.DOJO_JS%>' djConfig='isDebug: false,
parseOnLoad: true'></script>
+<script type='text/javascript' src='<%=Constants.DOJOX_JS%>'></script>
 <script type='text/javascript'>
     dojo.require("dojox.charting.Chart2D");
     dojo.require("dojox.charting.themes.PlotKit.blue");
@@ -36,6 +37,12 @@ String divNameString = graph.getName();
 
     makeObjects = function() {
         <%=graphString%>
+        var nodes = dojo.query('div[id $= Container]');
+        nodes.forEach(function(node, index, arr) {
+        	dojo.attr(node, 'style', {
+        		'float': 'left'
+        	})
+        })
     };
     dojo.addOnLoad(makeObjects);
     function refreshPeriodic() {



Mime
View raw message