[rhmessaging-commits] rhmessaging commits: r982 - mgmt/cumin/python/cumin.
Author: justi9
Date: 2007-10-09 13:31:30 -0400 (Tue, 09 Oct 2007)
New Revision: 982
Modified:
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/cumin/server.py
mgmt/cumin/python/cumin/server.strings
Log:
Add a server group set and use it in the server properties.
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-09 17:13:02 UTC (rev 981)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-09 17:31:30 UTC (rev 982)
@@ -26,6 +26,10 @@
color: #06c;
}
+ul {
+ list-style: none;
+}
+
#head {
padding: 0.4em 0.75em 0.2em 0.75em;
}
Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py 2007-10-09 17:13:02 UTC (rev 981)
+++ mgmt/cumin/python/cumin/server.py 2007-10-09 17:31:30 UTC (rev 982)
@@ -77,10 +77,20 @@
def render_title(self, session, server):
return "Server '%s'" % server.name
+class ServerGroupSet(ItemSet):
+ def render_item_content(self, session, group):
+ branch = session.branch()
+ self.page().show_server_group(branch, group).show_view(branch)
+
+ return mlink(branch.marshal(), "ServerGroup", group.name)
+
class ServerView(Widget):
def __init__(self, app, name):
super(ServerView, self).__init__(app, name)
+ self.groups = self.ServerServerGroups(app, "groups")
+ self.add_child(self.groups)
+
self.tabs = TabSet(app, "tabs")
self.add_child(self.tabs)
@@ -109,6 +119,10 @@
return html
+ class ServerServerGroups(ServerGroupSet):
+ def get_items(self, session, server):
+ return sorted(server.server_group_items(), cmp, lambda x: x.name)
+
class ServerVirtualHosts(VirtualHostSet):
def render_title(self, session, server):
return "Virtual Hosts (%i)" % len(server.virtual_host_items())
Modified: mgmt/cumin/python/cumin/server.strings
===================================================================
--- mgmt/cumin/python/cumin/server.strings 2007-10-09 17:13:02 UTC (rev 981)
+++ mgmt/cumin/python/cumin/server.strings 2007-10-09 17:31:30 UTC (rev 982)
@@ -28,11 +28,13 @@
<dl class="properties">
<dt>Name</dt><dd>{name}</dd>
<dt>Cluster</dt><dd>{cluster_link}</dd>
+ <dt>Server Groups</dt><dd>{groups}</dd>
</dl>
<ul class="actions">
<li><a href="">Shutdown</a></li>
</ul>
+
{tabs}
</div>
@@ -64,7 +66,7 @@
<ul class="actions">
<li><a href="">Add Server</a></li>
- <li><a href="">Shutdown All Servers in
Group</a></li>
+ <li><a href="">Shutdown Servers</a></li>
</ul>
{tabs}