Author: jstrachan
Date: Tue May 2 08:15:40 2006
New Revision: 398958
URL: http://svn.apache.org/viewcvs?rev=398958&view=rev
Log:
tidied up atom and RSS icons and fixed the queue graph to show the queue names
on the X axis
Added:
incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/feed_atom.png
(with props)
incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/feed_rss.png
(with props)
Removed:
incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/atombadge.png
incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/rssbadge.gif
Modified:
incubator/activemq/trunk/activemq-web-console/src/main/webapp/queueGraph.jsp
incubator/activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp
Added:
incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/feed_atom.png
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/feed_atom.png?rev=398958&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/feed_atom.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/feed_rss.png
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/feed_rss.png?rev=398958&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/feed_rss.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
incubator/activemq/trunk/activemq-web-console/src/main/webapp/queueGraph.jsp
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web-console/src/main/webapp/queueGraph.jsp?rev=398958&r1=398957&r2=398958&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web-console/src/main/webapp/queueGraph.jsp
(original)
+++
incubator/activemq/trunk/activemq-web-console/src/main/webapp/queueGraph.jsp
Tue May 2 08:15:40 2006
@@ -13,25 +13,22 @@
<body>
<script>
-function drawGraph() {
- var layout = new PlotKit.Layout("bar", {});
-
- layout.addDataset(
- "Queue Sizes",
- [ <c:forEach items="${requestContext.brokerQuery.queues}" var="row"
varStatus="status"> [${status.count},
-${row.queueSize}], </c:forEach> ] );
- layout.evaluate();
-
var options = {
"IECanvasHTC": "<c:url value="/js/plotkit/iecanvas.htc"/>",
"colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),
"padding": {left: 0, right: 0, top: 10, bottom: 30},
- "xTicks": [
- <c:forEach items="${requestContext.brokerQuery.queues}" var="row"
varStatus="status"> {v:${status.count}, label:"${row.name}"}, </c:forEach>
- ],
- "drawYAxis": false
+ "xTicks": [<c:forEach items="${requestContext.brokerQuery.queues}"
var="row" varStatus="status"
+ ><c:if
+ test="${status.count > 1}">, </c:if>{v:${status.count},
label:"${row.name}"}</c:forEach>]
};
+function drawGraph() {
+ var layout = new PlotKit.Layout("bar", options);
+
+ layout.addDataset("sqrt", [<c:forEach
items="${requestContext.brokerQuery.queues}" var="row" varStatus="status"><c:if
+ test="${status.count > 1}">, </c:if> [${status.count},
${row.queueSize}] </c:forEach> ]);
+ layout.evaluate();
+
var canvas = MochiKit.DOM.getElement("graph");
var plotter = new PlotKit.SweetCanvasRenderer(canvas, layout, options);
plotter.render();
Modified:
incubator/activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp?rev=398958&r1=398957&r2=398958&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp
(original)
+++ incubator/activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp
Tue May 2 08:15:40 2006
@@ -44,8 +44,8 @@
<%--
<a href="graph.jsp?JMSDestination=${row.name}">Graph</a>
--%>
- <a href="queueBrowse/${row.name}?view=rss&feedType=atom_1.0" title="Atom
1.0"><img src="images/atombadge.png"/></a>
- <a href="queueBrowse/${row.name}?view=rss&ffeedType=rss_2.0" title="RSS
2.0"><img src="images/rssbadge.gif"/></a>
+ <a href="queueBrowse/${row.name}?view=rss&feedType=atom_1.0" title="Atom
1.0"><img src="images/feed_atom.png"/></a>
+ <a href="queueBrowse/${row.name}?view=rss&ffeedType=rss_2.0" title="RSS
2.0"><img src="images/feed_rss.png"/></a>
</td>
<td>
<a
href="send.jsp?JMSDestination=${row.name}&JMSDestinationType=queue">Send To</a>
