Index: /package_branches/invirt-web/cherrypy/code/templates/list.mako
===================================================================
--- /package_branches/invirt-web/cherrypy/code/templates/list.mako	(revision 2404)
+++ /package_branches/invirt-web/cherrypy/code/templates/list.mako	(revision 2405)
@@ -1,2 +1,3 @@
+<%page expression_filter="h"/>
 <%inherit file="skeleton.mako" />
 <%!
@@ -22,38 +23,38 @@
     <input type="hidden" name="back" value="list"/>
       <table>
-	${errorRow('create', err)}
+	${self.fn.errorRow('create', err)}
 	<tr>
 	  <td>Name</td>
 	  <td><input type="text" name="name" value="${defaults.name}"/>.${config.dns.domains[0]}</td>
 	</tr>
-	${errorRow('name', err)}
+	${self.fn.errorRow('name', err)}
 	<tr>
 	  <td>Description</td>
 	  <td><textarea name="description" rows="4" cols="60">${defaults.description}</textarea></td>
 	</tr>
-	${errorRow('description', err)}
+	${self.fn.errorRow('description', err)}
 	<tr>
 	  <td>Memory</td>
 	  <td><input type="text" name="memory" value="${defaults.memory}" size=3/> MiB (${max_memory} max)</td>
 	</tr>
-	${errorRow('memory', err)}
+	${self.fn.errorRow('memory', err)}
 	<tr>
 	  <td>Disk</td>
 	  <td><input type="text" name="disksize" value="${defaults.disk}" size=3/> GiB (${"%0.1f" % (max_disk-0.05)} max)</td>
 	</tr>
-	${errorRow('disk', err)}
+	${self.fn.errorRow('disk', err)}
         <tr>
-          <td>HVM/ParaVM${fn.helppopup('HVM/ParaVM')}</td>
+          <td>HVM/ParaVM${self.fn.helppopup('HVM/ParaVM')}</td>
           <td>
-	  ${vmTypeList(defaults.type)}
+	  ${self.fn.vmTypeList(defaults.type)}
 	  </td>
         </tr>
-	${errorRow('vmtype', err)}
-	${errorRow('autoinstall', err)}
+	${self.fn.errorRow('vmtype', err)}
+	${self.fn.errorRow('autoinstall', err)}
 	<tr>
-	  <td>Autoinstall${fn.helppopup('Autoinstalls')}</td>
+	  <td>Autoinstall${self.fn.helppopup('Autoinstalls')}</td>
 	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto"
                  onchange="\$('cdromlist').value = ''; \$('vmtype-linux').checked = true">
-${autoList(defaults.cdrom, "$('cd_or_auto_auto').checked = true;$('cdromlist').value = '';$('vmtype-linux').checked = true")}
+${self.fn.autoList(defaults.cdrom, "$('cd_or_auto_auto').checked = true;$('cdromlist').value = '';$('vmtype-linux').checked = true")}
 	      (experimental; 2-3 minutes, and you have a machine with empty root password.)
 	  </input>
@@ -63,18 +64,18 @@
 	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked="checked"
                 onchange="\$('autoinstalllist').value = ''; \$('vmtype-linux-hvm').checked = true">
-${cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoinstalllist').value = '';$('vmtype-linux-hvm').checked = true")}
+${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoinstalllist').value = '';$('vmtype-linux-hvm').checked = true")}
 </td>
 	  </input>
 	</tr>
-	${errorRow('cdrom', err)}
-	${errorRow('cdrom', err)}
+	${self.fn.errorRow('cdrom', err)}
+	${self.fn.errorRow('cdrom', err)}
 	<tr>
 	  <td>Owner</td>
 	  <td><input type="text" name="owner" value="${defaults.owner}"/></td>
 	</tr>
-	${errorRow('owner', err)}
+	${self.fn.errorRow('owner', err)}
       </table>
       <input type="submit" class="button" value="Create it!"/><br />
-      Windows notes: ${fn.helppopup('Windows')}
+      Windows notes: ${self.fn.helppopup('Windows')}
     </form>
 % endif
@@ -128,6 +129,6 @@
 	<th>Name</th>
 	<th>Memory</th>
-	<th>Owner${fn.helppopup('Owner')}</th>
-        <th>Administrator${fn.helppopup('Administrator')}</th>
+	<th>Owner${self.fn.helppopup('Owner')}</th>
+        <th>Administrator${self.fn.helppopup('Administrator')}</th>
 	<th>IP</th>
 	<th>Uptime</th>