[rhmessaging-commits] rhmessaging commits: r1175 - in mgmt: notes and 1 other directory.

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