[rhmessaging-commits] rhmessaging commits: r1113 - mgmt/cumin/python/cumin.
Author: justi9
Date: 2007-10-18 13:19:49 -0400 (Thu, 18 Oct 2007)
New Revision: 1113
Modified:
mgmt/cumin/python/cumin/cluster.strings
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/cumin/server.py
mgmt/cumin/python/cumin/server.strings
Log:
Adds a working clear filters link. Adds some more (as yet cosmetic)
fields and columns. Adds add links to each of the top-level tabs.
Modified: mgmt/cumin/python/cumin/cluster.strings
===================================================================
--- mgmt/cumin/python/cumin/cluster.strings 2007-10-18 17:15:28 UTC (rev 1112)
+++ mgmt/cumin/python/cumin/cluster.strings 2007-10-18 17:19:49 UTC (rev 1113)
@@ -125,31 +125,6 @@
}
</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>
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-18 17:15:28 UTC (rev 1112)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-18 17:19:49 UTC (rev 1113)
@@ -99,6 +99,7 @@
h2 {
font-size: 1em;
font-weight: normal;
+ margin: 0 0 0.5em 0;
}
.oblock {
@@ -453,3 +454,18 @@
{items}
</table>
+
+[PClusterTab.html]
+<ul class="actions">
+ <li><a href="">Add Cluster</a></li>
+</ul>
+
+<table class="ClusterSet mobjects">
+ <tr>
+ <th>Cluster</th>
+ <th>Configuration</th>
+ <th>Status</th>
+ </tr>
+
+ {items}
+</table>
Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py 2007-10-18 17:15:28 UTC (rev 1112)
+++ mgmt/cumin/python/cumin/server.py 2007-10-18 17:19:49 UTC (rev 1113)
@@ -406,6 +406,13 @@
def render_none(self, session, model):
return none()
+ def render_clear_filters_href(self, session, model):
+ branch = session.branch()
+ self.group.set(branch, None)
+ self.profile.set(branch, None)
+ self.cluster.set(branch, None)
+ return branch.marshal()
+
def render_group_filters(self, session, model):
groups = sorted_by(model.get_server_groups())
return self._render_filters(session, groups, self.group_tmpl)
Modified: mgmt/cumin/python/cumin/server.strings
===================================================================
--- mgmt/cumin/python/cumin/server.strings 2007-10-18 17:15:28 UTC (rev 1112)
+++ mgmt/cumin/python/cumin/server.strings 2007-10-18 17:19:49 UTC (rev 1113)
@@ -162,8 +162,7 @@
</div>
<div class="ServerBrowser servers">
<ul class="actions">
- <li><a href="">Add Server</a></li>
- <li><a href="">Shutdown Servers</a></li>
+ <li><a href="">Register New Servers</a></li>
</ul>
{servers}
@@ -187,7 +186,7 @@
<tr>
<td class="nav">
<ul class="actions">
- <li><a href="">Clear Filters</a></li>
+ <li><a href="{clear_filters_href}">Clear
Filters</a></li>
</ul>
<h2>Filter by Group</h2>
@@ -199,7 +198,7 @@
</td>
<td class="view">
<ul class="actions">
- <li><a href="">Register Servers</a></li>
+ <li><a href="">Register New Servers</a></li>
</ul>
{servers}
</td>
@@ -217,6 +216,22 @@
[BrowserServers.html]
<form>
+
+<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>
+<br/><br/>
+
<table class="mobjects">
<tr>
<th><input type="checkbox"/></th>