rhmessaging commits: r1178 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-28 13:55:25 -0400 (Sun, 28 Oct 2007)
New Revision: 1178
Modified:
mgmt/cumin/python/cumin/broker.py
Log:
Renames a parameter.
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2007-10-28 17:53:05 UTC (rev 1177)
+++ mgmt/cumin/python/cumin/broker.py 2007-10-28 17:55:25 UTC (rev 1178)
@@ -66,7 +66,7 @@
self.add_parameter(self.broker)
self.add_form_parameter(self.broker)
- self.brokers = ListParameter(app, "ids", self.broker)
+ self.brokers = ListParameter(app, "id", self.broker)
self.add_parameter(self.brokers)
self.add_form_parameter(self.brokers)
17 years, 1 month
rhmessaging commits: r1177 - in mgmt: notes and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-28 13:53:05 -0400 (Sun, 28 Oct 2007)
New Revision: 1177
Modified:
mgmt/cumin/python/cumin/page.strings
mgmt/notes/Todo
Log:
Set the width of value cells in prop tables.
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-28 17:36:37 UTC (rev 1176)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-28 17:53:05 UTC (rev 1177)
@@ -194,6 +194,10 @@
font-weight: normal;
}
+table.props td {
+ width: 60%;
+}
+
table.props th.actions {
padding: 0.5em;
background-color: #e7e7f7;
Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo 2007-10-28 17:36:37 UTC (rev 1176)
+++ mgmt/notes/Todo 2007-10-28 17:53:05 UTC (rev 1177)
@@ -105,3 +105,5 @@
* Move q,e to server level (using default vhost)
* Replace all those inline td styles with a class attr
+
+ * Make sure nav links are so marked
17 years, 1 month
rhmessaging commits: r1176 - in mgmt/cumin/python: wooly and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-28 13:36:37 -0400 (Sun, 28 Oct 2007)
New Revision: 1176
Modified:
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/wooly/widgets.strings
Log:
Style tweaks.
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-28 17:25:54 UTC (rev 1175)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-28 17:36:37 UTC (rev 1176)
@@ -174,7 +174,7 @@
}
table.props {
- margin: 0 0 1em 0;
+ margin: 0 0 1.5em 0;
width: 25em;
border-collapse: collapse;
}
@@ -215,6 +215,10 @@
font-size: 0.9em;
}
+button:hover, table.props th.actions a:hover, ul.actions a:hover {
+ background-color: white;
+}
+
dl.properties {
margin: 0 0 1.5em 0;
width: 25em;
@@ -377,7 +381,7 @@
div.mstatus {
float: right;
- margin: 1em;
+ margin: 0.5em;
padding: 0.75em 1em;
width: 15em;
}
@@ -388,17 +392,17 @@
}
div.mstatus.red {
- border: 1px solid #c99;
+ border: 1px dotted #c99;
background-color: #fcc;
}
div.mstatus.yellow {
- border: 1px solid #cc9;
+ border: 1px dotted #cc9;
background-color: #ffc;
}
div.mstatus.green {
- border: 1px solid #9c9;
+ border: 1px dotted #9c9;
background-color: #cfc;
}
Modified: mgmt/cumin/python/wooly/widgets.strings
===================================================================
--- mgmt/cumin/python/wooly/widgets.strings 2007-10-28 17:25:54 UTC (rev 1175)
+++ mgmt/cumin/python/wooly/widgets.strings 2007-10-28 17:36:37 UTC (rev 1176)
@@ -4,7 +4,7 @@
[TabSet.css]
ul.TabSet.tabs {
padding: 0;
- margin: 1em 0 0 0;
+ margin: 0;
list-style: none;
}
@@ -35,7 +35,7 @@
background-color: white;
padding: 1em;
border: 1px solid #ccc;
- margin: 0;
+ margin: 0 0 1em 0;
background-color: #fff;
position: relative;
z-index: 1;
17 years, 1 month
rhmessaging commits: r1175 - in mgmt: notes and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-28 13:25:54 -0400 (Sun, 28 Oct 2007)
New Revision: 1175
Modified:
mgmt/cumin/python/cumin/client.py
mgmt/cumin/python/cumin/client.strings
mgmt/cumin/python/cumin/exchange.strings
mgmt/notes/Todo
Log:
Finishes moving actions to the new regime.
Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py 2007-10-27 14:43:35 UTC (rev 1174)
+++ mgmt/cumin/python/cumin/client.py 2007-10-28 17:25:54 UTC (rev 1175)
@@ -61,9 +61,12 @@
def render_title(self, session, client):
return "Client '%s'" % client.address
- def render_client_address(self, session, client):
+ def render_address(self, session, client):
return client.address
+ def render_auth_id(self, session, client):
+ return "e50e7dcaa8d6a039a"
+
class SessionSet(ItemSet):
def render_title(self, session, client):
return "Sessions (%i)" % len(client.session_items())
Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings 2007-10-27 14:43:35 UTC (rev 1174)
+++ mgmt/cumin/python/cumin/client.strings 2007-10-28 17:25:54 UTC (rev 1175)
@@ -33,39 +33,37 @@
</tr>
[ClientView.html]
-<div class="oblock">
- <div class="mstatus green" id="{id}">
- <h2>Client Status</h2>
+<div class="mstatus green" id="{id}">
+ <h2>Client 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>Address</dt><dd>{client_address}</dd>
- <dt>Authentication ID</dt><dd>e50e7dcaa8d6a039a</dd>
- </dl>
+<table class="props">
+ <tr><th>Address</th><td>{address}</td></tr>
+ <tr><th>Auth. ID</th><td>{auth_id}</td></tr>
+ <tr>
+ <th class="actions" colspan="2">
+ <h2>Act on This Client:</h2>
+ <a href="{href}">Detach</a>
+ <a href="{href}">Close</a>
+ </th>
+ </tr>
+</table>
- <ul class="actions">
- <li><a href="">Close This Client</a></li>
- <li><a href="">Detach This Client</a></li>
- </ul>
+{tabs}
- {tabs}
+[SessionSet.html]
+<div class="sactions">
+ <h2>Act on Selected Sessions:</h2>
+ <button>Solicit Acknowledgment</button>
+ <button>Reset Lifespan</button>
+ <button>Detach</button>
+ <button>Close</button>
</div>
-[SessionSet.html]
-<select>
- <option>Act on Selection...</option>
- <option>Solicit Acknowledgment</option>
- <option>Reset Lifespan</option>
- <option>Detach Sessions</option>
- <option>Close Sessions</option>
-</select>
-
-<br/><br/>
-
<table class="mobjects">
<tr>
<th><input type="checkbox"/></th>
Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings 2007-10-27 14:43:35 UTC (rev 1174)
+++ mgmt/cumin/python/cumin/exchange.strings 2007-10-28 17:25:54 UTC (rev 1175)
@@ -134,15 +134,13 @@
</table>
[ProducerSet.html]
-<select>
- <option>Act on Selection...</option>
- <option>Throttle Producers</option>
- <option>Start Producers</option>
- <option>Stop Producers</option>
-</select>
+<div class="sactions">
+ <h2>Act on Selected Producers:</h2>
+ <button>Start</button>
+ <button>Stop</button>
+ <button>Throttle</button>
+</div>
-<br/><br/>
-
<table class="mobjects">
<tr>
<th><input type="checkbox"/></th>
Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo 2007-10-27 14:43:35 UTC (rev 1174)
+++ mgmt/notes/Todo 2007-10-28 17:25:54 UTC (rev 1175)
@@ -104,4 +104,4 @@
* Move q,e to server level (using default vhost)
- * Make actions more uniform
+ * Replace all those inline td styles with a class attr
17 years, 1 month
rhmessaging commits: r1174 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-27 10:43:35 -0400 (Sat, 27 Oct 2007)
New Revision: 1174
Modified:
mgmt/cumin/python/cumin/widgets.py
Log:
In the little status lights, use + in place of multidigit numbers.
Add an "inactive" state.
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2007-10-27 14:02:55 UTC (rev 1173)
+++ mgmt/cumin/python/cumin/widgets.py 2007-10-27 14:43:35 UTC (rev 1174)
@@ -14,12 +14,26 @@
def none():
return "<span class=\"none\">None</span>"
-def status(errors, warnings):
+def status(errors, warnings, active=True):
count = errors + warnings
- return "<div class=\"statuslight %s\">%s</div>" % \
- (count == 0 and "green" or (errors and "red" or "yellow"),
- count == 0 and " " or str(count))
+ if count == 0:
+ number = " "
+ elif count > 9:
+ number = "+"
+ else:
+ number = str(count)
+
+ if active:
+ if count == 0:
+ class_ = "green"
+ else:
+ class_ = errors and "red" or "yellow"
+ else:
+ class_ = "inactive"
+
+ return "<div class=\"statuslight %s\">%s</div>" % (class_, number)
+
class CuminFrame(Frame, ModeSet):
def __init__(self, app, name):
super(CuminFrame, self).__init__(app, name)
17 years, 2 months
rhmessaging commits: r1173 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-27 10:02:55 -0400 (Sat, 27 Oct 2007)
New Revision: 1173
Modified:
mgmt/cumin/python/cumin/brokergroup.py
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/model.py
mgmt/cumin/python/cumin/page.py
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/cumin/queue.py
Log:
More uniform styling of actions.
Modified: mgmt/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.py 2007-10-27 14:02:31 UTC (rev 1172)
+++ mgmt/cumin/python/cumin/brokergroup.py 2007-10-27 14:02:55 UTC (rev 1173)
@@ -22,16 +22,22 @@
return sorted_by(model.get_broker_groups())
def render_item_link(self, session, group):
- href = self.page().broker_group_href(session, group)
- return mlink(href, "BrokerGroup", group.name)
+ branch = session.branch()
+ self.page().show_broker_group(branch, group).show_view(branch)
+ return mlink(branch.marshal(), "BrokerGroup", group.name)
def render_item_config(self, session, group):
count = len(group.broker_items())
- return "%i broker%s" % (count, count == 1 and "" or "s")
+ return "%i broker%s" % (count, ess(count))
def render_item_status(self, session, group):
- return status(len(group.errors), len(group.warnings))
+ writer = Writer()
+
+ for broker in sorted_by(group.broker_items()):
+ writer.write(status(len(broker.errors), len(broker.warnings)))
+ return writer.to_string()
+
def render_none(self, session, group):
return none()
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2007-10-27 14:02:31 UTC (rev 1172)
+++ mgmt/cumin/python/cumin/exchange.py 2007-10-27 14:02:55 UTC (rev 1173)
@@ -45,10 +45,10 @@
def render_item_config(self, session, exchange):
count = len(exchange.binding_items())
- return "%i %s" % (count, count == 1 and "binding" or "bindings")
+ return "%i binding%s" % (count, ess(count))
def render_item_status(self, session, exchange):
- return "2 errors"
+ return status(len(exchange.errors), len(exchange.warnings))
def render_item_messages_received(self, session, exchange):
return exchange.get_measurement("msgReceives").get_value()
Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py 2007-10-27 14:02:31 UTC (rev 1172)
+++ mgmt/cumin/python/cumin/model.py 2007-10-27 14:02:55 UTC (rev 1173)
@@ -233,8 +233,6 @@
super(BrokerGroup, self).__init__(model, model.broker_group)
self.name = None
- self.errors = list()
- self.warnings = list()
class BrokerGroupType(ModelObject):
def __init__(self, model):
@@ -368,6 +366,9 @@
self.error_count = 0
self.warning_count = 0
+ self.errors = list()
+ self.warnings = list()
+
# General
measure = Measurement("msgDepth", "int")
@@ -575,6 +576,9 @@
self.is_auto_delete = False
self.is_internal = False
+ self.errors = list()
+ self.warnings = list()
+
measure = Measurement("bindings", "int")
measure.title = "Bindings"
measure.categories = ("general")
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-27 14:02:31 UTC (rev 1172)
+++ mgmt/cumin/python/cumin/page.py 2007-10-27 14:02:55 UTC (rev 1173)
@@ -126,11 +126,6 @@
frame = frame.show_client(session, client)
return self.set_current_frame(session, frame)
- def broker_group_href(self, session, group):
- branch = session.branch()
- self.show_broker_group(branch, group).show_view(branch)
- return branch.marshal()
-
def render_class(self, session, object):
return self.modal.get(session) and "modal"
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-27 14:02:31 UTC (rev 1172)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-27 14:02:55 UTC (rev 1173)
@@ -155,7 +155,7 @@
div.sactions {
margin: 0;
- padding: 0.5em 0.75em;
+ padding: 0.35em 0.75em;
background-color: #e7e7f7;
}
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-10-27 14:02:31 UTC (rev 1172)
+++ mgmt/cumin/python/cumin/queue.py 2007-10-27 14:02:55 UTC (rev 1173)
@@ -49,9 +49,7 @@
return "%i binding%s" % (count, ess(count))
def render_item_status(self, session, queue):
- return "%i error%s, %i warning%s" \
- % (queue.error_count, ess(queue.error_count),
- queue.warning_count, ess(queue.warning_count))
+ return status(len(queue.errors), len(queue.warnings))
def render_item_message_depth(self, session, queue):
return queue.get_measurement("msgDepth").get_value()
17 years, 2 months
rhmessaging commits: r1172 - mgmt/cumin/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-27 10:02:31 -0400 (Sat, 27 Oct 2007)
New Revision: 1172
Modified:
mgmt/cumin/python/wooly/forms.py
Log:
Fixes form marshaling of collection parameters such as ListParameter.
Modified: mgmt/cumin/python/wooly/forms.py
===================================================================
--- mgmt/cumin/python/wooly/forms.py 2007-10-27 02:04:05 UTC (rev 1171)
+++ mgmt/cumin/python/wooly/forms.py 2007-10-27 14:02:31 UTC (rev 1172)
@@ -22,15 +22,29 @@
for param in params:
key = param.path()
- value = session.get(key)
- default = param.get_default(session)
+
+ if param.is_collection:
+ collection = session.get(key)
- if value not in (default, None):
- writer.write("<input type='hidden' name='%s' value='%s'/>" \
- % (key, param.marshal(value)))
+ if collection:
+ for value in collection:
+ svalue = param.marshal(value)
+ self.write_hidden_input(key, svalue, writer)
+ else:
+ value = session.get(key)
+ default = param.get_default(session)
+ if value not in (default, None):
+ svalue = param.marshal(value)
+ self.write_hidden_input(key, svalue, writer)
+
return writer.to_string()
+ def write_hidden_input(self, name, value, writer):
+ writer.write("<input type='hidden' name='%s' value='%s'/>" \
+ % (name, value))
+
+
class FormInput(Widget):
def __init__(self, app, name, form):
super(FormInput, self).__init__(app, name)
17 years, 2 months
rhmessaging commits: r1171 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-26 22:04:05 -0400 (Fri, 26 Oct 2007)
New Revision: 1171
Modified:
mgmt/cumin/python/cumin/broker.strings
mgmt/cumin/python/cumin/brokercluster.py
mgmt/cumin/python/cumin/brokercluster.strings
mgmt/cumin/python/cumin/brokergroup.strings
mgmt/cumin/python/cumin/brokerprofile.strings
mgmt/cumin/python/cumin/client.py
mgmt/cumin/python/cumin/client.strings
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/queue.strings
mgmt/cumin/python/cumin/virtualhost.py
mgmt/cumin/python/cumin/virtualhost.strings
Log:
Big revamp of navigation and nav styling.
Modified: mgmt/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/cumin/python/cumin/broker.strings 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/broker.strings 2007-10-27 02:04:05 UTC (rev 1171)
@@ -22,24 +22,22 @@
<form id="{id}" method="post" action="?">
<!-- <select onchange="document.getElementById('{id}.submit').submit()"> -->
- <div>
- <div class="sactions">
- <h2>Act on Selected Brokers:</h2>
- <select>
- <option>Choose Action...</option>
- <optgroup label="Actions">
- <option>Shutdown</option>
- <option>Load Balance</option>
- </optgroup>
- <optgroup label="Add to Group">
- <option>East Coast</option>
- <option>West Coast</option>
- <option>Marketing</option>
- <option>Sales</option>
- </optgroup>
- </select>
- {submit}
- </div>
+ <div class="sactions">
+ <h2>Act on Selected Brokers:</h2>
+ <select>
+ <option>Choose Action...</option>
+ <optgroup label="Actions">
+ <option>Shutdown</option>
+ <option>Load Balance</option>
+ </optgroup>
+ <optgroup label="Add to Group">
+ <option>East Coast</option>
+ <option>West Coast</option>
+ <option>Marketing</option>
+ <option>Sales</option>
+ </optgroup>
+ </select>
+ {submit}
</div>
<table class="mobjects">
@@ -143,29 +141,29 @@
</script>
[BrokerView.html]
-<div class="oblock">
- <div class="mstatus green" id="{id}">
- <h2>Broker Status</h2>
+<div class="mstatus green" id="{id}">
+ <h2>Broker 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>
- <dt>Cluster</dt><dd>{cluster_link}</dd>
- <dt>Profile</dt><dd>{profile_link}</dd>
- <dt>Version</dt><dd>{version}</dd>
- </dl>
+<table class="props">
+ <tr><th>Name</th><td>{name}</td></tr>
+ <tr><th>Cluster</th><td>{cluster_link}</td></tr>
+ <tr><th>Profile</th><td>{profile_link}</td></tr>
+ <tr><th>Version</th><td>{version}</td></tr>
+ <tr>
+ <th class="actions" colspan="2">
+ <h2>Act on This Broker:</h2>
+ <a href="{href}">Shutdown</a>
+ </th>
+ </tr>
+</table>
- <ul class="actions">
- <li><a href="">Shutdown This Broker</a></li>
- </ul>
+{tabs}
- {tabs}
-</div>
-
[BrokerBrowser.html]
<table class="browser">
<tr>
@@ -176,15 +174,18 @@
<h2>Filter by Group</h2>
<ul class="slist">{group_filters}</ul>
+
<h2>Filter by Profile</h2>
<ul class="slist">{profile_filters}</ul>
+
<h2>Filter by Cluster</h2>
<ul class="slist">{cluster_filters}</ul>
</td>
<td class="view">
<ul class="actions">
- <li><a href="">Register New Brokers</a></li>
+ <li><a class="nav" href="{href}">Register New Brokers</a></li>
</ul>
+
{brokers}
</td>
</tr>
Modified: mgmt/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.py 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/brokercluster.py 2007-10-27 02:04:05 UTC (rev 1171)
@@ -88,7 +88,7 @@
def render_name(self, session, cluster):
return cluster.name
- class ClusterBrokerTab(BrokerSet):
+ class ClusterBrokerTab(BrokerSetForm):
def render_title(self, session, cluster):
return "Brokers (%i)" % len(cluster.broker_items())
Modified: mgmt/cumin/python/cumin/brokercluster.strings
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.strings 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/brokercluster.strings 2007-10-27 02:04:05 UTC (rev 1171)
@@ -13,7 +13,11 @@
}
[BrokerClusterSet.html]
-<table class="BrokerClusterSet mobjects">
+<ul class="actions">
+ <li><a class="nav" href="{href}">Add Broker Cluster</a></li>
+</ul>
+
+<table class="mobjects">
<tr>
<th>Broker Cluster</th>
<th>Configuration</th>
@@ -42,39 +46,17 @@
<h1>{title}</h1>
-<dl class="properties">
- <dt>Name</dt><dd>{name}</dd>
-</dl>
-
-<ul class="actions">
- <li><a href="">Shutdown This Cluster</a></li>
-</ul>
-
-{tabs}
-
-[ClusterBrokerTab.html]
-<ul class="actions">
- <li><a href="{add_broker_href}">Add Broker</a></li>
-</ul>
-
-<table class="mobjects">
+<table class="props">
+ <tr><th>Name</th><td>{name}</td></tr>
<tr>
- <th>Broker</th>
- <th>Profile</th>
- <th>Status</th>
- <th>Load</th>
+ <th class="actions" colspan="2">
+ <h2>Act on This Cluster:</h2>
+ <a href="{href}">Shutdown</a>
+ </th>
</tr>
-
- {items}
</table>
-[ClusterBrokerTab.item_html]
-<tr>
- <td>{item_link}</td>
- <td>{item_profile_link}</td>
- <td>{item_status}</td>
- <td>{item_load}</td>
-</tr>
+{tabs}
[ClusterVirtualHostTab.html]
<ul class="actions">
Modified: mgmt/cumin/python/cumin/brokergroup.strings
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.strings 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/brokergroup.strings 2007-10-27 02:04:05 UTC (rev 1171)
@@ -1,6 +1,6 @@
[BrokerGroupSet.html]
<ul class="actions">
- <li><a href="{group_add_href}">Add Broker Group</a></li>
+ <li><a class="nav" href="{group_add_href}">Add Broker Group</a></li>
</ul>
<div class="sactions">
@@ -37,16 +37,18 @@
<h1>{title}</h1>
-<dl class="properties">
- <dt>Name</dt><dd>{name}</dd>
- <dt>Category</dt><dd>{category}</dd>
-</dl>
+<table class="props">
+ <tr><th>Name</th><td>{name}</td></tr>
+ <tr><th>Category</th><td>{category}</td></tr>
+ <tr>
+ <th class="actions" colspan="2">
+ <h2>Act on This Group:</h2>
+ <a href="{edit_href}">Edit</a>
+ <a href="{href}">Remove</a>
+ </th>
+ </tr>
+</table>
-<ul class="actions">
- <li><a href="{edit_href}">Edit This Broker Group</a></li>
- <li><a href="">Remove This Broker Group</a></li>
-</ul>
-
{tabs}
[BrokerGroupForm.html]
Modified: mgmt/cumin/python/cumin/brokerprofile.strings
===================================================================
--- mgmt/cumin/python/cumin/brokerprofile.strings 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/brokerprofile.strings 2007-10-27 02:04:05 UTC (rev 1171)
@@ -1,4 +1,8 @@
[BrokerProfileSet.html]
+<ul class="actions">
+ <li><a class="nav" href="{href}">Add Broker Profile</a></li>
+</ul>
+
<table class="BrokerProfileSet mobjects">
<tr>
<th>Broker Profile</th>
@@ -13,20 +17,20 @@
</tr>
[BrokerProfileView.html]
-<div class="oblock">
- <h1>{title}</h1>
+<h1>{title}</h1>
- <dl class="properties">
- <dt>Name</dt><dd>{name}</dd>
- </dl>
+<table class="props">
+ <tr><th>Name</th><td>{name}</td></tr>
+ <tr>
+ <th class="actions" colspan="2">
+ <h2>Act on This Profile:</h2>
+ <a href="{href}">Edit</a>
+ </th>
+ </tr>
+</table>
- <ul class="actions">
- <li><a href="">Edit This Profile</a></li>
- </ul>
+{tabs}
- {tabs}
-</div>
-
[ProfileConfigTab.html]
<ul class="actions">
<li><a href="">Add Property</a></li>
Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/client.py 2007-10-27 02:04:05 UTC (rev 1171)
@@ -19,8 +19,8 @@
self.page().show_client(branch, client).show_view(branch)
return mlink(branch.marshal(), "Client", client.address)
- def render_item_sessions(self, session, client):
- return "10 sessions"
+ def render_item_status(self, session, client):
+ return "Attached"
def render_item_messages_produced(self, session, client):
return client.get_measurement("msgsProduced").get_value()
Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/client.strings 2007-10-27 02:04:05 UTC (rev 1171)
@@ -1,10 +1,11 @@
[ClientSet.html]
<form>
- <button>Close Clients</button>
- <button>Detach Clients</button>
+ <div class="sactions">
+ <h2>Act on Selected Clients:</h2>
+ <button>Close</button>
+ <button>Detach</button>
+ </div>
- <br/><br/>
-
<table class="mobjects">
<tr>
<th><input type="checkbox"/></th>
@@ -24,7 +25,7 @@
<tr>
<td><input type="checkbox"/></td>
<td>{item_link}</td>
- <td>{item_sessions}</td>
+ <td>{item_status}</td>
<td style="text-align: right;">{item_messages_produced}</td>
<td style="text-align: right;">{item_messages_consumed}</td>
<td style="text-align: right;">{item_bytes_produced}</td>
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-27 02:04:05 UTC (rev 1171)
@@ -143,6 +143,16 @@
list-style: none;
}
+ul.actions li {
+ display: inline;
+}
+
+a.nav:before {
+ content: "\00BB \0020";
+ font-weight: bold;
+ color: #dc9f2e;
+}
+
div.sactions {
margin: 0;
padding: 0.5em 0.75em;
@@ -156,8 +166,57 @@
margin: 0 0.5em 0 0;
}
+div.mobject div.mactions h2 {
+ display: inline;
+ font-size: 0.9em;
+ font-weight: normal;
+ margin: 0 0.5em 0 0;
+}
+
+table.props {
+ margin: 0 0 1em 0;
+ width: 25em;
+ border-collapse: collapse;
+}
+
+table.props tr {
+ border-top: 1px dotted #ccc;
+ vertical-align: top;
+}
+
+table.props th, table.props td {
+ text-align: left;
+ padding: 0.25em 0.5em;
+}
+
+table.props th {
+ background-color: #f7f7f7;
+ font-weight: normal;
+}
+
+table.props th.actions {
+ padding: 0.5em;
+ background-color: #e7e7f7;
+}
+
+table.props th.actions h2 {
+ display: inline;
+ font-weight: normal;
+ font-size: 0.9em;
+ margin: 0 0.5em 0 0;
+}
+
+button, table.props th.actions a, ul.actions a {
+ margin: 0;
+ border: 1px solid #ddd;
+ padding: 0.25em 0.5em 0.15em 0.5em;
+ background-color: #f7f7f7;
+ color: #000;
+ font-size: 0.9em;
+}
+
dl.properties {
- margin: 1em 0;
+ margin: 0 0 1.5em 0;
width: 25em;
}
@@ -194,12 +253,6 @@
float: right;
}
-a.action:before, ul.actions li:before {
- content: "\00BB \0020";
- font-weight: bold;
- color: #dc9f2e;
-}
-
ul.mobjects .flags {
font-size: small;
font-style: italic;
@@ -294,8 +347,6 @@
}
form.mform button {
- border-style: groove;
- padding: 0.25em 0.5em;
margin: 0.5em;
}
@@ -466,7 +517,7 @@
<div id="head">
<ul id="whonav">
<li>Hi, <strong>nsantos</strong></li>
- <li><a class="action" href="">Log Out</a></li>
+ <li><a class="nav" href="">Log Out</a></li>
</ul>
<a id="logo" href="{href}"><img src="resource?name=logo.png"/></a>
@@ -488,31 +539,3 @@
<ul class="TabSet tabs">{tabs}</ul>
<div class="TabSet mode">{mode}</div>
</div>
-
-[BrokerProfileTab.html]
-<ul class="actions">
- <li><a href="">Add Broker Profile</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Broker Profile</th>
- </tr>
-
- {items}
-</table>
-
-[BrokerClusterTab.html]
-<ul class="actions">
- <li><a href="">Add Broker Cluster</a></li>
-</ul>
-
-<table class="BrokerClusterSet mobjects">
- <tr>
- <th>Broker Cluster</th>
- <th>Configuration</th>
- <th>Status</th>
- </tr>
-
- {items}
-</table>
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/queue.py 2007-10-27 02:04:05 UTC (rev 1171)
@@ -118,7 +118,7 @@
def render_title(self, session, queue):
return "Queue '%s'" % queue.name
- def render_queue_name(self, session, queue):
+ def render_name(self, session, queue):
return queue.name
def render_latency_tuning(self, session, queue):
Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/queue.strings 2007-10-27 02:04:05 UTC (rev 1171)
@@ -7,10 +7,11 @@
[QueueSet.html]
<form action="{href}" method="get">
- <button type="submit">Purge Messages</button>
+ <div class="sactions">
+ <h2>Act on Selected Queues:</h2>
+ <button>Purge Messages</button>
+ </div>
- <br/><br/>
-
<table class="QueueSet mobjects">
<tr>
<th><input type="checkbox"/></th>
@@ -118,23 +119,23 @@
</div>
[QueueView.html]
-<div class="QueueView oblock">
- {status}
+{status}
- <h1><img src="resource?name=queue-36.png"> {title}</h1>
+<h1><img src="resource?name=queue-36.png"> {title}</h1>
- <dl class="properties">
- <dt>Name</dt><dd>{queue_name}</dd>
- <dt>Latency Tuning</dt><dd>{latency_tuning}</dd>
- </dl>
+<table class="props">
+ <tr><th>Name</th><td>{name}</td></tr>
+ <tr><th>Latency Tuning</th><td>{latency_tuning}</td></tr>
+ <tr>
+ <th class="actions" colspan="2">
+ <h2>Act on This Queue:</h2>
+ <a href="{href}">Purge Messages</a>
+ </th>
+ </tr>
+</table>
- <ul class="actions">
- <li><a href="">Purge Messages</a></li>
- </ul>
+{tabs}
- {tabs}
-</div>
-
[QueueBindingSet.html]
<table class="QueueBindingSet mobjects">
<tr>
@@ -230,16 +231,14 @@
</div>
[ConsumerSet.html]
-<select>
- <option>Act on Selection...</option>
- <option>Throttle Consumers</option>
- <option>Start Consumers</option>
- <option>Stop Consumers</option>
- <option>Close Consumers</option>
-</select>
+<div class="sactions">
+ <h2>Act on Selected Consumers:</h2>
+ <button>Start</button>
+ <button>Stop</button>
+ <button>Close</button>
+ <button>Throttle</button>
+</div>
-<br/><br/>
-
<table class="mobjects">
<tr>
<th><input type="checkbox"/></th>
Modified: mgmt/cumin/python/cumin/virtualhost.py
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.py 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/virtualhost.py 2007-10-27 02:04:05 UTC (rev 1171)
@@ -75,7 +75,7 @@
def render_name(self, session, vhost):
return vhost.name
- def render_broker(self, session, vhost):
+ def render_broker_link(self, session, vhost):
broker = vhost.get_broker()
if broker:
@@ -85,7 +85,7 @@
else:
return none()
- def render_broker_cluster(self, session, vhost):
+ def render_cluster_link(self, session, vhost):
cluster = vhost.get_broker_cluster()
if cluster:
Modified: mgmt/cumin/python/cumin/virtualhost.strings
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.strings 2007-10-26 18:39:05 UTC (rev 1170)
+++ mgmt/cumin/python/cumin/virtualhost.strings 2007-10-27 02:04:05 UTC (rev 1171)
@@ -17,20 +17,18 @@
</tr>
[VirtualHostView.html]
-<div class="oblock">
- <div class="mstatus green" id="{id}">
- <h2>Functional Host Status</h2>
+<div class="mstatus green" id="{id}">
+ <h2>Functional Host 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>
- <dt>Broker</dt><dd>{broker}</dd>
- <dt>Broker Cluster</dt><dd>{broker_cluster}</dd>
- </dl>
+<table class="props">
+ <tr><th>Name</th><td>{name}</td></tr>
+ <tr><th>Broker</th><td>{broker_link}</td></tr>
+ <tr><th>Cluster</th><td>{cluster_link}</td></tr>
+</table>
- {tabs}
-</div>
+{tabs}
17 years, 2 months
rhmessaging commits: r1170 - mgmt/mint.
by rhmessaging-commits＠lists.jboss.org
Author: nunofsantos
Date: 2007-10-26 14:39:05 -0400 (Fri, 26 Oct 2007)
New Revision: 1170
Modified:
mgmt/mint/schemaparser.py
Log:
fix mllib package location
Modified: mgmt/mint/schemaparser.py
===================================================================
--- mgmt/mint/schemaparser.py 2007-10-26 18:03:15 UTC (rev 1169)
+++ mgmt/mint/schemaparser.py 2007-10-26 18:39:05 UTC (rev 1170)
@@ -1,4 +1,4 @@
-import mllib
+import qpid.mllib
from sqlobject import connectionForURI, sqlhub, MixedCaseUnderscoreStyle
# mapping between xml schema types and database column types
@@ -93,7 +93,7 @@
# parse configuration file
-config = mllib.xml_parse("config.xml")
+config = qpid.mllib.xml_parse("config.xml")
configOptions = config.query["config/configOption"]
options = dict()
for opt in configOptions:
@@ -107,7 +107,7 @@
conn = connectionForURI(options["dsn"])
sqlhub.processConnection = conn
-schema = mllib.xml_parse(options["schemaXML"])
+schema = qpid.mllib.xml_parse(options["schemaXML"])
objects = schema.query["schema/object"]
style = MixedCaseUnderscoreStyle()
17 years, 2 months
rhmessaging commits: r1169 - in mgmt: notes and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-10-26 14:03:15 -0400 (Fri, 26 Oct 2007)
New Revision: 1169
Modified:
mgmt/cumin/python/cumin/broker.strings
mgmt/cumin/python/cumin/brokergroup.strings
mgmt/cumin/python/cumin/page.strings
mgmt/notes/Todo
Log:
Revision of style for actions on selections.
Modified: mgmt/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/cumin/python/cumin/broker.strings 2007-10-26 17:59:32 UTC (rev 1168)
+++ mgmt/cumin/python/cumin/broker.strings 2007-10-26 18:03:15 UTC (rev 1169)
@@ -21,22 +21,27 @@
[BrokerSetForm.html]
<form id="{id}" method="post" action="?">
<!-- <select onchange="document.getElementById('{id}.submit').submit()"> -->
- <select>
- <option>Act on Selection...</option>
- <optgroup label="Actions">
- <option>Shutdown</option>
- <option>Load Balance</option>
- </optgroup>
- <optgroup label="Add to Group">
- <option>East Coast</option>
- <option>West Coast</option>
- <option>Marketing</option>
- <option>Sales</option>
- </optgroup>
- </select>
- {submit}
- <br/><br/>
+ <div>
+ <div class="sactions">
+ <h2>Act on Selected Brokers:</h2>
+ <select>
+ <option>Choose Action...</option>
+ <optgroup label="Actions">
+ <option>Shutdown</option>
+ <option>Load Balance</option>
+ </optgroup>
+ <optgroup label="Add to Group">
+ <option>East Coast</option>
+ <option>West Coast</option>
+ <option>Marketing</option>
+ <option>Sales</option>
+ </optgroup>
+ </select>
+ {submit}
+ </div>
+ </div>
+
<table class="mobjects">
<tr>
<th><input type="checkbox"/></th>
Modified: mgmt/cumin/python/cumin/brokergroup.strings
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.strings 2007-10-26 17:59:32 UTC (rev 1168)
+++ mgmt/cumin/python/cumin/brokergroup.strings 2007-10-26 18:03:15 UTC (rev 1169)
@@ -3,11 +3,12 @@
<li><a href="{group_add_href}">Add Broker Group</a></li>
</ul>
-<button>Shutdown</button>
-<button>Remove</button>
+<div class="sactions">
+ <h2>Act on Selected Groups:</h2>
+ <button>Shutdown</button>
+ <button>Remove</button>
+</div>
-<br/><br/>
-
<table class="mobjects">
<tr>
<th><input type="checkbox"/></th>
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-26 17:59:32 UTC (rev 1168)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-26 18:03:15 UTC (rev 1169)
@@ -143,6 +143,19 @@
list-style: none;
}
+div.sactions {
+ margin: 0;
+ padding: 0.5em 0.75em;
+ background-color: #e7e7f7;
+}
+
+div.sactions h2 {
+ display: inline;
+ font-size: 0.9em;
+ font-weight: normal;
+ margin: 0 0.5em 0 0;
+}
+
dl.properties {
margin: 1em 0;
width: 25em;
Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo 2007-10-26 17:59:32 UTC (rev 1168)
+++ mgmt/notes/Todo 2007-10-26 18:03:15 UTC (rev 1169)
@@ -103,3 +103,5 @@
log
* Move q,e to server level (using default vhost)
+
+ * Make actions more uniform
17 years, 2 months