Author: justi9 Date: 2010-10-15 12:48:35 -0400 (Fri, 15 Oct 2010) New Revision: 4390 Modified: mgmt/trunk/cumin/python/cumin/main.strings mgmt/trunk/cumin/python/cumin/widgets.strings mgmt/trunk/wooly/python/wooly/__init__.py Log: Introduce a resource prefix variable for redirecting requests for static resources Modified: mgmt/trunk/cumin/python/cumin/main.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/main.strings 2010-10-15 16:39:45 UTC (rev 4389) +++ mgmt/trunk/cumin/python/cumin/main.strings 2010-10-15 16:48:35 UTC (rev 4390) @@ -24,14 +24,14 @@ <tr> <td> <div class="fullpageable"> - <h2><img src="resource?name=queue-20.png"/> Deepest Message Queues</h2> + <h2><img src="{resource_prefix}/queue-20.png"/> Deepest Message Queues</h2> <div class="iblock">{queues}</div> </div> </td> <td> <div class="fullpageable"> - <h2><img src="resource?name=job-20.png"/> Longest Running Grid Submissions</h2> + <h2><img src="{resource_prefix}/job-20.png"/> Longest Running Grid Submissions</h2> <div class="iblock">{submissions}</div> </div> </td> @@ -39,7 +39,7 @@ <tr> <td> <div class="fullpageable"> - <h2><img src="resource?name=system-20.png"/> Busiest Systems</h2> + <h2><img src="{resource_prefix}/system-20.png"/> Busiest Systems</h2> <div class="iblock">{systems}</div> </div> @@ -66,7 +66,7 @@ [ConfigurationNotice.html] <div class="ConfigurationNotice"> - <h1><img src="resource?name=warning-36.png"/> QMF server not found</h1> + <h1><img src="{resource_prefix}/warning-36.png"/> QMF server not found</h1> <p>This console is not connected to any QMF servers and as a result has no management data to display.</p> Modified: mgmt/trunk/cumin/python/cumin/widgets.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/widgets.strings 2010-10-15 16:39:45 UTC (rev 4389) +++ mgmt/trunk/cumin/python/cumin/widgets.strings 2010-10-15 16:48:35 UTC (rev 4390) @@ -145,7 +145,7 @@ [CuminMainView.html] <div id="head"> - <img id="logo" src="resource?name=mrg-logo-32.png"/> + <img id="logo" src="{resource_prefix}/mrg-logo-32.png"/> <div id="user"> Hi, {user_name} Modified: mgmt/trunk/wooly/python/wooly/__init__.py =================================================================== --- mgmt/trunk/wooly/python/wooly/__init__.py 2010-10-15 16:39:45 UTC (rev 4389) +++ mgmt/trunk/wooly/python/wooly/__init__.py 2010-10-15 16:48:35 UTC (rev 4390) @@ -340,6 +340,9 @@ def render_title(self, session, *args): return None + def render_resource_prefix(self, session, *args): + return self.page.get_resource_prefix(session) + def render_content(self, session, *args): writer = Writer() @@ -447,6 +450,9 @@ def get_cache_control(self, session): return None + def get_resource_prefix(self, session): + return "resource?name=" + def show(self, session): pass