[rhmessaging-commits] rhmessaging commits: r1064 - mgmt/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Sun Oct 14 16:31:09 EDT 2007
Author: justi9
Date: 2007-10-14 16:31:09 -0400 (Sun, 14 Oct 2007)
New Revision: 1064
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:
Clean up of the show_* methods used for navigation. Removes the extra
set of methods that was on MainFrame, and incorporates MainFrame into
CuminPage. Also simplifies context styling a bit.
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-14 18:17:44 UTC (rev 1063)
+++ mgmt/cumin/python/cumin/page.py 2007-10-14 20:31:09 UTC (rev 1064)
@@ -24,39 +24,70 @@
self.frame_tmpl = Template(self, "frame_html")
- self.main = MainFrame(app, "main")
- self.add_child(self.main)
- self.set_default_frame(self.main)
+ self.modes = ModeSet(app, "mode")
+ self.add_child(self.modes)
- class FramesAttribute(Attribute):
- def get_default(self, session):
- return list()
+ self.view = MainView(app, "view")
+ self.modes.add_child(self.view)
- def set_modal(self, session, modal):
- self.modal.set(session, modal)
+ self.server = ServerFrame(app, "server")
+ self.modes.add_child(self.server)
+ self.cluster = ClusterFrame(app, "cluster")
+ self.modes.add_child(self.cluster)
+
+ self.group_add = ServerGroupAdd(app, "group_add")
+ self.modes.add_child(self.group_add)
+
+ self.group_edit = ServerGroupEdit(app, "group_edit")
+ self.modes.add_child(self.group_edit)
+
def save_session(self, session):
if self.app.debug:
self.app.debug.sessions.append(session)
+ def set_modal(self, session, modal):
+ self.modal.set(session, modal)
+
+ def get_object(self, session, object):
+ return self.app.model
+
+ class FramesAttribute(Attribute):
+ def get_default(self, session):
+ return list()
+
+ def get_frames(self, session):
+ return self.frames.get(session)
+
+ def show_view(self, session):
+ self.set_current_frame(session, self)
+ return self.modes.show_mode(session, self.view)
+
def show_server(self, session, server):
cluster = server.get_cluster()
if cluster:
- frame = self.main.show_cluster(session, cluster)
+ frame = self.show_cluster(session, cluster)
frame = frame.show_server(session, server)
else:
- frame = self.main.show_server(session, server)
-
- return self.set_current_frame(session, frame)
+ frame = self.modes.show_mode(session, self.server)
+ frame.set_server(session, server)
- def show_server_group(self, session, sgroup):
- frame = self.main.show_server_group(session, sgroup)
- return self.set_current_frame(session, frame)
+ return self.page().set_current_frame(session, frame)
+ def show_server_group_add(self, session):
+ frame = self.modes.show_mode(session, self.group_add)
+ return self.page().set_current_frame(session, frame)
+
+ def show_server_group_edit(self, session, group):
+ frame = self.modes.show_mode(session, self.group_edit)
+ frame.set_server_group(session, group)
+ return self.page().set_current_frame(session, frame)
+
def show_cluster(self, session, cluster):
- frame = self.main.show_cluster(session, cluster)
- return self.set_current_frame(session, frame)
+ frame = self.modes.show_mode(session, self.cluster)
+ frame.set_cluster(session, cluster)
+ return self.page().set_current_frame(session, frame)
def show_virtual_host(self, session, vhost):
server = vhost.get_server()
@@ -67,11 +98,12 @@
elif cluster:
frame = self.show_cluster(session, cluster)
else:
- frame = self.main
+ raise Exception()
frame = frame.show_virtual_host(session, vhost)
- return self.set_current_frame(session, frame)
+ return self.page().set_current_frame(session, frame)
+
def show_queue(self, session, queue):
frame = self.show_virtual_host(session, queue.virtual_host)
frame = frame.show_queue(session, queue)
@@ -85,11 +117,13 @@
def render_class(self, session, object):
return self.modal.get(session) and "modal"
- def render_content(self, session, object):
- return self.main.render(session, object)
+ def render_href(self, session, object):
+ branch = session.branch()
+ self.show_view(branch)
+ return branch.marshal()
- def get_frames(self, session):
- return self.frames.get(session)
+ def render_title(self, session, model):
+ return "Red Hat Messaging"
def render_frames(self, session, object):
self.object.set(session, object)
@@ -108,52 +142,6 @@
object = frame.get_object(session, self.object.get(session))
return frame.render_title(session, object)
-class MainFrame(CuminFrame):
- def __init__(self, app, name):
- super(MainFrame, self).__init__(app, name)
-
- self.view = MainView(app, "view")
- self.add_child(self.view)
-
- self.server = ServerFrame(app, "server")
- self.add_child(self.server)
-
- self.cluster = ClusterFrame(app, "cluster")
- self.add_child(self.cluster)
-
- self.group_add = ServerGroupAdd(app, "group_add")
- self.add_child(self.group_add)
-
- self.group_edit = ServerGroupEdit(app, "group_edit")
- self.add_child(self.group_edit)
-
- def get_object(self, session, object):
- return self.app.model
-
- def show_view(self, session):
- return self.show_mode(session, self.view)
-
- def show_virtual_host(self, session, vhost):
- self.vhost.set_virtual_host(session, vhost)
- return self.show_mode(session, self.vhost)
-
- def show_server(self, session, server):
- self.server.set_server(session, server)
- return self.show_mode(session, self.server)
-
- def show_cluster(self, session, cluster):
- self.cluster.set_cluster(session, cluster)
- return self.show_mode(session, self.cluster)
-
- def show_group_add(self, session):
- return self.show_mode(session, self.group_add)
-
- def show_group_edit(self, session):
- return self.show_mode(session, self.group_edit)
-
- def render_title(self, session, model):
- return "<img src=\"resource?name=logo.png\"/>"
-
class MainView(Widget):
def __init__(self, app, name):
super(MainView, self).__init__(app, name)
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-14 18:17:44 UTC (rev 1063)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-14 20:31:09 UTC (rev 1064)
@@ -115,25 +115,17 @@
display: inline;
}
-ul#context li:after {
+ul#context li:before {
content: " > ";
font-weight: bold;
font-size: 0.8em;
color: #fff;
}
-ul#context li:last-child:after {
- content: "";
-}
-
ul#context li a {
color: #ff9f00;
}
-ul#context li:first-child a {
- vertical-align: -15%;
-}
-
ul#context li:last-child a {
color: #fff;
}
@@ -372,9 +364,11 @@
<li>Hi, <strong>nsantos</strong></li>
<li><a class="action" href="">Log Out</a></li>
</ul>
+
+ <a id="logo" href="{href}"><img src="resource?name=logo.png"/></a>
<ul id="context">{frames}</ul>
</div>
- <div id="body">{content}</div>
+ <div id="body">{mode}</div>
<div id="foot">
</div>
</body>
Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py 2007-10-14 18:17:44 UTC (rev 1063)
+++ mgmt/cumin/python/cumin/server.py 2007-10-14 20:31:09 UTC (rev 1064)
@@ -163,18 +163,17 @@
self.set_server_group(branch, None)
return link(branch.marshal(), "All Servers", class_)
+ def render_add_group_href(self, session, group):
+ branch = session.branch()
+ self.page().show_server_group_add(branch)
+ return branch.marshal()
+
def render_edit_group_href(self, session, group):
if group:
branch = session.branch()
- frame = self.page().main.show_group_edit(branch)
- frame.set_server_group(branch, group)
+ self.page().show_server_group_edit(branch, group)
return branch.marshal()
- def render_add_group_href(self, session, group):
- branch = session.branch()
- self.page().main.show_group_add(branch)
- return branch.marshal()
-
def render_remove_group_href(self, session, group):
if group:
branch = session.branch()
@@ -241,16 +240,16 @@
self.group_name = TextInput(app, "name", self)
self.add_child(self.group_name)
-class ServerGroupAdd(ServerGroupForm, Frame):
- def render_title(self, session, model):
- return "Add Group"
-
def on_cancel(self, session, model):
branch = session.branch()
- self.page().main.show_view(branch)
+ self.page().show_view(branch)
session.set_redirect(branch.marshal())
-class ServerGroupEdit(ServerGroupForm):
+class ServerGroupAdd(ServerGroupForm, Frame):
+ def render_title(self, session, model):
+ return "Add Group"
+
+class ServerGroupEdit(ServerGroupForm, Frame):
def __init__(self, app, name):
super(ServerGroupEdit, self).__init__(app, name)
@@ -265,8 +264,3 @@
def render_title(self, session, group):
return "Edit Group '%s'" % group.name
-
- def on_cancel(self, session, model):
- branch = session.branch()
- self.page().main.show_view(branch)
- session.set_redirect(branch.marshal())
Modified: mgmt/cumin/python/cumin/server.strings
===================================================================
--- mgmt/cumin/python/cumin/server.strings 2007-10-14 18:17:44 UTC (rev 1063)
+++ mgmt/cumin/python/cumin/server.strings 2007-10-14 20:31:09 UTC (rev 1064)
@@ -96,7 +96,6 @@
[ServerBrowser.html]
<div class="ServerBrowser groups">
- <h2>Selection</h2>
<ul class="groups"><li>{all_servers_link}</li></ul>
{groups}
More information about the rhmessaging-commits
mailing list