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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-12-12 11:42:57 -0500 (Wed, 12 Dec 2007)
New Revision: 1465

Modified:
   mgmt/cumin/python/cumin/client.strings
   mgmt/cumin/python/cumin/exchange.strings
   mgmt/cumin/python/cumin/queue.strings
   mgmt/cumin/python/cumin/widgets.strings
Log:
Hides the errors and warnings in status boxes.  We don't have real
data for them yet.

Adds pending actions where it was missing.

Fixes up client status javascript.



Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings	2007-12-12 16:33:33 UTC (rev 1464)
+++ mgmt/cumin/python/cumin/client.strings	2007-12-12 16:42:57 UTC (rev 1465)
@@ -36,24 +36,26 @@
 function updateClientStatus(id, client) {
     updateStatus(id, client);
 
-    var m = client.measurement;
-    var mdata = {
+    var s = client.stat;
+    var sdata = {
         "tr": [
             null,
-            {"td": [m.msgsProduced.rate, m.bytesProduced.rate]},
-            {"td": [m.msgsConsumed.rate, m.bytesConsumed.rate]}
+            {"td": [s.msgsProduced.rate, s.bytesProduced.rate]},
+            {"td": [s.msgsConsumed.rate, s.bytesConsumed.rate]}
         ]
     };
 
-    wooly.doc().elembyid(id).descendant("table.tbody").update(mdata);
+    wooly.doc().elembyid(id).descendant("table.tbody").update(sdata);
 }
 
 [ClientStatus.html]
 <div id="{id}" class="{class}">
-  <h2>Client Status</h2>
+  <h2>Status</h2>
 
-  <div>{status_info}</div>
+  <!-- <div>{status_info}</div> -->
 
+  <div>{pending_actions}</div>
+
   <table>
     <tr>
       <th></th>

Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings	2007-12-12 16:33:33 UTC (rev 1464)
+++ mgmt/cumin/python/cumin/exchange.strings	2007-12-12 16:42:57 UTC (rev 1465)
@@ -103,9 +103,9 @@
 
 [ExchangeStatus.html]
 <div id="{id}" class="{class}">
-  <h2>Exchange Status</h2>
+  <h2>Status</h2>
 
-  <div>{status_info}</div>
+  <!-- <div>{status_info}</div> -->
 
   <div>{actions_pending}</div>
 

Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings	2007-12-12 16:33:33 UTC (rev 1464)
+++ mgmt/cumin/python/cumin/queue.strings	2007-12-12 16:42:57 UTC (rev 1465)
@@ -109,9 +109,9 @@
 
 [QueueStatus.html]
 <div id="{id}" class="{class}">
-  <h2>Queue Status</h2>
+  <h2>Status</h2>
 
-  <div>{status_info}</div>
+  <!-- <div>{status_info}</div> -->
 
   <div>{actions_pending}</div>
 

Modified: mgmt/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/cumin/python/cumin/widgets.strings	2007-12-12 16:33:33 UTC (rev 1464)
+++ mgmt/cumin/python/cumin/widgets.strings	2007-12-12 16:42:57 UTC (rev 1465)
@@ -15,14 +15,15 @@
 
 [CuminStatus.javascript]
 function updateStatus(id, object) {
+    var status = wooly.doc().elembyid(id);
+
+    /*
     var ecount = object.events.errors
     var errors = ecount + " " + (ecount == "1" && "error" || "errors");
 
     var wcount = object.events.warnings
     var warnings = wcount + " " + (wcount == "1" && "warning" || "warnings");
 
-    var status = wooly.doc().elembyid(id);
-
     if (ecount != "0") {
         status.setattr("class", "mstatus red");
     } else if (wcount != "0") {
@@ -30,10 +31,11 @@
     } else {
         status.setattr("class", "mstatus green");
     }
+    */
 
     var divs = status.elems("div", null, null, 0, 2)
 
-    divs.next().set(errors + ", " + warnings);
+    //divs.next().set(errors + ", " + warnings);
 
     var acount = object.actions.pending;
     var actions = acount + " " + (acount == "1" && "action" || "actions") + " pending";
@@ -45,7 +47,7 @@
 <div id="{id}" class="{class}">
   <h2>Status</h2>
 
-  <div>{status_info}</div>
+  <!-- <div>{status_info}</div> -->
 
   <div>{actions_pending}</div>
 </div>