Index: /package_branches/invirt-web/cherrypy-rebased/code/auth.fcgi
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/auth.fcgi	(revision 2729)
+++ /package_branches/invirt-web/cherrypy-rebased/code/auth.fcgi	(revision 2730)
@@ -36,9 +36,4 @@
             'tools.invirtwebstate.on': True,
             },
-        '/static': {
-            'tools.staticdir.root': static_dir,
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': static_dir,
-            }
         }
                     
Index: /package_branches/invirt-web/cherrypy-rebased/code/main.py
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2729)
+++ /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2730)
@@ -7,4 +7,5 @@
 import datetime
 import hmac
+import os
 import random
 import sha
@@ -38,5 +39,14 @@
 from view import View, revertStandardError
 
+
+static_dir = os.path.join(os.path.dirname(__file__), 'static')
+InvirtStatic = cherrypy.tools.staticdir.handler(
+    root=static_dir,
+    dir=static_dir,
+    section='/static')
+
 class InvirtUnauthWeb(View):
+    static = InvirtStatic
+
     @cherrypy.expose
     @cherrypy.tools.mako(filename="/unauth.mako")
@@ -53,4 +63,6 @@
                                                  'from invirt import database']
         self._cp_config['request.error_response'] = self.handle_error
+
+    static = InvirtStatic
 
     @cherrypy.expose
Index: /package_branches/invirt-web/cherrypy-rebased/code/unauth.fcgi
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/unauth.fcgi	(revision 2729)
+++ /package_branches/invirt-web/cherrypy-rebased/code/unauth.fcgi	(revision 2730)
@@ -36,9 +36,4 @@
             'tools.invirtwebstate.on': True,
             },
-        '/static': {
-            'tools.staticdir.root': static_dir,
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': static_dir,
-            }
         }