X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/87439d01d15f6f56a7065d42beced901d887f8eb..6ad15798ee7d77b36d32ed3ca3a8a10c6cfd0849:/code/templates/list.tmpl?ds=inline

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index 2475542..8310024 100644
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -1,5 +1,6 @@
 #from skeleton import skeleton
 #extends skeleton
+#import datetime
 
 
 #def title
@@ -46,7 +47,7 @@ $errorRow('disk', $err)
         <tr>
           <td>HVM/ParaVM#slurp
 #filter None
-$helppopup('hvm_paravm')#slurp
+$helppopup('HVM/ParaVM')#slurp
 #end filter
 </td>
           <td>
@@ -60,9 +61,13 @@ $errorRow('vmtype', $err)
 #end filter
         <tr>
           <td>Clone image?</td>
+#if $can_clone
           <td><input type="checkbox" name="clone_from" id="clone_from" value="ice3" onchange="onclone(event)"/>
               (experimental; 1-2 minutes, and you have an etch machine; root pw is 'password'.)
               <script type='text/javascript'>function onclone(e){ document.getElementById('cdromlist').value = ''; }</script></td>
+#else
+	  <td><input type="checkbox" name="clone_from" id="clone_from" value="ice3" disabled="disabled"/> Image cloning is currently disabled for maintenance</td>
+#end if
         </tr>
 #filter None
 $errorRow('autoinstall', $err)
@@ -70,7 +75,7 @@ $errorRow('autoinstall', $err)
 	<!--<tr>
 	  <td>Autoinstall#slurp
 #filter None
-$helppopup('autoinstall')#slurp
+$helppopup('Autoinstall')#slurp
 #end filter
 </td>
 	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto">
@@ -118,7 +123,7 @@ $errorRow('cdrom', $err)
 #end if
 <td>#slurp
 #if $machine.uptime
-$machine.uptime#slurp
+${datetime.timedelta(seconds=int(machine.uptime))}#slurp
 #end if
 </td>
 	<td>#slurp
@@ -150,12 +155,12 @@ $has_vnc[$machine]
 	<th>Memory</th>
 	<th>Owner#slurp
 #filter None
-$helppopup('owner')#slurp
+$helppopup('Owner')#slurp
 #end filter
 </th>
         <th>Administrator#slurp
 #filter None
-$helppopup('administrator')#slurp
+$helppopup('Administrator')#slurp
 #end filter
 </th>
 	<th>IP</th>