geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1156008 - in /geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp: WEB-INF/view/monitoringPage.jsp monitoringPopUpGraph.jsp
Date Wed, 10 Aug 2011 03:25:25 GMT
Author: rwonly
Date: Wed Aug 10 03:25:25 2011
New Revision: 1156008

URL: http://svn.apache.org/viewvc?rev=1156008&view=rev
Log:
GERONIMO-6076 Graphics cannot be displayed on monitoring porlet (Thanks fang shenghao for
the patch!)

Modified:
    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/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=1156008&r1=1156007&r2=1156008&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
Wed Aug 10 03:25:25 2011
@@ -56,12 +56,6 @@ 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);
@@ -94,7 +88,22 @@ for (StatsGraph graph : statsGraphs)
 {
 %>
 <p>
-<div id="<%=graph.getDivName()%>Head" style="background-color: #f2f2f2; border-top:
1px solid #2581c7; margin: 0px; width: 100%; height: 16px;"><div align="left" style="background-color:
#f2f2f2; float:left; text-align:left; width:75%; height: 20px;"><%=graph.getName() %></div><div
align=right style="background-color: #f2f2f2; float:left; width:25%; text-align:right;"><a
href="#" onClick="hide('<%=graph.getDivName()%>');hide('<%=graph.getDivName()%>Sub');"><img
border=0 src="/monitoring/images/min-b.png" alt="hide"></a>&nbsp;<a href="#"
onClick="show('<%=graph.getDivName()%>');show('<%=graph.getDivName()%>Sub');"><img
border=0 src="/monitoring/images/max-b.png" alt="show"></a></div></div>
+<div id="<%=graph.getDivName()%>Head" style="background-color:#f2f2f2; height:20px;">
+    <span style="float:left; line-height:20px; vertical-align:middle;">
+        <%=graph.getName() %>
+    </span>
+    <span style="float:right;">
+        <a href="#" onClick="hide('<%=graph.getDivName()%>');hide('<%=graph.getDivName()%>Sub');">
+            <img border=0 src="/monitoring/images/min-b.png" alt="hide" style="vertical-align:middle;">
+        </a>
+    </span>
+    <span style="float:right;">&nbsp;</span>
+    <span style="float:right;">
+        <a href="#" onClick="show('<%=graph.getDivName()%>');show('<%=graph.getDivName()%>Sub');">
+            <img border=0 src="/monitoring/images/max-b.png" alt="show" style="vertical-align:middle;">
+        </a>
+    </span>
+</div>
 <%=graph.getDivImplement()%>
 <%
 }

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=1156008&r1=1156007&r2=1156008&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
Wed Aug 10 03:25:25 2011
@@ -37,12 +37,6 @@ 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() {
@@ -54,7 +48,9 @@ timerID = setTimeout("refreshPeriodic()"
 </script>
 </head>
 <body>
-<div id="<%=graph.getDivName()%>Head" style="background-color: #f2f2f2; border-top:
1px solid #2581c7; margin: 0px; width: 100%; height: 16px;"><div align="left" style="background-color:
#f2f2f2; float:left; text-align:left; width:75%; height: 20px;"><%=divNameString%></div><div
align=right style="background-color: #f2f2f2; float:left; width:25%; text-align:right;"></div></div>
+<div id="<%=graph.getDivName()%>Head" style="background-color: #f2f2f2; height:
20px;">
+    <span style="line-height:20px; vertical-align:middle;"><%=divNameString%></span>
+</div>
 <%=divImplString %>
 </body>
 </html>



Mime
View raw message