rhmessaging commits: r1108 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-17 14:48:17 -0400 (Wed, 17 Oct 2007)
New Revision: 1108
Modified:
mgmt/cumin/python/cumin/cluster.py
Log:
Removes the log tab from the cluster view.
Modified: mgmt/cumin/python/cumin/cluster.py
===================================================================
--- mgmt/cumin/python/cumin/cluster.py 2007-10-17 18:37:14 UTC (rev 1107)
+++ mgmt/cumin/python/cumin/cluster.py 2007-10-17 18:48:17 UTC (rev 1108)
@@ -92,9 +92,7 @@
self.tabs.add_tab(self.ServerTab(app, "servers"))
self.tabs.add_tab(self.VirtualHostTab(app, "vhosts"))
- #self.tabs.add_tab(self.ConfigTab(app, "config"))
self.tabs.add_tab(self.StatsTab(app, "stats"))
- self.tabs.add_tab(self.LogTab(app, "log"))
def render_title(self, session, cluster):
return "Cluster '%s'" % cluster.name
@@ -112,18 +110,10 @@
def get_items(self, session, cluster):
return sorted_by(cluster.virtual_host_items())
- class ConfigTab(Widget):
- def render_title(self, session, cluster):
- return "Configuration"
-
class StatsTab(Widget):
def render_title(self, session, cluster):
return "Statistics"
- class LogTab(Widget):
- def render_title(self, session, cluster):
- return "Log Messages"
-
class ClusterBrowser(ItemSet):
def __init__(self, app, name):
super(ClusterBrowser, self).__init__(app, name)
18 years, 6 months
rhmessaging commits: r1107 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-17 14:37:14 -0400 (Wed, 17 Oct 2007)
New Revision: 1107
Added:
mgmt/cumin/python/cumin/parameters.py
Modified:
mgmt/cumin/python/cumin/cluster.py
mgmt/cumin/python/cumin/realm.py
Log:
Change 1106 was incomplete. This adds a file I forgot for that change.
Modified: mgmt/cumin/python/cumin/cluster.py
===================================================================
--- mgmt/cumin/python/cumin/cluster.py 2007-10-17 18:34:51 UTC (rev 1106)
+++ mgmt/cumin/python/cumin/cluster.py 2007-10-17 18:37:14 UTC (rev 1107)
@@ -52,13 +52,6 @@
return mlink(branch.marshal(), "Server", server.name)
-class ClusterParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_cluster(int(string))
-
- def do_marshal(self, cluster):
- return str(cluster.id)
-
class ClusterFrame(CuminFrame):
def __init__(self, app, name):
super(ClusterFrame, self).__init__(app, name)
Added: mgmt/cumin/python/cumin/parameters.py
===================================================================
--- mgmt/cumin/python/cumin/parameters.py (rev 0)
+++ mgmt/cumin/python/cumin/parameters.py 2007-10-17 18:37:14 UTC (rev 1107)
@@ -0,0 +1,64 @@
+from wooly import *
+
+class ClusterParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_cluster(int(string))
+
+ def do_marshal(self, cluster):
+ return str(cluster.id)
+
+class ConfigPropertyParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_config_property(int(string))
+
+ def do_marshal(self, prop):
+ return str(prop.id)
+
+class ExchangeParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_exchange(int(string))
+
+ def do_marshal(self, exchange):
+ return str(exchange.id)
+
+class QueueParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_queue(int(string))
+
+ def do_marshal(self, queue):
+ return str(queue.id)
+
+class RealmParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_realm(int(string))
+
+ def do_marshal(self, queue):
+ return str(realm.id)
+
+class ServerGroupParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_server_group(int(string))
+
+ def do_marshal(self, group):
+ return str(group.id)
+
+class ServerParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_server(int(string))
+
+ def do_marshal(self, server):
+ return str(server.id)
+
+class ServerProfileParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_server_profile(int(string))
+
+ def do_marshal(self, profile):
+ return str(profile.id)
+
+class VirtualHostParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_virtual_host(int(string))
+
+ def do_marshal(self, vhost):
+ return str(vhost.id)
Modified: mgmt/cumin/python/cumin/realm.py
===================================================================
--- mgmt/cumin/python/cumin/realm.py 2007-10-17 18:34:51 UTC (rev 1106)
+++ mgmt/cumin/python/cumin/realm.py 2007-10-17 18:37:14 UTC (rev 1107)
@@ -19,13 +19,6 @@
def render_item_name(self, session, realm):
return realm.name
-class RealmParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_realm(int(string))
-
- def do_marshal(self, queue):
- return str(realm.id)
-
class RealmInputSet(CheckboxInputSet):
def __init__(self, app, name, form):
super(RealmInputSet, self).__init__(app, name, form)
18 years, 6 months
rhmessaging commits: r1106 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-17 14:34:51 -0400 (Wed, 17 Oct 2007)
New Revision: 1106
Modified:
mgmt/cumin/python/cumin/cluster.py
mgmt/cumin/python/cumin/configproperty.py
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/realm.py
mgmt/cumin/python/cumin/server.py
mgmt/cumin/python/cumin/servergroup.py
mgmt/cumin/python/cumin/serverprofile.py
mgmt/cumin/python/cumin/virtualhost.py
Log:
Moves parameters to their own file. This makes import dependencies a
little simpler.
Modified: mgmt/cumin/python/cumin/cluster.py
===================================================================
--- mgmt/cumin/python/cumin/cluster.py 2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/cluster.py 2007-10-17 18:34:51 UTC (rev 1106)
@@ -5,6 +5,7 @@
from virtualhost import *
from server import *
from widgets import *
+from parameters import *
from util import *
strings = StringCatalog(__file__)
Modified: mgmt/cumin/python/cumin/configproperty.py
===================================================================
--- mgmt/cumin/python/cumin/configproperty.py 2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/configproperty.py 2007-10-17 18:34:51 UTC (rev 1106)
@@ -2,6 +2,7 @@
from wooly.widgets import *
from widgets import *
+from parameters import *
from util import *
class ConfigPropertySet(ItemSet):
@@ -13,11 +14,3 @@
def render_item_value(self, session, prop):
return prop.value
-
-class ConfigPropertyParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_config_property(int(string))
-
- def do_marshal(self, prop):
- return str(prop.id)
-
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/exchange.py 2007-10-17 18:34:51 UTC (rev 1106)
@@ -5,17 +5,11 @@
from model import *
from widgets import *
+from parameters import *
from util import *
strings = StringCatalog(__file__)
-class ExchangeParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_exchange(int(string))
-
- def do_marshal(self, exchange):
- return str(exchange.id)
-
class ExchangeInputSet(RadioInputSet):
def __init__(self, app, name, form):
super(ExchangeInputSet, self).__init__(app, name, form)
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/queue.py 2007-10-17 18:34:51 UTC (rev 1106)
@@ -3,9 +3,9 @@
from wooly.forms import *
from wooly.resources import *
-from model import *
-from widgets import *
from exchange import ExchangeInputSet
+from widgets import *
+from parameters import *
from util import *
strings = StringCatalog(__file__)
@@ -52,13 +52,6 @@
return "%i messages in queue<br/>%i errors, %i warnings" \
% (queue.message_count, queue.error_count, queue.warning_count)
-class QueueParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_queue(int(string))
-
- def do_marshal(self, queue):
- return str(queue.id)
-
class QueueFrame(CuminFrame):
def __init__(self, app, name):
super(QueueFrame, self).__init__(app, name)
Modified: mgmt/cumin/python/cumin/realm.py
===================================================================
--- mgmt/cumin/python/cumin/realm.py 2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/realm.py 2007-10-17 18:34:51 UTC (rev 1106)
@@ -3,8 +3,8 @@
from wooly.forms import *
from wooly.resources import *
-from model import *
from widgets import *
+from parameters import *
from util import *
strings = StringCatalog(__file__)
Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py 2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/server.py 2007-10-17 18:34:51 UTC (rev 1106)
@@ -5,6 +5,7 @@
from configproperty import *
from virtualhost import *
from widgets import *
+from parameters import *
from util import *
strings = StringCatalog(__file__)
@@ -33,13 +34,6 @@
else:
return none()
-class ServerParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_server(int(string))
-
- def do_marshal(self, server):
- return str(server.id)
-
class ServerFrame(CuminFrame):
def __init__(self, app, name):
super(ServerFrame, self).__init__(app, name)
Modified: mgmt/cumin/python/cumin/servergroup.py
===================================================================
--- mgmt/cumin/python/cumin/servergroup.py 2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/servergroup.py 2007-10-17 18:34:51 UTC (rev 1106)
@@ -2,6 +2,7 @@
from wooly.widgets import *
from widgets import *
+from parameters import *
from util import *
strings = StringCatalog(__file__)
@@ -16,13 +17,6 @@
def render_none(self, session, group):
return none()
-class ServerGroupParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_server_group(int(string))
-
- def do_marshal(self, group):
- return str(group.id)
-
class ServerGroupForm(CuminForm):
def __init__(self, app, name):
super(ServerGroupForm, self).__init__(app, name)
Modified: mgmt/cumin/python/cumin/serverprofile.py
===================================================================
--- mgmt/cumin/python/cumin/serverprofile.py 2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/serverprofile.py 2007-10-17 18:34:51 UTC (rev 1106)
@@ -4,6 +4,7 @@
from configproperty import *
from server import *
from widgets import *
+from parameters import *
from util import *
strings = StringCatalog(__file__)
@@ -18,13 +19,6 @@
frame.show_view(branch)
return mlink(branch.marshal(), "ServerProfile", profile.name)
-class ServerProfileParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_server_profile(int(string))
-
- def do_marshal(self, profile):
- return str(profile.id)
-
class ServerProfileFrame(CuminFrame):
def __init__(self, app, name):
super(ServerProfileFrame, self).__init__(app, name)
Modified: mgmt/cumin/python/cumin/virtualhost.py
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.py 2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/virtualhost.py 2007-10-17 18:34:51 UTC (rev 1106)
@@ -5,6 +5,7 @@
from realm import *
from exchange import *
from widgets import *
+from parameters import *
from util import *
strings = StringCatalog(__file__)
@@ -22,13 +23,6 @@
return mlink(branch.marshal(), "VirtualHost", vhost.name)
-class VirtualHostParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_virtual_host(int(string))
-
- def do_marshal(self, vhost):
- return str(vhost.id)
-
class VirtualHostFrame(CuminFrame):
def __init__(self, app, name):
super(VirtualHostFrame, self).__init__(app, name)
18 years, 6 months
rhmessaging commits: r1105 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-17 14:24:40 -0400 (Wed, 17 Oct 2007)
New Revision: 1105
Added:
mgmt/cumin/python/cumin/configproperty.py
mgmt/cumin/python/cumin/servergroup.py
mgmt/cumin/python/cumin/servergroup.strings
mgmt/cumin/python/cumin/serverprofile.py
mgmt/cumin/python/cumin/serverprofile.strings
Modified:
mgmt/cumin/python/cumin/page.py
mgmt/cumin/python/cumin/server.py
mgmt/cumin/python/cumin/server.strings
Log:
File reorganization. Splits out some classes that were building up in
server.py into serverprofile.py and servergroups.py. Moves config
property ui stuff to configproperty.py. Adds respective .strings
files.
Added: mgmt/cumin/python/cumin/configproperty.py
===================================================================
--- mgmt/cumin/python/cumin/configproperty.py (rev 0)
+++ mgmt/cumin/python/cumin/configproperty.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,23 @@
+from wooly import *
+from wooly.widgets import *
+
+from widgets import *
+from util import *
+
+class ConfigPropertySet(ItemSet):
+ def get_items(self, session, model):
+ return sorted_by(model.get_config_properties())
+
+ def render_item_name(self, session, prop):
+ return prop.name
+
+ def render_item_value(self, session, prop):
+ return prop.value
+
+class ConfigPropertyParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_config_property(int(string))
+
+ def do_marshal(self, prop):
+ return str(prop.id)
+
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-17 17:54:51 UTC (rev 1104)
+++ mgmt/cumin/python/cumin/page.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -2,6 +2,7 @@
from wooly.widgets import *
from wooly.resources import *
+from serverprofile import *
from server import *
from cluster import *
from widgets import *
Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py 2007-10-17 17:54:51 UTC (rev 1104)
+++ mgmt/cumin/python/cumin/server.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -1,6 +1,8 @@
from wooly import *
from wooly.widgets import *
+from servergroup import *
+from configproperty import *
from virtualhost import *
from widgets import *
from util import *
@@ -70,33 +72,6 @@
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)
-
- def render_none(self, session, group):
- return none()
-
-class ConfigPropertySet(ItemSet):
- def get_items(self, session, model):
- return sorted_by(model.get_config_properties())
-
- def render_item_name(self, session, prop):
- return prop.name
-
- def render_item_value(self, session, prop):
- return prop.value
-
-class ConfigPropertyParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_config_property(int(string))
-
- def do_marshal(self, prop):
- return str(prop.id)
-
class ServerConfigPropertyForm(CuminForm, Frame):
def __init__(self, app, name):
super(ServerConfigPropertyForm, self).__init__(app, name)
@@ -359,148 +334,3 @@
return sorted_by(group.server_items())
else:
return sorted_by(self.app.model.get_servers())
-
-class ServerGroupParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_server_group(int(string))
-
- def do_marshal(self, group):
- return str(group.id)
-
-class ServerGroupForm(CuminForm):
- def __init__(self, app, name):
- super(ServerGroupForm, self).__init__(app, name)
-
- self.group_name = TextInput(app, "name", self)
- self.add_child(self.group_name)
-
- def process_submit(self, session, object):
- if object is self.app.model:
- group = ServerGroup(object)
- else:
- group = object
-
- group.lock()
- try:
- group.name = self.group_name.get(session)
- group.set_type(self.app.model.get_server_group_types()[0])
- finally:
- group.unlock()
-
- branch = session.branch()
- self.page().show_server_group(branch, group)
- session.set_redirect(branch.marshal())
-
- def process_cancel(self, session, model):
- branch = session.branch()
- self.page().show_view(branch)
- session.set_redirect(branch.marshal())
-
-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)
-
- self.param = ServerGroupParameter(app, "id")
- self.add_parameter(self.param)
-
- def get_object(self, session, object):
- return self.param.get(session)
-
- def set_object(self, session, group):
- self.param.set(session, group)
-
- def process_display(self, session, group):
- self.group_name.set(session, group.name)
-
- def render_title(self, session, group):
- return "Edit Group '%s'" % group.name
-
-class ServerProfileSet(ItemSet):
- def get_items(self, session, model):
- return sorted_by(model.get_server_profiles())
-
- def render_item_link(self, session, profile):
- branch = session.branch()
- frame = self.page().show_server_profile(branch, profile)
- frame.show_view(branch)
- return mlink(branch.marshal(), "ServerProfile", profile.name)
-
-class ServerProfileParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_server_profile(int(string))
-
- def do_marshal(self, profile):
- return str(profile.id)
-
-class ServerProfileFrame(CuminFrame):
- def __init__(self, app, name):
- super(ServerProfileFrame, self).__init__(app, name)
-
- self.param = ServerProfileParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
-
- self.view = ServerProfileView(app, "view")
- self.add_mode(self.view)
-
- def show_view(self, session):
- return self.show_mode(session, self.view)
-
- def render_title(self, session, profile):
- return "Server Profile '%s'" % profile.name
-
-class ServerProfileView(Widget):
- def __init__(self, app, name):
- super(ServerProfileView, self).__init__(app, name)
-
- self.tabs = TabSet(app, "tabs")
- self.add_child(self.tabs)
-
- self.tabs.add_tab(self.ProfileConfigTab(app, "config"))
- self.tabs.add_tab(self.ProfileServerTab(app, "servers"))
-
- def render_title(self, session, profile):
- return "Server Profile '%s'" % profile.name
-
- def render_name(self, session, profile):
- return profile.name
-
- class ProfileConfigTab(ConfigPropertySet):
- def get_items(self, session, profile):
- return sorted_by(profile.config_property_items())
-
- def render_title(self, session, profile):
- return "Configuration"
-
- class ProfileServerTab(ServerSet):
- def __init__(self, app, name):
- super(ServerProfileView.ProfileServerTab, self).__init__(app, name)
-
- def render_title(self, session, profile):
- return "Servers (%i)" % len(profile.server_items())
-
- def get_items(self, session, profile):
- return sorted_by(profile.server_items())
-
- def render_item_config_href(self, session, server):
- branch = session.branch()
- frame = self.page().show_server(branch, server)
- frame.show_view(branch).show_config(branch)
- return branch.marshal()
-
- def render_item_config_status(self, session, server):
- diffs = 0
-
- for prop in server.get_server_profile().config_property_items():
- for iprop in server.config_property_items():
- if iprop.name == prop.name:
- if iprop.value != prop.value:
- diffs += 1
-
- return "%i difference(s)" % diffs
-
-
Modified: mgmt/cumin/python/cumin/server.strings
===================================================================
--- mgmt/cumin/python/cumin/server.strings 2007-10-17 17:54:51 UTC (rev 1104)
+++ mgmt/cumin/python/cumin/server.strings 2007-10-17 18:24:40 UTC (rev 1105)
@@ -16,20 +16,6 @@
<td>0 errors, 0 warnings</td>
</tr>
-[ServerProfileSet.html]
-<table class="ServerProfileSet mobjects">
- <tr>
- <th>Server Profile</th>
- </tr>
-
- {items}
-</table>
-
-[ServerProfileSet.item_html]
-<tr>
- <td>{item_link}</td>
-</tr>
-
[ServerConfigTab.css]
.ServerConfigTab.diff {
background-color: #ff9;
@@ -190,86 +176,3 @@
[BrowserGroups.group_html]
<li>{group_link}</li>
-
-[ServerGroupForm.html]
-<form id="{id}" class="ServerGroupForm mform" method="post" action="?">
- <div class="head">
- <h1>{title}</h1>
- </div>
- <div class="body">
- <span class="legend">Name</span>
- <fieldset>{name}</fieldset>
-
- {hidden_inputs}
- </div>
- <div class="foot">
- <div style="display: block; float: left;"><button>Help</button></div>
- {cancel}
- {submit}
- </div>
-</form>
-<script defer="defer">
-(function() {
- var elem = wooly.doc().elem("{id}").node.elements[1];
- elem.focus();
- elem.select();
-}())
-</script>
-
-[ServerProfileView.html]
-<div class="oblock">
- <h1>{title}</h1>
-
- <dl class="properties">
- <dt>Name</dt><dd>{name}</dd>
- </dl>
-
- <ul class="actions">
- <li><a href="">Edit This Profile</a></li>
- </ul>
-
- {tabs}
-</div>
-
-[ProfileConfigTab.html]
-<ul class="actions">
- <li><a href="">Add Property</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Property</th>
- <th>Configured Value</th>
- <th></th>
- </tr>
-
- {items}
-</table>
-
-[ProfileConfigTab.item_html]
-<tr>
- <td>{item_name}</td>
- <td>{item_value}</td>
- <td><a class="action" href="">Edit</a></td>
-</tr>
-
-[ProfileServerTab.html]
-<ul class="actions">
- <li><a href="">Apply Profile Configuration to Servers</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Server</th>
- <th>Configuration Status</th>
- <th></th>
- </tr>
-
- {items}
-</table>
-
-[ProfileServerTab.item_html]
-<tr>
- <td>{item_link}</td>
- <td><a href="{item_config_href}">{item_config_status}</a></td>
-</tr>
Added: mgmt/cumin/python/cumin/servergroup.py
===================================================================
--- mgmt/cumin/python/cumin/servergroup.py (rev 0)
+++ mgmt/cumin/python/cumin/servergroup.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,76 @@
+from wooly import *
+from wooly.widgets import *
+
+from widgets import *
+from util import *
+
+strings = StringCatalog(__file__)
+
+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)
+
+ def render_none(self, session, group):
+ return none()
+
+class ServerGroupParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_server_group(int(string))
+
+ def do_marshal(self, group):
+ return str(group.id)
+
+class ServerGroupForm(CuminForm):
+ def __init__(self, app, name):
+ super(ServerGroupForm, self).__init__(app, name)
+
+ self.group_name = TextInput(app, "name", self)
+ self.add_child(self.group_name)
+
+ def process_submit(self, session, object):
+ if object is self.app.model:
+ group = ServerGroup(object)
+ else:
+ group = object
+
+ group.lock()
+ try:
+ group.name = self.group_name.get(session)
+ group.set_type(self.app.model.get_server_group_types()[0])
+ finally:
+ group.unlock()
+
+ branch = session.branch()
+ self.page().show_server_group(branch, group)
+ session.set_redirect(branch.marshal())
+
+ def process_cancel(self, session, model):
+ branch = session.branch()
+ self.page().show_view(branch)
+ session.set_redirect(branch.marshal())
+
+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)
+
+ self.param = ServerGroupParameter(app, "id")
+ self.add_parameter(self.param)
+
+ def get_object(self, session, object):
+ return self.param.get(session)
+
+ def set_object(self, session, group):
+ self.param.set(session, group)
+
+ def process_display(self, session, group):
+ self.group_name.set(session, group.name)
+
+ def render_title(self, session, group):
+ return "Edit Group '%s'" % group.name
Added: mgmt/cumin/python/cumin/servergroup.strings
===================================================================
--- mgmt/cumin/python/cumin/servergroup.strings (rev 0)
+++ mgmt/cumin/python/cumin/servergroup.strings 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,24 @@
+[ServerGroupForm.html]
+<form id="{id}" class="ServerGroupForm mform" method="post" action="?">
+ <div class="head">
+ <h1>{title}</h1>
+ </div>
+ <div class="body">
+ <span class="legend">Name</span>
+ <fieldset>{name}</fieldset>
+
+ {hidden_inputs}
+ </div>
+ <div class="foot">
+ <div style="display: block; float: left;"><button>Help</button></div>
+ {cancel}
+ {submit}
+ </div>
+</form>
+<script defer="defer">
+(function() {
+ var elem = wooly.doc().elem("{id}").node.elements[1];
+ elem.focus();
+ elem.select();
+}())
+</script>
Added: mgmt/cumin/python/cumin/serverprofile.py
===================================================================
--- mgmt/cumin/python/cumin/serverprofile.py (rev 0)
+++ mgmt/cumin/python/cumin/serverprofile.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,93 @@
+from wooly import *
+from wooly.widgets import *
+
+from configproperty import *
+from server import *
+from widgets import *
+from util import *
+
+strings = StringCatalog(__file__)
+
+class ServerProfileSet(ItemSet):
+ def get_items(self, session, model):
+ return sorted_by(model.get_server_profiles())
+
+ def render_item_link(self, session, profile):
+ branch = session.branch()
+ frame = self.page().show_server_profile(branch, profile)
+ frame.show_view(branch)
+ return mlink(branch.marshal(), "ServerProfile", profile.name)
+
+class ServerProfileParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_server_profile(int(string))
+
+ def do_marshal(self, profile):
+ return str(profile.id)
+
+class ServerProfileFrame(CuminFrame):
+ def __init__(self, app, name):
+ super(ServerProfileFrame, self).__init__(app, name)
+
+ self.param = ServerProfileParameter(app, "id")
+ self.add_parameter(self.param)
+ self.set_object_parameter(self.param)
+
+ self.view = ServerProfileView(app, "view")
+ self.add_mode(self.view)
+
+ def show_view(self, session):
+ return self.show_mode(session, self.view)
+
+ def render_title(self, session, profile):
+ return "Server Profile '%s'" % profile.name
+
+class ServerProfileView(Widget):
+ def __init__(self, app, name):
+ super(ServerProfileView, self).__init__(app, name)
+
+ self.tabs = TabSet(app, "tabs")
+ self.add_child(self.tabs)
+
+ self.tabs.add_tab(self.ProfileConfigTab(app, "config"))
+ self.tabs.add_tab(self.ProfileServerTab(app, "servers"))
+
+ def render_title(self, session, profile):
+ return "Server Profile '%s'" % profile.name
+
+ def render_name(self, session, profile):
+ return profile.name
+
+ class ProfileConfigTab(ConfigPropertySet):
+ def get_items(self, session, profile):
+ return sorted_by(profile.config_property_items())
+
+ def render_title(self, session, profile):
+ return "Configuration"
+
+ class ProfileServerTab(ServerSet):
+ def __init__(self, app, name):
+ super(ServerProfileView.ProfileServerTab, self).__init__(app, name)
+
+ def render_title(self, session, profile):
+ return "Servers (%i)" % len(profile.server_items())
+
+ def get_items(self, session, profile):
+ return sorted_by(profile.server_items())
+
+ def render_item_config_href(self, session, server):
+ branch = session.branch()
+ frame = self.page().show_server(branch, server)
+ frame.show_view(branch).show_config(branch)
+ return branch.marshal()
+
+ def render_item_config_status(self, session, server):
+ diffs = 0
+
+ for prop in server.get_server_profile().config_property_items():
+ for iprop in server.config_property_items():
+ if iprop.name == prop.name:
+ if iprop.value != prop.value:
+ diffs += 1
+
+ return "%i difference(s)" % diffs
Added: mgmt/cumin/python/cumin/serverprofile.strings
===================================================================
--- mgmt/cumin/python/cumin/serverprofile.strings (rev 0)
+++ mgmt/cumin/python/cumin/serverprofile.strings 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,71 @@
+[ServerProfileSet.html]
+<table class="ServerProfileSet mobjects">
+ <tr>
+ <th>Server Profile</th>
+ </tr>
+
+ {items}
+</table>
+
+[ServerProfileSet.item_html]
+<tr>
+ <td>{item_link}</td>
+</tr>
+
+[ServerProfileView.html]
+<div class="oblock">
+ <h1>{title}</h1>
+
+ <dl class="properties">
+ <dt>Name</dt><dd>{name}</dd>
+ </dl>
+
+ <ul class="actions">
+ <li><a href="">Edit This Profile</a></li>
+ </ul>
+
+ {tabs}
+</div>
+
+[ProfileConfigTab.html]
+<ul class="actions">
+ <li><a href="">Add Property</a></li>
+</ul>
+
+<table class="mobjects">
+ <tr>
+ <th>Property</th>
+ <th>Configured Value</th>
+ <th></th>
+ </tr>
+
+ {items}
+</table>
+
+[ProfileConfigTab.item_html]
+<tr>
+ <td>{item_name}</td>
+ <td>{item_value}</td>
+ <td><a class="action" href="">Edit</a></td>
+</tr>
+
+[ProfileServerTab.html]
+<ul class="actions">
+ <li><a href="">Apply Profile Configuration to Servers</a></li>
+</ul>
+
+<table class="mobjects">
+ <tr>
+ <th>Server</th>
+ <th>Configuration Status</th>
+ <th></th>
+ </tr>
+
+ {items}
+</table>
+
+[ProfileServerTab.item_html]
+<tr>
+ <td>{item_link}</td>
+ <td><a href="{item_config_href}">{item_config_status}</a></td>
+</tr>
18 years, 6 months
rhmessaging commits: r1104 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠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>
18 years, 6 months
rhmessaging commits: r1103 - in mgmt: notes and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-17 12:14:13 -0400 (Wed, 17 Oct 2007)
New Revision: 1103
Modified:
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/virtualhost.py
mgmt/notes/Todo
Log:
Removes log tabs that won't exist, at least for a while.
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2007-10-17 15:21:55 UTC (rev 1102)
+++ mgmt/cumin/python/cumin/exchange.py 2007-10-17 16:14:13 UTC (rev 1103)
@@ -81,12 +81,7 @@
self.add_child(self.tabs)
self.tabs.add_tab(ExchangeBindingSet(app, "bindings"))
- self.tabs.add_tab(self.ExchangeLog(app, "log"))
- class ExchangeLog(Widget):
- def render_title(self, session, exchange):
- return "Log Messages"
-
def render_title(self, session, exchange):
return "Exchange '%s'" % exchange.name
Modified: mgmt/cumin/python/cumin/virtualhost.py
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.py 2007-10-17 15:21:55 UTC (rev 1102)
+++ mgmt/cumin/python/cumin/virtualhost.py 2007-10-17 16:14:13 UTC (rev 1103)
@@ -69,8 +69,6 @@
self.tabs.add_tab(QueueSet(app, "queues"))
self.tabs.add_tab(ExchangeSet(app, "exchanges"))
- self.tabs.add_tab(self.ConfigTab(app, "config"))
- self.tabs.add_tab(self.LogTab(app, "log"))
def render_title(self, session, vhost):
return "Functional Host '%s'" % vhost.name
@@ -99,11 +97,3 @@
return mlink(branch.marshal(), "Cluster", cluster.name)
else:
return none()
-
- class ConfigTab(Widget):
- def render_title(self, session, vhost):
- return "Configuration"
-
- class LogTab(Widget):
- def render_title(self, session, vhost):
- return "Log Messages"
Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo 2007-10-17 15:21:55 UTC (rev 1102)
+++ mgmt/notes/Todo 2007-10-17 16:14:13 UTC (rev 1103)
@@ -74,8 +74,6 @@
- Remove config tab
- * Remove log tabs below the level of server
-
* Move q,e to server level (using default vhost)
* Instead of individual remove links, use checkboxes and a bulk
@@ -99,3 +97,5 @@
etc. return their argument
* Add a CuminItemSet with add/edit/remove href parts
+
+ * Make the groups browser use common code with the cluster browser
18 years, 6 months
rhmessaging commits: r1102 - in mgmt: notes and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-17 11:21:55 -0400 (Wed, 17 Oct 2007)
New Revision: 1102
Modified:
mgmt/cumin/python/cumin/cluster.py
mgmt/cumin/python/cumin/cluster.strings
mgmt/cumin/python/cumin/page.py
mgmt/cumin/python/cumin/page.strings
mgmt/notes/Todo
Log:
Makes the clusters tab a browser. I kept the older cluster tab around
for discussion.
Modified: mgmt/cumin/python/cumin/cluster.py
===================================================================
--- mgmt/cumin/python/cumin/cluster.py 2007-10-17 13:31:32 UTC (rev 1101)
+++ mgmt/cumin/python/cumin/cluster.py 2007-10-17 15:21:55 UTC (rev 1102)
@@ -130,3 +130,51 @@
def render_title(self, session, cluster):
return "Log Messages"
+class ClusterBrowser(ItemSet):
+ def __init__(self, app, name):
+ super(ClusterBrowser, self).__init__(app, name)
+
+ self.param = ClusterParameter(app, "cluster")
+ self.add_parameter(self.param)
+
+ self.view = ClusterView(app, "view")
+ self.add_child(self.view)
+
+ def get_items(self, session, model):
+ return sorted_by(model.get_clusters())
+
+ def render_item_link(self, session, cluster):
+ class_ = self.param.get(session) is cluster and "selected"
+
+ branch = session.branch()
+ self.param.set(branch, cluster)
+ return link(branch.marshal(), cluster.name, class_)
+
+ def render_add_cluster_href(self, session, cluster):
+ branch = session.branch()
+ #self.page().show_cluster_add(branch)
+ return branch.marshal()
+
+ def render_edit_cluster_href(self, session, cluster):
+ if cluster:
+ branch = session.branch()
+ #self.page().show_cluster_edit(branch, cluster)
+ return branch.marshal()
+
+ def render_remove_cluster_href(self, session, cluster):
+ if cluster:
+ branch = session.branch()
+ return branch.marshal()
+
+ def render_view(self, session, model):
+ object = self.param.get(session)
+
+ if object:
+ html = self.view.render(session, object)
+ else:
+ html = self.render_none(session, model)
+
+ return html
+
+ def render_none(self, session, model):
+ return none()
Modified: mgmt/cumin/python/cumin/cluster.strings
===================================================================
--- mgmt/cumin/python/cumin/cluster.strings 2007-10-17 13:31:32 UTC (rev 1101)
+++ mgmt/cumin/python/cumin/cluster.strings 2007-10-17 15:21:55 UTC (rev 1102)
@@ -37,25 +37,23 @@
<div class="serverlight {server_status}"></div>
[ClusterView.html]
-<div class="oblock">
- <div class="mstatus green" id="{id}">
- <h2>Cluster Status</h2>
+<div class="mstatus green" id="{id}">
+ <h2>Cluster Status</h2>
- <div>0 errors, 0 warnings</div>
- </div>
+ <div>0 errors, 0 warnings</div>
+</div>
- <h1>{title}</h1>
+<h1>{title}</h1>
- <dl class="properties">
- <dt>Name</dt><dd>{name}</dd>
- </dl>
+<dl class="properties">
+ <dt>Name</dt><dd>{name}</dd>
+</dl>
- <ul class="actions">
- <li><a href="">Shutdown This Cluster</a></li>
- </ul>
+<ul class="actions">
+ <li><a href="">Shutdown This Cluster</a></li>
+</ul>
- {tabs}
-</div>
+{tabs}
[ServerTab.html]
<ul class="actions">
@@ -126,3 +124,49 @@
}
}
</pre>
+
+[ClusterBrowser.css]
+.browser {
+ width: 100%;
+}
+
+.browser .nav {
+ width: 20%;
+}
+
+.browser .nav ul {
+ margin: 0 0 1em 0;
+}
+
+.ClusterBrowser.groups h2 {
+ color: #564979;
+ font-size: 0.9em;
+ border-bottom: 1px dotted #ddd;
+ width: 80%;
+ margin: 0 0 0.5em 0;
+}
+
+.browser .view {
+ width: 80%;
+}
+
+[ClusterBrowser.html]
+<table class="browser">
+ <tr>
+ <td class="nav">
+ <ul class="slist">{items}</ul>
+
+ <ul class="actions">
+ <li><a href="{add_cluster_href}">Add Cluster</a></li>
+ <li><a href="{edit_cluster_href}">Edit Cluster</a></li>
+ <li><a href="{remove_cluster_href}">Remove Cluster</a></li>
+ </ul>
+ </td>
+ <td class="view">
+ {view}
+ </td>
+ </tr>
+</div>
+
+[ClusterBrowser.item_html]
+<li>{item_link}</li>
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-17 13:31:32 UTC (rev 1101)
+++ mgmt/cumin/python/cumin/page.py 2007-10-17 15:21:55 UTC (rev 1102)
@@ -161,6 +161,7 @@
self.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"))
def show_server_group(self, session, group):
@@ -172,17 +173,16 @@
return "Red Hat Messaging"
class ServerTab(ServerBrowser):
- pass
+ def render_title(self, session, model):
+ return "Servers (%i)" % len(model.get_servers())
- class ClusterTab(Widget):
- def __init__(self, app, name):
- super(MainView.ClusterTab, self).__init__(app, name)
+ class ClusterTab(ClusterBrowser):
+ def render_title(self, session, model):
+ return "Clusters (%i)" % len(model.get_clusters())
- self.clusters = ClusterSet(app, "clusters")
- self.add_child(self.clusters)
-
+ class ClusterTabII(ClusterSet):
def render_title(self, session, model):
- return self.clusters.render_title(session, model)
+ return "Clusters II (%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 13:31:32 UTC (rev 1101)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-17 15:21:55 UTC (rev 1102)
@@ -42,6 +42,10 @@
padding: 1em;
}
+tr {
+ vertical-align: top;
+}
+
span.none {
font-style: italic;
color: #999;
@@ -351,6 +355,16 @@
content: ""
}
+ul.slist a:before {
+ content: url(resource?name=radio-button.png);
+ vertical-align: -10%;
+ margin: 0 0.5em 0 0;
+}
+
+ul.slist a.selected:before {
+ content: url(resource?name=radio-button-checked.png);
+}
+
[CuminPage.html]
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -386,10 +400,3 @@
<ul class="TabSet tabs">{tabs}</ul>
<div class="TabSet mode">{mode}</div>
</div>
-
-[ClusterTab.html]
-<ul class="actions">
- <li><a href="">Add Cluster</a></li>
-</ul>
-
-{clusters}
Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo 2007-10-17 13:31:32 UTC (rev 1101)
+++ mgmt/notes/Todo 2007-10-17 15:21:55 UTC (rev 1102)
@@ -94,3 +94,8 @@
* Add group type to group add,edit
* Add the marshal side of ListParameter
+
+ * Consider making add_child, add_param, add_mode, add_tab,
+ etc. return their argument
+
+ * Add a CuminItemSet with add/edit/remove href parts
18 years, 6 months
rhmessaging commits: r1101 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-17 09:31:32 -0400 (Wed, 17 Oct 2007)
New Revision: 1101
Modified:
mgmt/cumin/python/cumin/page.py
Log:
A more appropriate top-level page title.
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-17 13:27:03 UTC (rev 1100)
+++ mgmt/cumin/python/cumin/page.py 2007-10-17 13:31:32 UTC (rev 1101)
@@ -169,7 +169,7 @@
return mode
def render_title(self, session, model):
- return "Red Hat Management"
+ return "Red Hat Messaging"
class ServerTab(ServerBrowser):
pass
18 years, 6 months
rhmessaging commits: r1100 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-17 09:27:03 -0400 (Wed, 17 Oct 2007)
New Revision: 1100
Modified:
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/widgets.py
Log:
Consolidates form processing logic into CuminForm.
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2007-10-17 13:13:23 UTC (rev 1099)
+++ mgmt/cumin/python/cumin/exchange.py 2007-10-17 13:27:03 UTC (rev 1100)
@@ -219,7 +219,7 @@
return "Edit Exchange '%s'" % exchange.name
class ExchangeRemove(CuminConfirmForm):
- def process_confirm(self, session, exchange):
+ def process_submit(self, session, exchange):
vhost = exchange.get_virtual_host()
exchange.remove()
@@ -236,7 +236,7 @@
def render_title(self, session, exchange):
return "Remove Exchange '%s'" % exchange.name
- def render_confirm_content(self, session, exchange):
+ def render_submit_content(self, session, exchange):
return "Yes, Remove Exchange '%s'" % exchange.name
def render_cancel_content(self, session, exchange):
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-10-17 13:13:23 UTC (rev 1099)
+++ mgmt/cumin/python/cumin/queue.py 2007-10-17 13:27:03 UTC (rev 1100)
@@ -253,7 +253,7 @@
return "Edit Queue '%s'" % queue.name
class QueueRemove(CuminConfirmForm):
- def process_confirm(self, session, queue):
+ def process_submit(self, session, queue):
vhost = queue.get_virtual_host()
queue.remove()
@@ -270,7 +270,7 @@
def render_title(self, session, queue):
return "Remove Queue '%s'" % queue.name
- def render_confirm_content(self, session, queue):
+ def render_submit_content(self, session, queue):
return "Yes, Remove Queue '%s'" % queue.name
def render_cancel_content(self, session, queue):
@@ -332,7 +332,7 @@
return sorted_by(queue.virtual_host.exchange_items())
class QueueBindingRemove(CuminConfirmForm):
- def process_confirm(self, session, binding):
+ def process_submit(self, session, binding):
branch = session.branch()
self.page().show_queue(branch, binding.get_queue()).show_view(branch)
session.set_redirect(branch.marshal())
@@ -345,7 +345,7 @@
def render_title(self, session, binding):
return "Remove Binding"
- def render_confirm_content(self, session, binding):
+ def render_submit_content(self, session, binding):
return "Yes, Remove Binding"
def render_cancel_content(self, session, binding):
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2007-10-17 13:13:23 UTC (rev 1099)
+++ mgmt/cumin/python/cumin/widgets.py 2007-10-17 13:27:03 UTC (rev 1100)
@@ -78,58 +78,20 @@
def process_display(self, session, object):
pass
+ def render_cancel_content(self, session, object):
+ return "Cancel"
+
+ def render_submit_content(self, session, object):
+ return "Submit"
+
class Cancel(FormButton):
def render_content(self, session, object):
- return "Cancel"
+ return self.parent.render_cancel_content(session, object)
class Submit(FormButton):
def render_content(self, session, object):
- return "Submit"
-
-class CuminConfirmForm(Form):
+ return self.parent.render_submit_content(session, object)
+
+class CuminConfirmForm(CuminForm):
def __init__(self, app, name):
super(CuminConfirmForm, self).__init__(app, name)
-
- self.confirm = self.ConfirmButton(app, "confirm", self)
- self.confirm.set_tab_index(101)
- self.add_child(self.confirm)
-
- self.cancel = self.CancelButton(app, "cancel", self)
- self.add_child(self.cancel)
-
- def do_process(self, session, object):
- self.page().set_modal(session, True)
-
- if self.confirm.get(session):
- self.confirm.set(session, False)
-
- self.process_confirm(session, object)
- elif self.cancel.get(session):
- self.cancel.set(session, False)
-
- self.process_cancel(session, object)
- else:
- self.process_display(session, object)
-
- def process_cancel(self, session, object):
- pass
-
- def process_confirm(self, session, object):
- pass
-
- def process_display(self, session, object):
- pass
-
- def render_confirm_content(self, session, object):
- return "Confirm"
-
- def render_cancel_content(self, session, object):
- return "Cancel"
-
- class ConfirmButton(FormButton):
- def render_content(self, session, object):
- return self.parent.render_confirm_content(session, object)
-
- class CancelButton(FormButton):
- def render_content(self, session, object):
- return self.parent.render_cancel_content(session, object)
18 years, 6 months
rhmessaging commits: r1099 - in mgmt: notes and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-17 09:13:23 -0400 (Wed, 17 Oct 2007)
New Revision: 1099
Modified:
mgmt/cumin/python/cumin/exchange.strings
mgmt/notes/Todo
Log:
Adds a mocked-up status box to the exchange view.
Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings 2007-10-16 20:56:45 UTC (rev 1098)
+++ mgmt/cumin/python/cumin/exchange.strings 2007-10-17 13:13:23 UTC (rev 1099)
@@ -75,6 +75,12 @@
[ExchangeView.html]
<div class="ExchangeView oblock">
+ <div class="mstatus green" id="{id}">
+ <h2>Exchange Status</h2>
+
+ <div>0 errors, 0 warnings</div>
+ </div>
+
<h1><img src="resource?name=exchange-36.png"> {title}</h1>
<dl class="properties">
Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo 2007-10-16 20:56:45 UTC (rev 1098)
+++ mgmt/notes/Todo 2007-10-17 13:13:23 UTC (rev 1099)
@@ -91,8 +91,6 @@
- Display load, profiles (?)
- * Add status box to exchange view
-
* Add group type to group add,edit
* Add the marshal side of ListParameter
18 years, 6 months