X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/27dcf25cbe250f43ea32fc9bc7a4ec6691db66e9..b199b35d4ebd48b3cc000af1a56ec21c89676b88:/code/templates/list.mako?ds=sidebyside

diff --git a/code/templates/list.mako b/code/templates/list.mako
index b03a04f..7b1fd92 100644
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -84,18 +84,22 @@ ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoin
 <%def name="machineRow(machine)">
       <tr> 
 	<td rowspan="2">
-	  <form action="command" method="post">
+	% 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"
 		   value="${machine.machine_id}"/>
-<input type="submit" class="power ${'on' if machine.uptime else 'off'}" name="action" value="${'Power off' if machine.uptime else 'Power on'}"\
+<input type="submit" class="power ${'on' if machine.uptime else 'off'}" name="action" value="${'Shutdown' if machine.uptime else 'Power on'}"\
 % if machine.uptime:
  onclick="return confirm('Are you sure you want to power off this VM?');"
 % endif
 />
 	  </form>
+	  % endif
 	</td>
-	<td><a href="info?machine_id=${machine.machine_id}">${machine.name}</a></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>
@@ -111,14 +115,16 @@ ${datetime.timedelta(seconds=int(machine.uptime))}\
 </td>
 	<td>\
 % if has_vnc[machine] == True:
-<a href="vnc?machine_id=${machine.machine_id}">Console</a>\
+<a href="machine/${machine.machine_id}/vnc">Console</a>\
+% elif has_vnc[machine] == 'ParaVM':
+ParaVM${self.fn.helppopup("ParaVM Console")}
 % elif has_vnc[machine] != 'Off':
 ${has_vnc[machine]}
 % endif
 </td>
       </tr>
       <tr>
-        <td colspan="7" style="padding-left: 1em; color: #666">${machine.description}</td>
+        <td colspan="7" style="padding-left: 1em; color: #666">${machine.description|self.fn.module.nl2br}</td>
       </tr>
 </%def>