X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/59b8dc4f1f1a59dc8318ca65569101df73a6ef13..0db5d84820273e5e6e202450d873acc133e4cf59:/code/templates/list.tmpl

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index dc4ad47..71f36ea 100644
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -35,28 +35,23 @@ $errorRow('memory', $err)
 	  <td><input type="text" name="disk" value="$defaults.disk" size=3/> GiB (${"%0.1f" % ($max_disk-0.05)} max)</td>
 	</tr>
 $errorRow('disk', $err)
+        <tr>
+          <td>HVM/ParaVM$helppopup('hvm_paravm')</td>
+          <td>$vmTypeList($defaults.type)</td>
+        </tr>
+$errorRow('vmtype', $err)
 	<tr>
-	  <td>HVM/ParaVM$helppopup('hvm_paravm')</td>
-	  <td>
-#for $value, $name in (('hvm', 'HVM'), ('paravm', 'ParaVM'))
-   <input #slurp
-#if $defaults.vmtype == $value then 'checked' else ''
- type="radio" name="vmtype" value="$value">$name</input>
-#end for
-	  </td>
+	  <td>Autoinstall$helppopup('autoinstall')</td>
+	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto">$autoList($defaults.cdrom, "document.getElementById('cd_or_auto_auto').checked = true;document.getElementById('cdromlist').value = ''")
+	      (experimental; 1-2 minutes, and you have a machine; root pw is 'password'.)
+	  </input>
 	</tr>
-$errorRow('vmtype', $err)
 	<tr>
 	  <td>Boot CD</td>
-	  <td>$cdromList($cdroms, $defaults.cdrom)</td>
+	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked>$cdromList($defaults.cdrom, "document.getElementById('cd_or_auto_cd').checked = true;document.getElementById('autoinstalllist').value = ''")</td>
+	  </input>
 	</tr>
 $errorRow('cdrom', $err)
-	<tr>
-	  <td>Clone image?</td>
-	  <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>
-	</tr>
 $errorRow('cdrom', $err)
 	<tr>
 	  <td>Owner</td>
@@ -111,8 +106,8 @@ $has_vnc[$machine]
       <tr>
 	<th>Name</th>
 	<th>Memory</th>
-	<th>Owner</th>
-        <th>Administrator</th>
+	<th>Owner$helppopup('owner')</th>
+        <th>Administrator$helppopup('administrator')</th>
 	<th>IP</th>
 	<th>Uptime</th>
 	<th>VNC</th>