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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-10-23 14:45:18 -0400 (Tue, 23 Oct 2007)
New Revision: 1149

Modified:
   mgmt/cumin/python/cumin/page.py
   mgmt/cumin/python/cumin/page.strings
   mgmt/cumin/python/cumin/server.py
   mgmt/cumin/python/cumin/server.strings
   mgmt/cumin/python/cumin/servergroup.py
   mgmt/cumin/python/cumin/servergroup.strings
Log:
Adds checkboxes to server groups.  Refactors server group set a
little.  Adds a version field to the server view.



Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py	2007-10-23 18:31:45 UTC (rev 1148)
+++ mgmt/cumin/python/cumin/page.py	2007-10-23 18:45:18 UTC (rev 1149)
@@ -164,9 +164,10 @@
         super(MainView, self).__init__(app, name)
 
         self.add_tab(self.ServerTab(app, "servers"))
-        self.add_tab(self.ServerGroupTab(app, "groups"))
+        self.add_tab(ServerGroupSet(app, "groups"))
         self.add_tab(self.ServerProfileTab(app, "profiles"))
         self.add_tab(self.ClusterTab(app, "clusters"))
+        self.add_tab(self.TagTab(app, "tags"))
 
     def show_server_group(self, session, group):
         mode = self.show_mode(session, self.servers)
@@ -180,15 +181,6 @@
         def render_title(self, session, model):
             return "Servers (%i)" % len(model.get_servers())
 
-    class ServerGroupTab(ServerGroupSet):
-        def render_title(self, session, model):
-            return "Server Groups (%i)" % len(model.get_server_groups())
-
-        def render_group_add_href(self, session, model):
-            branch = session.branch()
-            self.page().show_server_group_add(branch)
-            return branch.marshal()
-
     class ServerProfileTab(ServerProfileSet):
         def render_title(self, session, model):
             return "Server Profiles (%i)" % len(model.get_server_profiles())
@@ -196,3 +188,7 @@
     class ClusterTab(ClusterSet):
         def render_title(self, session, model):
             return "Clusters (%i)" % len(model.get_clusters())
+
+    class TagTab(Widget):
+        def render_title(self, session, model):
+            return "Tags"

Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings	2007-10-23 18:31:45 UTC (rev 1148)
+++ mgmt/cumin/python/cumin/page.strings	2007-10-23 18:45:18 UTC (rev 1149)
@@ -455,21 +455,6 @@
   <div class="TabSet mode">{mode}</div>
 </div>
 
-[ServerGroupTab.html]
-<ul class="actions">
-  <li><a href="{group_add_href}">Add Server Group</a></li>
-</ul>
-
-<table class="mobjects">
-  <tr>
-    <th>Server</th>
-    <th>Configuration</th>
-    <th>Status</th>
-  </tr>
-
-  {items}
-</table>
-
 [ServerProfileTab.html]
 <ul class="actions">
   <li><a href="">Add Server Profile</a></li>

Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py	2007-10-23 18:31:45 UTC (rev 1148)
+++ mgmt/cumin/python/cumin/server.py	2007-10-23 18:45:18 UTC (rev 1149)
@@ -258,6 +258,9 @@
 
         return html
 
+    def render_version(self, session, server):
+        return "1.0"
+
     class ServerVirtualHostTab(VirtualHostSet):
         def render_title(self, session, server):
             return "Functional Hosts (%i)" % len(server.virtual_host_items())

Modified: mgmt/cumin/python/cumin/server.strings
===================================================================
--- mgmt/cumin/python/cumin/server.strings	2007-10-23 18:31:45 UTC (rev 1148)
+++ mgmt/cumin/python/cumin/server.strings	2007-10-23 18:45:18 UTC (rev 1149)
@@ -151,6 +151,7 @@
     <dt>Name</dt><dd>{name}</dd>
     <dt>Cluster</dt><dd>{cluster_link}</dd>
     <dt>Server Profile</dt><dd>{profile_link}</dd>
+    <dt>Software Version</dt><dd>{version}</dd>
   </dl>
 
   <ul class="actions">

Modified: mgmt/cumin/python/cumin/servergroup.py
===================================================================
--- mgmt/cumin/python/cumin/servergroup.py	2007-10-23 18:31:45 UTC (rev 1148)
+++ mgmt/cumin/python/cumin/servergroup.py	2007-10-23 18:45:18 UTC (rev 1149)
@@ -10,6 +10,14 @@
 strings = StringCatalog(__file__)
 
 class ServerGroupSet(ItemSet):
+    def render_title(self, session, model):
+        return "Server Groups (%i)" % len(model.get_server_groups())
+
+    def render_group_add_href(self, session, model):
+        branch = session.branch()
+        self.page().show_server_group_add(branch)
+        return branch.marshal()
+
     def get_items(self, session, model):
         return sorted_by(model.get_server_groups())
     

Modified: mgmt/cumin/python/cumin/servergroup.strings
===================================================================
--- mgmt/cumin/python/cumin/servergroup.strings	2007-10-23 18:31:45 UTC (rev 1148)
+++ mgmt/cumin/python/cumin/servergroup.strings	2007-10-23 18:45:18 UTC (rev 1149)
@@ -1,7 +1,17 @@
 [ServerGroupSet.html]
+<ul class="actions">
+  <li><a href="{group_add_href}">Add Server Group</a></li>
+</ul>
+
+<button>Shutdown</button>
+<button>Remove</button>
+
+<br/><br/>
+
 <table class="mobjects">
   <tr>
-    <th>Server</th>
+    <th><input type="checkbox"/></th>
+    <th>Server Group</th>
     <th>Configuration</th>
     <th>Status</th>
   </tr>
@@ -11,6 +21,7 @@
 
 [ServerGroupSet.item_html]
 <tr>
+  <td><input type="checkbox"/></td>
   <td>{item_link}</td>
   <td>{item_config}</td>
   <td>{item_status}</td>