X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/61154617919ca57b6f1d4bed02aa9847ef14232a..b812ecb815635726dca92b6c3725ac0a4bb86ab6:/code/templates/list.tmpl

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index c5c3e9d..71f36ea 100644
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -6,11 +6,11 @@
 VM List
 #end def
 
-#def createTable()
+#def createForm()
 #if $cant_add_vm
 <p>$cant_add_vm</p>
 #else
-<p>Create a new VM:</p>
+<h2>Create a new VM</h2>
 #if $err
 <p class="error">We had a problem with your request:</p>
 #else if $varExists('new_machine')
@@ -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>
@@ -84,14 +79,12 @@ $errorRow('cdrom', $err)
 <td>#slurp
 #if $machine.uptime
 $machine.uptime#slurp
-#else
-Off#slurp
 #end if
 </td>
 	<td>#slurp
 #if $has_vnc[$machine] == True
 <a href="vnc?machine_id=$machine.machine_id">Console</a>#slurp
-#else
+#else if $has_vnc[$machine] != 'Off'
 $has_vnc[$machine]
 #end if
 </td>
@@ -111,14 +104,15 @@ $has_vnc[$machine]
 #def machineList($machines)
     <table>
       <tr>
-	<td>Name</td>
-	<td>Memory</td>
-	<td>Owner</td>
-        <td>Administrator</td>
-	<td>IP</td>
-	<td>Uptime</td>
-	<td>VNC</td>
-	<td></td>
+	<th>Name</th>
+	<th>Memory</th>
+	<th>Owner$helppopup('owner')</th>
+        <th>Administrator$helppopup('administrator')</th>
+	<th>IP</th>
+	<th>Uptime</th>
+	<th>VNC</th>
+	<th></th>
+      </tr>
       #for $machine in $machines:
 	$machineRow($machine)
       #end for
@@ -127,17 +121,13 @@ $has_vnc[$machine]
 
 
 #def body
-<p style="font-size: 125%;"><strong>Note:</strong> SIPB Virtual Servers is a very alpha service. <a href="/static/about.html">What does this mean?</a></p>
+<p style="font-size: 125%;">SIPB Virtual Servers is an <strong>alpha service</strong>.  <a href="/static/about.html">What does this mean?</a></p>
 #if not $machines
 <p>You don't currently control any VMs.</p>   
-#else
-    <p>You have the following VMs:</p>
 #end if
     <p><a href="list">refresh</a></p>
     <div id="machinelist">
     $machineList($machines)
     </div>
-<div id="createtable">
-$createTable()
-</div>
+$createForm()
 #end def