Changeset 2814

Timestamp:

Dec 30, 2009, 3:42:23 PM (14 years ago)

Author:

pweaver

Message:

Moved all code for service messages to unauth.make

Location:

trunk/packages/invirt-web/code

Files:

• main.py (modified) (1 diff)
• templates/unauth.mako (modified) (1 diff)

trunk/packages/invirt-web/code/main.py

@@ -52 +52 @@
     @cherrypy.tools.mako(filename="/unauth.mako")
     def index(self):
-        d = dict(simple=True)
-        if os.path.exists("/etc/invirt/message"):
-            f = open('/etc/invirt/message')
-            d['serviceMessage']= f.read()
-        return d
+        return dict(simple=True)
 
 class InvirtWeb(View):

trunk/packages/invirt-web/code/templates/unauth.mako

@@ -14 +14 @@
 system of your choice</strong>.  The service is <strong>free</strong>
 to any Athena account holder.</p>
-%if serviceMessage:
+
+%if os.path.exists("/etc/invirt/message"):
 <div class="result">
-<p class="error">${serviceMessage}</p>
+<p class="error">${open('/etc/invirt/message').read()}</p>
 </div>
 %endif