Index: package_branches/invirt-web/cherrypy/code/templates/info.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/info.mako (revision 2412)
+++ package_branches/invirt-web/cherrypy/code/templates/info.mako (revision 2413)
@@ -22,5 +22,5 @@
on Athena. (more info)
% elif has_vnc:
- Get Console
+ Get Console
% else:
VNC console not enabled; still booting?
Index: package_branches/invirt-web/cherrypy/code/templates/list.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/list.mako (revision 2412)
+++ package_branches/invirt-web/cherrypy/code/templates/list.mako (revision 2413)
@@ -96,5 +96,5 @@
- | ${machine.name} |
+ ${machine.name} |
${machine.memory}M |
${machine.owner} |
@@ -112,5 +112,5 @@
\
% if has_vnc[machine] == True:
-Console\
+Console\
% elif has_vnc[machine] == 'ParaVM':
ParaVM${self.fn.helppopup("ParaVM Console")}
Index: package_branches/invirt-web/cherrypy/code/templates/skeleton.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/skeleton.mako (revision 2412)
+++ package_branches/invirt-web/cherrypy/code/templates/skeleton.mako (revision 2413)
@@ -6,4 +6,5 @@
${self.title()} — XVM
+
@@ -54,6 +55,6 @@
List
% if machine:
-Info
-Console
+Info
+Console
% endif
Help
|