X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/7b924b8f4ec3c62b70a012f7d417beb230db8965..01eed40fb57f037f7811b5f1df831a1a21f28b18:/code/templates/list.tmpl

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index 7d484f3..8d8b8f6 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
@@ -30,6 +31,13 @@ VM List
 $errorRow('name', $err)
 #end filter
 	<tr>
+	  <td>Description</td>
+	  <td><textarea name="description" rows="4" cols="60">$defaults.description</textarea></td>
+	</tr>
+#filter None
+$errorRow('description', $err)
+#end filter
+	<tr>
 	  <td>Memory</td>
 	  <td><input type="text" name="memory" value="$defaults.memory" size=3/> MiB ($max_memory max)</td>
 	</tr>
@@ -38,7 +46,7 @@ $errorRow('memory', $err)
 #end filter
 	<tr>
 	  <td>Disk</td>
-	  <td><input type="text" name="disk" value="$defaults.disk" size=3/> GiB (${"%0.1f" % ($max_disk-0.05)} max)</td>
+	  <td><input type="text" name="disksize" value="$defaults.disk" size=3/> GiB (${"%0.1f" % ($max_disk-0.05)} max)</td>
 	</tr>
 #filter None
 $errorRow('disk', $err)
@@ -46,7 +54,7 @@ $errorRow('disk', $err)
         <tr>
           <td>HVM/ParaVM#slurp
 #filter None
-$helppopup('hvm_paravm')#slurp
+$helppopup('HVM/ParaVM')#slurp
 #end filter
 </td>
           <td>
@@ -58,10 +66,23 @@ $vmTypeList($defaults.type)
 #filter None
 $errorRow('vmtype', $err)
 #end filter
-	<tr>
+        <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)
+#end filter
+	<!--<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">
@@ -70,7 +91,7 @@ $autoList($defaults.cdrom, "document.getElementById('cd_or_auto_auto').checked =
 	      (experimental; 1-2 minutes, and you have a machine; root pw is 'password'.)
 #end filter
 	  </input>
-	</tr>
+	</tr>-->
 	<tr>
 	  <td>Boot CD</td>
 	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked>
@@ -109,7 +130,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
@@ -121,7 +142,7 @@ $has_vnc[$machine]
 #end filter
 #end if
 </td>
-	<td>
+	<td rowspan="2">
 	  <form action="command" method="post">
 	    <input type="hidden" name="back" value="list"/>
 	    <input type="hidden" name="machine_id"
@@ -132,6 +153,9 @@ $has_vnc[$machine]
 	  </form>
 	</td>
       </tr>
+      <tr>
+        <td colspan="7" style="padding-left: 1em; color: #666">$machine.description</td>
+      </tr>
 #end def
 
 #def machineList($machines)
@@ -141,12 +165,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>