[rhmessaging-commits] rhmessaging commits: r1930 - mgmt/cumin/python/cumin.

Author: justi9 Date: 2008-04-17 13:30:14 -0400 (Thu, 17 Apr 2008) New Revision: 1930 Modified: mgmt/cumin/python/cumin/client.strings mgmt/cumin/python/cumin/exchange.strings mgmt/cumin/python/cumin/queue.strings mgmt/cumin/python/cumin/widgets.py mgmt/cumin/python/cumin/widgets.strings Log: Clean up CuminStatus styling Modified: mgmt/cumin/python/cumin/client.strings =================================================================== --- mgmt/cumin/python/cumin/client.strings 2008-04-17 17:16:10 UTC (rev 1929) +++ mgmt/cumin/python/cumin/client.strings 2008-04-17 17:30:14 UTC (rev 1930) @@ -71,11 +71,7 @@ } [ClientStatus.html] -<div id="{id}" class="{class}"> - <h2>Status</h2> - - <!-- <div>{status_info}</div> --> - +<div id="{id}" class="CuminStatus {color}"> <table> <tr> <th></th> Modified: mgmt/cumin/python/cumin/exchange.strings =================================================================== --- mgmt/cumin/python/cumin/exchange.strings 2008-04-17 17:16:10 UTC (rev 1929) +++ mgmt/cumin/python/cumin/exchange.strings 2008-04-17 17:30:14 UTC (rev 1930) @@ -128,11 +128,7 @@ } [ExchangeStatus.html] -<div id="{id}" class="{class}"> - <h2>Status</h2> - - <!-- <div>{status_info}</div> --> - +<div id="{id}" class="CuminStatus {color}"> <table> <tr> <th></th> Modified: mgmt/cumin/python/cumin/queue.strings =================================================================== --- mgmt/cumin/python/cumin/queue.strings 2008-04-17 17:16:10 UTC (rev 1929) +++ mgmt/cumin/python/cumin/queue.strings 2008-04-17 17:30:14 UTC (rev 1930) @@ -79,7 +79,7 @@ } [QueueStatus.html] -<div id="{id}" class="{class}"> +<div id="{id}" class="CuminStatus {color}"> <table> <tr> <th></th> Modified: mgmt/cumin/python/cumin/widgets.py =================================================================== --- mgmt/cumin/python/cumin/widgets.py 2008-04-17 17:16:10 UTC (rev 1929) +++ mgmt/cumin/python/cumin/widgets.py 2008-04-17 17:30:14 UTC (rev 1930) @@ -223,25 +223,17 @@ def get_args(self, session): return self.frame.get_args(session) - def render_class(self, session, object): + def render_color(self, session, object): if hasattr(object, "errors"): if object.errors: - return "mstatus red" + return "red" elif object.warnings: - return "mstatus yellow" + return "yellow" else: - return "mstatus green" + return "green" else: - return "mstatus green" + return "green" - def render_status_info(self, session, object): - error_count = 0 #XXX len(object.errors) - warning_count = 0 #XXX len(object.warnings) - - return "%i error%s, %i warning%s" % \ - (error_count, ess(error_count), - warning_count, ess(warning_count)) - class CuminProperties(PropertySet): def get_args(self, session): return self.frame.get_args(session) Modified: mgmt/cumin/python/cumin/widgets.strings =================================================================== --- mgmt/cumin/python/cumin/widgets.strings 2008-04-17 17:16:10 UTC (rev 1929) +++ mgmt/cumin/python/cumin/widgets.strings 2008-04-17 17:30:14 UTC (rev 1930) @@ -102,11 +102,11 @@ var warnings = wcount + " " + (wcount == "1" && "warning" || "warnings"); if (ecount != "0") { - status.setattr("class", "mstatus red"); + status.setattr("class", "CuminStatus red"); } else if (wcount != "0") { - status.setattr("class", "mstatus yellow"); + status.setattr("class", "CuminStatus yellow"); } else { - status.setattr("class", "mstatus green"); + status.setattr("class", "CuminStatus green"); } */ @@ -122,11 +122,50 @@ */ } +[CuminStatus.css] +div.CuminStatus { + float: right; + margin: 0.5em 0; + padding: 0.75em 1em; + width: 15em; +} + +div.CuminStatus h2 { + font-weight: bold; +} + +div.CuminStatus div, div.CuminStatus h2 { + margin: 0 0 0.5em 0; +} + +div.CuminStatus.red { + border: 1px dotted #c99; + background-color: #fcc; +} + +div.CuminStatus.yellow { + border: 1px dotted #cc9; + background-color: #ffc; +} + +div.CuminStatus.green { + border: 1px dotted #9c9; + background-color: #cfc; +} + +div.CuminStatus table { + width: 100%; + font-size: 0.9em; +} + +div.CuminStatus table th, div.CuminStatus table td { + font-weight: normal; + text-align: left; +} + [CuminStatus.html] -<div id="{id}" class="{class}"> +<div id="{id}" class="CuminStatus {color}"> <h2>Status</h2> - - <!-- <div>{status_info}</div> --> </div> [CuminDetails.css]