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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-11-02 16:18:16 -0400 (Fri, 02 Nov 2007)
New Revision: 1222

Modified:
   mgmt/cumin/python/cumin/exchange.py
   mgmt/cumin/python/cumin/exchange.strings
   mgmt/cumin/python/cumin/queue.py
   mgmt/cumin/python/cumin/queue.strings
Log:
Some renaming in order to shorten a url var.



Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py	2007-11-02 20:13:52 UTC (rev 1221)
+++ mgmt/cumin/python/cumin/exchange.py	2007-11-02 20:18:16 UTC (rev 1222)
@@ -35,13 +35,13 @@
     def __init__(self, app, name):
         super(ExchangeSet, self).__init__(app, name)
 
-        self.unit = UnitSwitch(app, "unit_switch")
+        self.unit = UnitSwitch(app, "unit")
         self.add_child(self.unit)
     
     def render_title(self, session, vhost):
         return "Exchanges (%s)" % len(vhost.exchange_items())
 
-    def render_unit(self, session, vhost):
+    def render_unit_plural(self, session, vhost):
         return self.unit.get(session) == "b" and "Bytes" or "Msgs."
 
     def get_items(self, session, vhost):

Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings	2007-11-02 20:13:52 UTC (rev 1221)
+++ mgmt/cumin/python/cumin/exchange.strings	2007-11-02 20:18:16 UTC (rev 1222)
@@ -12,16 +12,16 @@
 }
 
 [ExchangeSet.html]
-{unit_switch}
+{unit}
 
 <table class="mobjects">
   <tr>
     <th>Name</th>
     <th class="ralign">Producers</th>
     <th class="ralign">Queue Bindings</th>
-    <th class="ralign">{unit} Received</th>
-    <th class="ralign">{unit} Dropped</th>
-    <th class="ralign">{unit} Routed</th>
+    <th class="ralign">{unit_plural} Received</th>
+    <th class="ralign">{unit_plural} Dropped</th>
+    <th class="ralign">{unit_plural} Routed</th>
     <th>Status</th>
   </tr>
 

Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2007-11-02 20:13:52 UTC (rev 1221)
+++ mgmt/cumin/python/cumin/queue.py	2007-11-02 20:18:16 UTC (rev 1222)
@@ -33,13 +33,13 @@
     def __init__(self, app, name):
         super(QueueSet, self).__init__(app, name)
 
-        self.unit = UnitSwitch(app, "unit_switch")
+        self.unit = UnitSwitch(app, "unit")
         self.add_child(self.unit)
 
     def render_title(self, session, vhost):
         return "Queues (%s)" % len(vhost.queue_items())
 
-    def render_unit(self, session, vhost):
+    def render_unit_singular(self, session, vhost):
         return self.unit.get(session) == "b" and "Byte" or "Msg."
 
     def render_unit_plural(self, session, vhost):

Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings	2007-11-02 20:13:52 UTC (rev 1221)
+++ mgmt/cumin/python/cumin/queue.strings	2007-11-02 20:18:16 UTC (rev 1222)
@@ -7,7 +7,7 @@
 
 [QueueSet.html]
 <form action="{href}" method="get">
-  {unit_switch}
+  {unit}
 
   <div class="sactions">
     <h2>Act on Selected Queues:</h2>
@@ -22,7 +22,7 @@
       <th class="ralign">Exchange Bindings</th>
       <th class="ralign">{unit_plural} Enqueued</th>
       <th class="ralign">{unit_plural} Dequeued</th>
-      <th class="ralign">{unit} Depth</th>
+      <th class="ralign">{unit_singular} Depth</th>
       <th class="ralign">Depth Accel.</th>
       <th>Status</th>
     </tr>