[rhmessaging-commits] rhmessaging commits: r1007 - mgmt/cumin/python/cumin.
Author: justi9
Date: 2007-10-11 09:47:29 -0400 (Thu, 11 Oct 2007)
New Revision: 1007
Modified:
mgmt/cumin/python/cumin/cluster.strings
mgmt/cumin/python/cumin/page.py
mgmt/cumin/python/cumin/page.strings
Log:
Sketches in some columns in the cluster table. Refactors the cluster
tab a little.
Modified: mgmt/cumin/python/cumin/cluster.strings
===================================================================
--- mgmt/cumin/python/cumin/cluster.strings 2007-10-11 13:37:38 UTC (rev 1006)
+++ mgmt/cumin/python/cumin/cluster.strings 2007-10-11 13:47:29 UTC (rev 1007)
@@ -2,17 +2,20 @@
<table class="ClusterSet mobjects">
<tr>
<th>Cluster</th>
+ <th>Configuration</th>
+ <th>Status</th>
</tr>
+
{items}
</table>
[ClusterSet.item_html]
<tr>
<td>{item_link}</td>
+ <td>3 servers</td>
+ <td>0 errors, 0 warnings</td>
</tr>
-
-
[ClusterView.html]
<div class="oblock">
<div class="mstatus green" id="{id}">
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-11 13:37:38 UTC (rev 1006)
+++ mgmt/cumin/python/cumin/page.py 2007-10-11 13:47:29 UTC (rev 1007)
@@ -178,9 +178,16 @@
def render_title(self, session, model):
return "Servers (%i)" % len(model.get_servers())
- class ClusterTab(ClusterSet):
- pass
+ class ClusterTab(Widget):
+ def __init__(self, app, name):
+ super(MainView.ClusterTab, self).__init__(app, name)
+ self.clusters = ClusterSet(app, "clusters")
+ self.add_child(self.clusters)
+
+ def render_title(self, session, model):
+ return self.clusters.render_title(session, model)
+
class VirtualHostTab(TabSet):
def __init__(self, app, name):
super(MainView.VirtualHostTab, self).__init__(app, name)
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-11 13:37:38 UTC (rev 1006)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-11 13:47:29 UTC (rev 1007)
@@ -377,12 +377,7 @@
<li><a href="">Add Cluster</a></li>
</ul>
-<table class="mobjects">
- <tr>
- <th>Cluster</th>
- </tr>
- {items}
-</table>
+{clusters}
[VirtualHostTab.html]
<ul class="radiotabs tabs">{tabs}</ul>