[rhmessaging-commits] rhmessaging commits: r1919 - mgmt/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-04-15 20:47:10 -0400 (Tue, 15 Apr 2008)
New Revision: 1919

Modified:
   mgmt/cumin/python/cumin/exchange.py
   mgmt/cumin/python/cumin/exchange.strings
   mgmt/cumin/python/cumin/page.strings
   mgmt/cumin/python/cumin/queue.strings
   mgmt/cumin/python/cumin/stat.strings
Log:
Reorganize exchange stats.

Adjust spacing.



Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py	2008-04-16 00:46:10 UTC (rev 1918)
+++ mgmt/cumin/python/cumin/exchange.py	2008-04-16 00:47:10 UTC (rev 1919)
@@ -199,7 +199,7 @@
         self.__tabs = TabbedModeSet(app, "tabs")
         self.add_child(self.__tabs)
 
-        self.__tabs.add_tab(ExchangeStatistics(app, "stats"))
+        self.__tabs.add_tab(ExchangeStats(app, "stats"))
 
         self.__bindings = ExchangeBindingSet(app, "bindings")
         self.__tabs.add_tab(self.__bindings)
@@ -358,57 +358,24 @@
     def render_cancel_content(self, session, exchange):
         return "No, Cancel"
 
-class ExchangeStatistics(TabbedModeSet):
+class ExchangeStats(TabbedModeSet):
     def __init__(self, app, name):
-        super(ExchangeStatistics, self).__init__(app, name)
+        super(ExchangeStats, self).__init__(app, name)
 
-        self.add_tab(self.StatisticsCurrent(app, "current"))
-        self.add_tab(self.StatisticsHistory(app, "history"))
+        self.add_child(StatSet(app, "general", "general"))
 
-    def get_args(self, session):
-        return self.frame.get_args(session)
+        chart = StatValueChart(app, "inout")
+        chart.stats = ("msgReceives", "msgRoutes")
+        chart.mode = "rate"
+        self.add_child(chart)
 
-    def render_title(self, session, exchange):
+        chart = StatValueChart(app, "producers")
+        chart.stats = ("producers",)
+        self.add_child(chart)
+
+    def render_title(self, session):
         return "Statistics"
 
-    class StatisticsCurrent(Widget):
-        def __init__(self, app, name):
-            super(ExchangeStatistics.StatisticsCurrent, self).__init__ \
-                (app, name)
-
-            self.add_child(StatSet(app, "general", "general"))
-
-        def get_args(self, session):
-            return self.frame.get_args(session)
-
-        def render_title(self, session, exchange):
-            return "Current"
-
-    class StatisticsHistory(Widget):
-        def __init__(self, app, name):
-            super(ExchangeStatistics.StatisticsHistory, self).__init__ \
-                (app, name)
-
-            chart = StatValueChart(app, "received")
-            chart.stats = ("msgReceives",)
-            chart.mode = "rate"
-            self.add_child(chart)
-
-            chart = StatValueChart(app, "routed")
-            chart.stats = ("msgRoutes",)
-            chart.mode = "rate"
-            self.add_child(chart)
-
-            chart = StatValueChart(app, "dropped")
-            chart.stats = ("msgDrops",)
-            self.add_child(chart)
-
-        def get_args(self, session):
-            return self.frame.get_args(session)
-
-        def render_title(self, session, exchange):
-            return "History"
-
 class ExchangeProducerSet(ItemSet):
     def get_args(self, session):
         return self.frame.get_args(session)

Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings	2008-04-16 00:46:10 UTC (rev 1918)
+++ mgmt/cumin/python/cumin/exchange.strings	2008-04-16 00:47:10 UTC (rev 1919)
@@ -197,11 +197,7 @@
   <td class="ralign">{item_messages_matched}</td>
 </tr>
 
-[ExchangeStatistics.html]
-<ul class="radiotabs tabs">{tabs}</ul>
-<div class="radiotabs mode">{mode}</div>
-
-[StatisticsCurrent.html]
+[ExchangeStats.html]
 <table class="layout">
   <tr>
     <td class="twocol">
@@ -209,20 +205,12 @@
       {general}
     </td>
     <td class="twocol">
+      {inout}
+      {producers}
     </td>
   </tr>
 </table>
 
-[StatisticsHistory.html]
-<h2>Messages Received</h2>
-<div class="iblock chart">{received}</div>
-
-<h2>Messages Routed</h2>
-<div class="iblock chart">{routed}</div>
-
-<h2>Messages Dropped</h2>
-<div class="iblock chart">{dropped}</div>
-
 [ExchangeProducerSet.html]
 <div class="sactions">
   <h2>Act on Selected Producers:</h2>

Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings	2008-04-16 00:46:10 UTC (rev 1918)
+++ mgmt/cumin/python/cumin/page.strings	2008-04-16 00:47:10 UTC (rev 1919)
@@ -466,18 +466,9 @@
 
 td.twocol {
   width: 50%;
+  padding: 0 1em 0 0;
 }
 
-td.twocol h2 {
-  font-weight: bold;
-  margin: 0;
-}
-
-td.twocol table {
-  border: 1px dotted #ddd;
-  margin: 1em;
-}
-
 table.layout {
   width: 100%;
 }

Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings	2008-04-16 00:46:10 UTC (rev 1918)
+++ mgmt/cumin/python/cumin/queue.strings	2008-04-16 00:47:10 UTC (rev 1919)
@@ -186,21 +186,19 @@
 <div class="radiotabs mode">{mode}</div>
 
 [GeneralQueueStats.html]
-<div class="rfloat" style="width: 50%">
-  {enqdeq}
+<table class="layout">
+  <tr>
+    <td class="twocol">
+      {general}
+    </td>
+    <td class="twocol">
+      {enqdeq}
+      {depth}
+      {consumers}
+    </td>
+  </tr>
+</table>
 
-  {depth}
-
-  {consumers}
-</div>
-
-{general}
-
-<br/>
-<br/>
-<br/>
-<br/>
-
 [QueueConsumerSet.html]
 <div class="sactions">
   <h2>Act on Selected Consumers:</h2>

Modified: mgmt/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/cumin/python/cumin/stat.strings	2008-04-16 00:46:10 UTC (rev 1918)
+++ mgmt/cumin/python/cumin/stat.strings	2008-04-16 00:47:10 UTC (rev 1919)
@@ -117,7 +117,7 @@
 [StatValueChart.css]
 div.StatValueChart {
   font-size: 0.9em;
-  margin: 0 0 1em 1em;
+  margin: 0 0 1em 0;
   width: 30em;
 }