X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e73cda9748a8726531dba4b309783dde1597549a..680dea8afeb9fb32974c2db772e0b2861c1af4d8:/code/templates/list.mako

diff --git a/code/templates/list.mako b/code/templates/list.mako
index 176fe14..d513763 100644
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -84,6 +84,9 @@ ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoin
 <%def name="machineRow(machine)">
       <tr> 
 	<td rowspan="2">
+	% if machine.uptime and installing[machine]:
+	<img src="static/power_installing.png" alt="Installing..." />
+	% else:
 	  <form action="machine/${machine.machine_id}/command/${'shutdown' if machine.uptime else 'create'}" method="post">
 	    <input type="hidden" name="back" value="list"/>
 	    <input type="hidden" name="machine_id"
@@ -94,13 +97,14 @@ ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoin
 % endif
 />
 	  </form>
+	  % endif
 	</td>
 	<td><a href="machine/${machine.machine_id}">${machine.name}</a></td>
 	<td>${machine.memory}M</td>
 	<td>${machine.owner}</td>
 	<td>${machine.administrator}</td>
 % if machine.nics:
-	<td>${', '.join(map(lambda x: x.ip, machine.nics))}</td>
+	<td>${', '.join(nic.ip for nic in machine.nics)}</td>
 % else:
 	<td></td>
 % endif