Index: package_branches/invirt-web/cherrypy/code/templates/error.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/error.mako	(revision 2485)
+++ package_branches/invirt-web/cherrypy/code/templates/error.mako	(revision 2485)
@@ -0,0 +1,18 @@
+<%page expression_filter="h"/>
+<%inherit file="skeleton.mako" />
+
+<%def name="title()">
+ERROR!
+</%def>
+
+<p>Uh-oh!  We experienced an error.  Sorry about that.  We've gotten
+mail about it.</p>
+
+<p>Feel free to poke us at <tt>xvm@mit.edu</tt> if this bug is
+consistently biting you and we don't seem to be fixing it.</p>
+
+<p>In case you're curious, the gory details are below.</p>
+
+<pre>
+${details}
+</pre>
Index: package_branches/invirt-web/cherrypy/code/templates/error.tmpl
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/error.tmpl	(revision 2484)
+++ 	(revision )
@@ -1,20 +1,0 @@
-#from skeleton import skeleton
-#extends skeleton
-
-#def title
-ERROR!
-#end def
-
-#def body
-<p>Uh-oh!  We experienced an error.  Sorry about that.  We've gotten
-mail about it.</p>
-
-<p>Feel free to poke us at <tt>xvm@mit.edu</tt> if this bug is
-consistently biting you and we don't seem to be fixing it.</p>
-
-<p>In case you're curious, the gory details are below.</p>
-
-<pre>
-$details
-</pre>
-#end def
Index: package_branches/invirt-web/cherrypy/code/templates/error_raw.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/error_raw.mako	(revision 2485)
+++ package_branches/invirt-web/cherrypy/code/templates/error_raw.mako	(revision 2485)
@@ -0,0 +1,12 @@
+Error on operation ${op} for user ${user}: ${errorMessage}
+
+Fields:
+%for f in fields:
+${f}=${fields[f]}
+%endfor
+
+Error output:
+${stderr}\
+---- end error output
+
+${traceback}
Index: package_branches/invirt-web/cherrypy/code/templates/error_raw.tmpl
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/error_raw.tmpl	(revision 2484)
+++ 	(revision )
@@ -1,12 +1,0 @@
-Error on operation $op for user $user: $errorMessage
-
-Fields:
-#for $f in $fields:
-$f=$fields[$f].value
-#end for
-
-Error output:
-$stderr#slurp
----- end error output
-
-$traceback
Index: package_branches/invirt-web/cherrypy/code/templates/invalid.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/invalid.mako	(revision 2485)
+++ package_branches/invirt-web/cherrypy/code/templates/invalid.mako	(revision 2485)
@@ -0,0 +1,16 @@
+<%page expression_filter="h"/>
+<%inherit file="skeleton.mako" />
+
+<%def name="title()">
+Invalid Input
+</%def>
+
+<p>Your input was bad:</p>
+<table>
+<tr><td>Field</td><td>value</td><td>reason</td></tr>
+<tr><td>${err_field}</td><td>${err_value}</td><td>${errorMessage}</td></tr>
+%if stderr:
+<p>Printed to standard error:</p>
+<pre>${stderr}</pre>
+%endif
+</table>
Index: package_branches/invirt-web/cherrypy/code/templates/invalid.tmpl
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/invalid.tmpl	(revision 2484)
+++ 	(revision )
@@ -1,18 +1,0 @@
-#from skeleton import skeleton
-#extends skeleton
-
-#def title
-Invalid Input
-#end def
-
-#def body
-<p>Your input was bad:</p>
-<table>
-<tr><td>operation</td><td>Field</td><td>value</td><td>reason</td></tr>
-<tr><td>$op</td><td>$err_field</td><td>$err_value</td><td>$errorMessage</td></tr>
-#if $stderr
-<p>Printed to standard error:</p>
-<pre>$stderr</pre>
-#end if
-</table>
-#end def