Index: package_branches/invirt-web/cherrypy/code/templates/vnc.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/vnc.mako	(revision 2414)
+++ package_branches/invirt-web/cherrypy/code/templates/vnc.mako	(revision 2414)
@@ -0,0 +1,24 @@
+<%page expression_filter="h" />
+<%inherit file="skeleton.mako" />
+
+<%def name="title()">
+Console to ${machine.name}
+</%def>
+
+<style type='text/css'>body { max-width: none }</style>
+% if not on:
+<p> Your machine appears to be off.</p>
+% elif not has_vnc:
+<p> Your machine appears to not be accepting VNC connections. Perhaps you have a ParaVM machine?</p>
+% endif
+
+<p>See <a href="help?subject=Console" target="_blank">tips</a> about framebuffer and other issues.</p>
+<applet code="VncViewer.class" archive="https://${hostname}:446/static/VncViewer.jar"
+        width="100%" height="1000">
+<param name="PASSWORD" value="moocow">
+<param name="PORT" value="${port}">
+<param name="HOST" value="${hostname}">
+<param name="VMNAME" value="${machine.name}">
+<param name="AUTHTOKEN" value="${authtoken}">
+<param name="SocketFactory" value="VNCProxyConnectSocketFactory">
+</applet>
Index: package_branches/invirt-web/cherrypy/code/templates/vnc.tmpl
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/vnc.tmpl	(revision 2413)
+++ 	(revision )
@@ -1,25 +1,0 @@
-#from skeleton import skeleton
-#extends skeleton
-
-#def title
-Console to $machine.name
-#end def
-
-#def body
-<style type='text/css'>body { max-width: none }</style>
-#if not $on
-<p> Your machine appears to be off.</p>
-#else if not $has_vnc
-<p> Your machine appears to not be accepting VNC connections. Perhaps you have a ParaVM machine?</p>
-#end if
-<p>See <a href="help?subject=Console" target="_blank">tips</a> about framebuffer and other issues.</p>
-<APPLET CODE="VncViewer.class" ARCHIVE="https://$hostname:446/static/VncViewer.jar"
-        WIDTH="100%" HEIGHT="1000">
-<PARAM NAME="PASSWORD" VALUE="moocow">
-<PARAM NAME="PORT" VALUE="$port">
-<PARAM NAME="HOST" VALUE="$hostname">
-<PARAM NAME="VMNAME" VALUE="$machine.name">
-<PARAM NAME="AUTHTOKEN" VALUE="$authtoken">
-<PARAM NAME="SocketFactory" VALUE="VNCProxyConnectSocketFactory">
-</APPLET>
-#end def