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

Author: justi9 Date: 2008-02-07 00:26:12 -0500 (Thu, 07 Feb 2008) New Revision: 1653 Modified: mgmt/cumin/python/cumin/page.py mgmt/cumin/python/cumin/page.strings mgmt/cumin/python/cumin/parameters.py mgmt/cumin/python/cumin/system.py mgmt/cumin/python/cumin/system.strings Log: Makes a minimal portion of the system ui work (against some made up data). Hides the grid tab as it won't appear for a time. Modified: mgmt/cumin/python/cumin/page.py =================================================================== --- mgmt/cumin/python/cumin/page.py 2008-02-06 21:42:44 UTC (rev 1652) +++ mgmt/cumin/python/cumin/page.py 2008-02-07 05:26:12 UTC (rev 1653) @@ -96,6 +96,9 @@ self.__cluster_add = BrokerClusterAdd(app, "clusteradd") self.add_mode(self.__cluster_add) + self.__system = SystemFrame(app, "system") + self.add_mode(self.__system) + def get_title(self, session, object): return "Main" @@ -170,6 +173,11 @@ frame = self.show_mode(session, self.__cluster_add) return self.page().set_current_frame(session, frame) + def show_system(self, session, system): + frame = self.show_mode(session, self.__system) + frame.set_object(session, system) + return self.page().set_current_frame(session, frame) + class MainFrameTabs(LinkSet): def __init__(self, app, name): super(MainFrameTabs, self).__init__(app, name) @@ -181,7 +189,7 @@ self.add_parameter(self.selection) self.add_link(self.MessagingTab(app, "mtab")) - self.add_link(self.GridTab(app, "gtab")) + #self.add_link(self.GridTab(app, "gtab")) self.add_link(self.SystemsTab(app, "stab")) class Tab(Link): Modified: mgmt/cumin/python/cumin/page.strings =================================================================== --- mgmt/cumin/python/cumin/page.strings 2008-02-06 21:42:44 UTC (rev 1652) +++ mgmt/cumin/python/cumin/page.strings 2008-02-07 05:26:12 UTC (rev 1653) @@ -708,10 +708,12 @@ [MainFrame.html] <div id="head"> <div> + <!-- <ul id="user"> <li>Hi, <strong>user</strong></li> <li><a class="nav" href="">Log Out</a></li> </ul> + --> {tabs} </div> Modified: mgmt/cumin/python/cumin/parameters.py =================================================================== --- mgmt/cumin/python/cumin/parameters.py 2008-02-06 21:42:44 UTC (rev 1652) +++ mgmt/cumin/python/cumin/parameters.py 2008-02-07 05:26:12 UTC (rev 1653) @@ -79,6 +79,13 @@ def do_marshal(self, session): return str(session.id) +class SystemParameter(Parameter): + def do_unmarshal(self, string): + return System.get(int(string)) + + def do_marshal(self, session): + return str(session.id) + class VirtualHostParameter(Parameter): def do_unmarshal(self, string): return Vhost.get(int(string)) Modified: mgmt/cumin/python/cumin/system.py =================================================================== --- mgmt/cumin/python/cumin/system.py 2008-02-06 21:42:44 UTC (rev 1652) +++ mgmt/cumin/python/cumin/system.py 2008-02-07 05:26:12 UTC (rev 1653) @@ -51,7 +51,7 @@ self.add_mode(self.view) self.set_view_mode(self.view) - def get_title(self, session, broker): + def get_title(self, session, system): return "System '%s'" % system.sysId class SystemStatus(CuminStatus): @@ -67,11 +67,18 @@ self.tabs = TabbedModeSet(app, "tabs") self.add_child(self.tabs) - self.add_tab(SystemStatsTab(app, "stats")) + self.tabs.add_tab(self.SystemStatsTab(app, "stats")) - def get_title(self, session, broker): - return "System '%s'" % broker.name + def get_title(self, session, system): + return "System '%s'" % system.sysId + def render_created_deleted(self, session, system): + return "%s &ndash; %s" % (fmt_datetime(system.creationTime), + fmt_datetime(system.deletionTime)) + + def render_updated(self, session, system): + return fmt_datetime(system.recTime) + def render_data_url(self, session, model): return "model.xml" Modified: mgmt/cumin/python/cumin/system.strings =================================================================== --- mgmt/cumin/python/cumin/system.strings 2008-02-06 21:42:44 UTC (rev 1652) +++ mgmt/cumin/python/cumin/system.strings 2008-02-07 05:26:12 UTC (rev 1653) @@ -23,3 +23,11 @@ </table> {hidden_inputs} </form> + +[SystemView.html] +<h1><img src="resource?name=system-36.png"/>{title}</h1> + +<table class="props"> + <tr><th>Created &ndash; Deleted</th><td>{created_deleted}</td></tr> + <tr><th>Updated</th><td>{updated}</td></tr> +</table>