Return-Path: 
 <activemq-commits-return-1681-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 53400 invoked from network); 2 May 2006 15:23:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 May 2006 15:23:14 -0000
Received: (qmail 43623 invoked by uid 500); 2 May 2006 15:20:59 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 43597 invoked by uid 500); 2 May 2006 15:20:58 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 43588 invoked by uid 99); 2 May 2006 15:20:58 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 May 2006 08:20:58 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 02 May 2006 08:20:56 -0700
Received: (qmail 50580 invoked by uid 65534); 2 May 2006 15:17:56 -0000
Message-ID: <20060502151754.50372.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r398958 - in
 /incubator/activemq/trunk/activemq-web-console/src/main/webapp:
 images/atombadge.png images/feed_atom.png images/feed_rss.png
 images/rssbadge.gif queueGraph.jsp queues.jsp
Date: Tue, 02 May 2006 15:16:39 -0000
To: activemq-commits@geronimo.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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>