X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/263010ff23d21486b8f5029cfd8c9bee9a04f3f8..bd07973cb4926fa3418a3e44d539c379f3e5a85d:/code/templates/list.mako

diff --git a/code/templates/list.mako b/code/templates/list.mako
index 71a8943..288e44f 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
 %>
 
@@ -55,7 +54,7 @@ VM List
 	<tr>
 	  <td>Autoinstall${self.fn.helppopup('Autoinstalls')}</td>
 	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto"
-                 onchange="\$('cdromlist').value = ''; \$('vmtype-linux').checked = true">
+                 onchange="$('cdromlist').value = ''; $('vmtype-linux').checked = true">
 ${self.fn.autoList(defaults.cdrom, "$('cd_or_auto_auto').checked = true;$('cdromlist').value = '';$('vmtype-linux').checked = true")}
 	      (experimental; 2-3 minutes, and you have a machine with empty root password.)
 	  </input>
@@ -63,7 +62,7 @@ ${self.fn.autoList(defaults.cdrom, "$('cd_or_auto_auto').checked = true;$('cdrom
 	<tr>
 	  <td>Boot CD</td>
 	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked="checked"
-                onchange="\$('autoinstalllist').value = ''; \$('vmtype-linux-hvm').checked = true">
+                onchange="$('autoinstalllist').value = ''; $('vmtype-linux-hvm').checked = true">
 ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoinstalllist').value = '';$('vmtype-linux-hvm').checked = true")}
 </td>
 	  </input>
@@ -85,23 +84,27 @@ ${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>
 % 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
@@ -112,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>
 
@@ -142,7 +147,7 @@ ${has_vnc[machine]}
     <script type="text/javascript" src="/static/stripe.js"></script>
     <script type="text/javascript">
         document.observe("dom:loaded", function() {
-            stripe(\$('machinelist').getElementsByTagName('table')[0],
+            stripe($('machinelist').getElementsByTagName('table')[0],
                    'stripedrow');
         });
     </script>