Author: justi9 Date: 2007-10-16 13:12:57 -0400 (Tue, 16 Oct 2007) New Revision: 1090 Modified: mgmt/cumin/python/cumin/server.py mgmt/cumin/python/cumin/server.strings Log: Adds a profile link to the server view. Modified: mgmt/cumin/python/cumin/server.py =================================================================== --- mgmt/cumin/python/cumin/server.py 2007-10-16 16:28:14 UTC (rev 1089) +++ mgmt/cumin/python/cumin/server.py 2007-10-16 17:12:57 UTC (rev 1090) @@ -218,6 +218,18 @@ return html + def render_profile_link(self, session, server): + profile = server.get_server_profile() + + if profile: + branch = session.branch() + self.page().show_server_profile(branch, profile).show_view(branch) + html = mlink(branch.marshal(), "ServerProfile", profile.name) + else: + html = none() + + return html + class ServerVirtualHostTab(VirtualHostSet): def render_title(self, session, server): return "Functional Hosts (%i)" % len(server.virtual_host_items()) Modified: mgmt/cumin/python/cumin/server.strings =================================================================== --- mgmt/cumin/python/cumin/server.strings 2007-10-16 16:28:14 UTC (rev 1089) +++ mgmt/cumin/python/cumin/server.strings 2007-10-16 17:12:57 UTC (rev 1090) @@ -32,7 +32,7 @@ [ServerConfigTab.html] <ul class="actions"> - <li><a href="">Apply This Configuration to Server</a></li> + <li><a href="">Apply Configuration to Server</a></li> <li><a href="">Add Property</a></li> </ul> @@ -40,7 +40,7 @@ <tr> <th>Property</th> <th>Configured Value</th> - <th>Actual Value</th> + <th>Server Value</th> <th>Profile Value</th> <th></th> </tr> @@ -113,6 +113,7 @@ <dl class="properties"> <dt>Name</dt><dd>{name}</dd> <dt>Cluster</dt><dd>{cluster_link}</dd> + <dt>Server Profile</dt><dd>{profile_link}</dd> </dl> <ul class="actions">