GERONIMO-6076 Graphics cannot be displayed on monitoring porlet (Thanks fang shenghao for the patch!)
git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/trunk@1156008 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp b/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
index cb7780e..e4233c6 100644
--- a/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
+++ b/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
@@ -56,12 +56,6 @@
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 @@
{
%>
<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> <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;"> </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()%>
<%
}
diff --git a/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp b/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp
index fb5d5ba..e91ea81 100644
--- a/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp
+++ b/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp
@@ -37,12 +37,6 @@
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 @@
</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>
