Index: package_branches/invirt-web/cherrypy-rebased/code/main.py
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2673)
+++ package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2674)
@@ -53,4 +53,7 @@
         connect()
         self._cp_config['tools.require_login.on'] = True
+        self._cp_config['tools.mako.imports'] = ['from invirt.config import structs as config',
+                                                 'from invirt import database']
+
 
     @cherrypy.expose
Index: package_branches/invirt-web/cherrypy-rebased/code/templates/list.mako
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/templates/list.mako	(revision 2673)
+++ package_branches/invirt-web/cherrypy-rebased/code/templates/list.mako	(revision 2674)
@@ -2,5 +2,4 @@
 <%inherit file="skeleton.mako" />
 <%!
-	from invirt.config import structs as config
 	import datetime
 %>