[rhmessaging-commits] rhmessaging commits: r1115 - mgmt/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Fri Oct 19 09:43:30 EDT 2007
Author: justi9
Date: 2007-10-19 09:43:30 -0400 (Fri, 19 Oct 2007)
New Revision: 1115
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
Log:
Blows away the discussed vs. proposed top-level switch in favor of the
proposed views. Removes some of the older variants of tabs.
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-19 01:34:08 UTC (rev 1114)
+++ mgmt/cumin/python/cumin/page.py 2007-10-19 13:43:30 UTC (rev 1115)
@@ -165,33 +165,11 @@
def __init__(self, app, name):
super(MainView, self).__init__(app, name)
- self.tabs = self.DiscussedTabs(app, "tabs")
- self.add_tab(self.tabs)
+ self.add_tab(self.ServerTab(app, "servers"))
+ self.add_tab(self.ServerGroupTab(app, "groups"))
+ self.add_tab(self.ServerProfileTab(app, "profiles"))
+ self.add_tab(self.ClusterTab(app, "clusters"))
- self.servers = self.ServerTab(app, "servers")
- self.tabs.add_tab(self.servers)
-
- self.tabs.add_tab(self.ClusterTab(app, "clusters"))
- self.tabs.add_tab(self.ServerProfileTab(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.ServerGroupTab(app, "groups"))
- self.proposed.add_tab(self.ServerProfileTab(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)
@@ -204,22 +182,14 @@
def render_title(self, session, model):
return "Servers (%i)" % len(model.get_servers())
- class ClusterTab(ClusterBrowser):
+ class ServerGroupTab(ServerGroupSet):
def render_title(self, session, model):
- return "Clusters (%i)" % len(model.get_clusters())
+ return "Server Groups (%i)" % len(model.get_server_groups())
class ServerProfileTab(ServerProfileSet):
def render_title(self, session, model):
return "Server Profiles (%i)" % len(model.get_server_profiles())
- class ServerGroupTab(ServerGroupSet):
+ class ClusterTab(ClusterSet):
def render_title(self, session, model):
- return "Server Groups (%i)" % len(model.get_server_groups())
-
- class PServerTab(PServerBrowser):
- def render_title(self, session, model):
- return "Servers (%i)" % len(model.get_servers())
-
- class PClusterTab(ClusterSet):
- def render_title(self, session, model):
return "Clusters (%i)" % len(model.get_clusters())
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-19 01:34:08 UTC (rev 1114)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-19 13:43:30 UTC (rev 1115)
@@ -423,8 +423,8 @@
<div class="oblock">
<h1>{title}</h1>
- <ul class="radiotabs tabs">{tabs}</ul>
- <div class="radiotabs mode">{mode}</div>
+ <ul class="TabSet tabs">{tabs}</ul>
+ <div class="TabSet mode">{mode}</div>
</div>
[ServerGroupTab.html]
@@ -455,7 +455,7 @@
{items}
</table>
-[PClusterTab.html]
+[ClusterTab.html]
<ul class="actions">
<li><a href="">Add Cluster</a></li>
</ul>
Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py 2007-10-19 01:34:08 UTC (rev 1114)
+++ mgmt/cumin/python/cumin/server.py 2007-10-19 13:43:30 UTC (rev 1115)
@@ -155,8 +155,6 @@
else:
raise Exception()
- print "yoyo", source, prop.value
-
self.process_cancel(session, prop)
def process_display(self, session, prop):
@@ -266,9 +264,9 @@
def render_title(self, session, server):
return "Log Messages"
-class ServerBrowser(Widget):
+class OldServerBrowser(Widget):
def __init__(self, app, name):
- super(ServerBrowser, self).__init__(app, name)
+ super(OldServerBrowser, self).__init__(app, name)
self.param = ServerGroupParameter(app, "group")
self.add_parameter(self.param)
@@ -358,9 +356,9 @@
else:
return sorted_by(self.app.model.get_servers())
-class PServerBrowser(Widget):
+class ServerBrowser(Widget):
def __init__(self, app, name):
- super(PServerBrowser, self).__init__(app, name)
+ super(ServerBrowser, self).__init__(app, name)
self.group_tmpl = Template(self, "group_html")
self.profile_tmpl = Template(self, "profile_html")
@@ -454,4 +452,3 @@
class_ = param.get(session) is object and "selected"
return link(href, name, class_)
-
Modified: mgmt/cumin/python/cumin/server.strings
===================================================================
--- mgmt/cumin/python/cumin/server.strings 2007-10-19 01:34:08 UTC (rev 1114)
+++ mgmt/cumin/python/cumin/server.strings 2007-10-19 13:43:30 UTC (rev 1115)
@@ -148,7 +148,7 @@
width: 80%;
}
-[ServerBrowser.html]
+[OldServerBrowser.html]
<div class="ServerBrowser groups">
<ul class="groups"><li>{all_servers_link}</li></ul>
@@ -178,10 +178,7 @@
[BrowserGroups.group_html]
<li>{group_link}</li>
-[PServerBrowser.css]
-
-
-[PServerBrowser.html]
+[ServerBrowser.html]
<table class="browser">
<tr>
<td class="nav">
@@ -205,13 +202,13 @@
</tr>
</div>
-[PServerBrowser.group_html]
+[ServerBrowser.group_html]
<li>{group_link}</li>
-[PServerBrowser.profile_html]
+[ServerBrowser.profile_html]
<li>{profile_link}</li>
-[PServerBrowser.cluster_html]
+[ServerBrowser.cluster_html]
<li>{cluster_link}</li>
[BrowserServers.html]
More information about the rhmessaging-commits
mailing list