Author: justi9 Date: 2007-10-10 14:39:30 -0400 (Wed, 10 Oct 2007) New Revision: 1000 Modified: mgmt/cumin/python/cumin/cluster.py mgmt/cumin/python/cumin/cluster.strings mgmt/cumin/python/cumin/exchange.py mgmt/cumin/python/cumin/page.py mgmt/cumin/python/cumin/queue.py mgmt/cumin/python/cumin/server.py mgmt/cumin/python/cumin/virtualhost.py mgmt/cumin/python/cumin/virtualhost.strings Log: Rename "Virtual Host" to "Functional Host" in the UI, to avoid confusion. Modified: mgmt/cumin/python/cumin/cluster.py =================================================================== --- mgmt/cumin/python/cumin/cluster.py 2007-10-10 18:12:30 UTC (rev 999) +++ mgmt/cumin/python/cumin/cluster.py 2007-10-10 18:39:30 UTC (rev 1000) @@ -100,7 +100,7 @@ class VirtualHostTab(VirtualHostSet): def render_title(self, session, cluster): - return "Virtual Hosts (%i)" % len(cluster.virtual_host_items()) + return "Functional Hosts (%i)" % len(cluster.virtual_host_items()) def get_items(self, session, cluster): return sorted(cluster.virtual_host_items(), cmp, lambda x: x.name) Modified: mgmt/cumin/python/cumin/cluster.strings =================================================================== --- mgmt/cumin/python/cumin/cluster.strings 2007-10-10 18:12:30 UTC (rev 999) +++ mgmt/cumin/python/cumin/cluster.strings 2007-10-10 18:39:30 UTC (rev 1000) @@ -11,6 +11,8 @@ <td>{item_link}</td> </tr> + + [ClusterView.html] <div class="oblock"> <div class="mstatus green" id="{id}"> @@ -56,12 +58,12 @@ [VirtualHostTab.html] <ul class="actions"> - <li><a href="">Add Virtual Host</a></li> + <li><a href="">Add Functional Host</a></li> </ul> <table class="mobjects"> <tr> - <th>Virtual Host</th> + <th>Functional Host</th> <th>Configuration</th> <th></th> </tr> Modified: mgmt/cumin/python/cumin/exchange.py =================================================================== --- mgmt/cumin/python/cumin/exchange.py 2007-10-10 18:12:30 UTC (rev 999) +++ mgmt/cumin/python/cumin/exchange.py 2007-10-10 18:39:30 UTC (rev 1000) @@ -220,7 +220,7 @@ session.set_redirect(branch.marshal()) def render_title(self, session, vhost): - return "Add Exchange to Virtual Host '%s'" % vhost.name + return "Add Exchange to Functional Host '%s'" % vhost.name class ExchangeEdit(ExchangeForm): def on_cancel(self, session, exchange): Modified: mgmt/cumin/python/cumin/page.py =================================================================== --- mgmt/cumin/python/cumin/page.py 2007-10-10 18:12:30 UTC (rev 999) +++ mgmt/cumin/python/cumin/page.py 2007-10-10 18:39:30 UTC (rev 1000) @@ -192,7 +192,7 @@ self.add_child(self.groups) def render_title(self, session, model): - return "Virtual Hosts" + return "Functional Hosts" class VirtualHostTemplateSet(VirtualHostSet): def get_items(self, session, model): Modified: mgmt/cumin/python/cumin/queue.py =================================================================== --- mgmt/cumin/python/cumin/queue.py 2007-10-10 18:12:30 UTC (rev 999) +++ mgmt/cumin/python/cumin/queue.py 2007-10-10 18:39:30 UTC (rev 1000) @@ -267,7 +267,7 @@ session.set_redirect(branch.marshal()) def render_title(self, session, vhost): - return "Add Queue to Virtual Host '%s'" % vhost.name + return "Add Queue to Functional Host '%s'" % vhost.name class QueueEdit(QueueForm): def on_cancel(self, session, queue): Modified: mgmt/cumin/python/cumin/server.py =================================================================== --- mgmt/cumin/python/cumin/server.py 2007-10-10 18:12:30 UTC (rev 999) +++ mgmt/cumin/python/cumin/server.py 2007-10-10 18:39:30 UTC (rev 1000) @@ -127,7 +127,7 @@ class ServerVirtualHosts(VirtualHostSet): def render_title(self, session, server): - return "Virtual Hosts (%i)" % len(server.virtual_host_items()) + return "Functional Hosts (%i)" % len(server.virtual_host_items()) def get_items(self, session, server): return sorted(server.virtual_host_items(), cmp, lambda x: x.name) Modified: mgmt/cumin/python/cumin/virtualhost.py =================================================================== --- mgmt/cumin/python/cumin/virtualhost.py 2007-10-10 18:12:30 UTC (rev 999) +++ mgmt/cumin/python/cumin/virtualhost.py 2007-10-10 18:39:30 UTC (rev 1000) @@ -10,7 +10,7 @@ class VirtualHostSet(ItemSet): def render_title(self, session, model): - return "Virtual Hosts (%i)" % len(model.get_virtual_hosts()) + return "Functional Hosts (%i)" % len(model.get_virtual_hosts()) def get_items(self, session, model): return sorted(model.get_virtual_hosts(), cmp, lambda x: x.name) @@ -85,7 +85,7 @@ return branch.marshal() def render_title(self, session, vhost): - return "Virtual Host '%s'" % vhost.name + return "Functional Host '%s'" % vhost.name class VirtualHostView(Widget): def __init__(self, app, name): @@ -104,7 +104,7 @@ self.tabs.add_child(self.log) def render_title(self, session, vhost): - return "Virtual Host '%s'" % vhost.name + return "Functional Host '%s'" % vhost.name def render_name(self, session, vhost): return vhost.name Modified: mgmt/cumin/python/cumin/virtualhost.strings =================================================================== --- mgmt/cumin/python/cumin/virtualhost.strings 2007-10-10 18:12:30 UTC (rev 999) +++ mgmt/cumin/python/cumin/virtualhost.strings 2007-10-10 18:39:30 UTC (rev 1000) @@ -1,7 +1,7 @@ [VirtualHostSet.html] <table class="VirtualHostSet mobjects"> <tr> - <th>Virtual Host</th> + <th>Functional Host</th> <th>Configuration</th> <th>Status</th> </tr>