X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/263010ff23d21486b8f5029cfd8c9bee9a04f3f8..ef93f894aa9ab8d6dccb8a85324d6b2ebc69facf:/code/templates/list.mako
diff --git a/code/templates/list.mako b/code/templates/list.mako
index 71a8943..c3167cb 100644
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -1,7 +1,6 @@
<%page expression_filter="h"/>
<%inherit file="skeleton.mako" />
<%!
- from invirt.config import structs as config
import datetime
%>
@@ -54,19 +53,18 @@ VM List
${self.fn.errorRow('autoinstall', err)}
Autoinstall${self.fn.helppopup('Autoinstalls')} |
-
+ | |
Boot CD |
-
+ | |
-
+
${self.fn.errorRow('cdrom', err)}
${self.fn.errorRow('cdrom', err)}
@@ -85,23 +83,27 @@ ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoin
<%def name="machineRow(machine)">
-
+ % endif
|
- ${machine.name} |
+ ${machine.name} |
${machine.memory}M |
${machine.owner} |
${machine.administrator} |
% if machine.nics:
- ${', '.join(map(lambda x: x.ip, machine.nics))} |
+ ${', '.join(nic.ip for nic in machine.nics)} |
% else:
|
% endif
@@ -112,14 +114,16 @@ ${datetime.timedelta(seconds=int(machine.uptime))}\
\
% if has_vnc[machine] == True:
-Console\
+Console\
+% elif has_vnc[machine] == 'ParaVM':
+ParaVM${self.fn.helppopup("ParaVM Console")}
% elif has_vnc[machine] != 'Off':
${has_vnc[machine]}
% endif
|
- ${machine.description} |
+ ${machine.description|self.fn.module.nl2br} |
%def>
@@ -142,7 +146,7 @@ ${has_vnc[machine]}