Index: package_branches/invirt-web/cherrypy-rebased/code/templates/functions.mako
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/templates/functions.mako (revision 2667)
+++ package_branches/invirt-web/cherrypy-rebased/code/templates/functions.mako (revision 2667)
@@ -0,0 +1,41 @@
+<%page expression_filter="h"/>
+<%def name="databaseList(lst, default, onchange, name, id, valueattr, descattr)">
+
+%def>
+
+<%def name="cdromList(default='', onchange=None)">
+${databaseList(sorted(database.CDROM.query(), key=lambda x: x.description),
+ default, onchange, 'cdrom', 'cdromlist', 'cdrom_id', 'description')|n}
+%def>
+
+<%def name="autoList(default='', onchange=None)">
+${databaseList(sorted(database.Autoinstall.query(), key=lambda x: x.description),
+ default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')|n}
+%def>
+
+<%def name="vmTypeList(default=None)">
+% for vmtype in (('linux-hvm', 'HVM'), ('linux', 'ParaVM'), ):
+
+% endfor
+%def>
+
+<%def name="errorRow(value, err)">
+% if err and err.err_field == value:
+
+${str(err)} |
+
+% endif
+%def>
Index: package_branches/invirt-web/cherrypy-rebased/code/templates/functions.tmpl
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/templates/functions.tmpl (revision 2666)
+++ (revision )
@@ -1,63 +1,0 @@
-#filter WebSafe
-#def databaseList($lst, $default, $onchange, $name, $id, $valueattr, $descattr)
-
-#end def
-
-#def cdromList($default="", $onchange=None)
-#filter None
-$databaseList(sorted($database.CDROM.query(), key=lambda x: x.description),
- default, onchange, 'cdrom', 'cdromlist', 'cdrom_id', 'description')
-#end filter
-#end def
-
-#def autoList($default="", $onchange=None)
-#filter None
-$databaseList(sorted($database.Autoinstall.query(), key=lambda x: x.description),
- default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')
-#end filter
-#end def
-
-#def vmTypeList($default=None)
-#for $vmtype in (('linux-hvm', 'HVM'), ('linux', 'ParaVM'), )
-
-#end for
-#end def
-
-#def addError(txt)
-#if $varExists('txt')
-#set global $error_text = $error_text + '----\n' + $txt
-#else
-#set global $error_text = $txt
-#end if
-#end def
-
-#def errorRow($value, $err)
-#if $err and $err.err_field == $value
-
-${str($err)} |
-
-#end if
-#end def
-#filter None
-$full_body
-#end filter
-#end filter
Index: package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako (revision 2666)
+++ package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako (revision 2667)
@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
+<%namespace name="fn" file="functions.mako" inheritable="True"/>