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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-10-17 13:54:51 -0400 (Wed, 17 Oct 2007)
New Revision: 1104

Modified:
   mgmt/cumin/python/cumin/page.py
   mgmt/cumin/python/cumin/page.strings
Log:
Adds a top-level switch flipping between the discussed views and one
I'm proposing.



Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py	2007-10-17 16:14:13 UTC (rev 1103)
+++ mgmt/cumin/python/cumin/page.py	2007-10-17 17:54:51 UTC (rev 1104)
@@ -157,13 +157,32 @@
     def __init__(self, app, name):
         super(MainView, self).__init__(app, name)
 
+        self.tabs = self.DiscussedTabs(app, "tabs")
+        self.add_tab(self.tabs)
+
         self.servers = self.ServerTab(app, "servers")
-        self.add_tab(self.servers)
+        self.tabs.add_tab(self.servers)
 
-        self.add_tab(self.ClusterTab(app, "clusters"))
-        self.add_tab(self.ClusterTabII(app, "clusters2"))
-        self.add_tab(self.ProfileTab(app, "profiles"))
+        self.tabs.add_tab(self.ClusterTab(app, "clusters"))
+        self.tabs.add_tab(self.ProfileTab(app, "profiles"))
 
+        # Proposed
+
+        self.proposed = self.ProposedTabs(app, "proposed")
+        self.add_tab(self.proposed)
+
+        #self.proposed.add_tab(self.PServerTab(app, "servers"))
+        self.proposed.add_tab(self.ProfileTab(app, "profiles"))
+        self.proposed.add_tab(self.PClusterTab(app, "clusters"))
+
+    class DiscussedTabs(TabSet):
+        def render_title(self, session, object):
+            return "Discussed"
+
+    class ProposedTabs(TabSet):
+        def render_title(self, session, object):
+            return "Proposed"
+
     def show_server_group(self, session, group):
         mode = self.show_mode(session, self.servers)
         mode.set_object(session, group)
@@ -180,9 +199,9 @@
         def render_title(self, session, model):
             return "Clusters (%i)" % len(model.get_clusters())
 
-    class ClusterTabII(ClusterSet):
+    class PClusterTab(ClusterSet):
         def render_title(self, session, model):
-            return "Clusters II (%i)" % len(model.get_clusters())
+            return "Clusters (%i)" % len(model.get_clusters())
 
     class ProfileTab(Widget):
         def __init__(self, app, name):

Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings	2007-10-17 16:14:13 UTC (rev 1103)
+++ mgmt/cumin/python/cumin/page.strings	2007-10-17 17:54:51 UTC (rev 1104)
@@ -88,6 +88,7 @@
 
 h1 {
   font-size: 1.1em;
+  margin: 0 0 1em 0;
 }
 
 h1 img {
@@ -397,6 +398,6 @@
 <div class="oblock">
   <h1>{title}</h1>
 
-  <ul class="TabSet tabs">{tabs}</ul>
-  <div class="TabSet mode">{mode}</div>
+  <ul class="radiotabs tabs">{tabs}</ul>
+  <div class="radiotabs mode">{mode}</div>
 </div>