X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/c3226455f0fd065757b681e2be52e8d8c2362ff8..4663602deda7a8c90d59c8d3a57cd5a3945d73ca:/templates/list.tmpl?ds=inline

diff --git a/templates/list.tmpl b/templates/list.tmpl
index 67cefdc..19b4c6e 100644
--- a/templates/list.tmpl
+++ b/templates/list.tmpl
@@ -27,12 +27,12 @@ List of your VMs
 $errorRow('name', $err)
 	<tr>
 	  <td>Memory</td>
-	  <td><input type="text" name="memory" value="$defaults.memory" size=3/> megabytes ($max_memory max)</td>
+	  <td><input type="text" name="memory" value="$defaults.memory" size=3/> MiB ($max_memory max)</td>
 	</tr>
 $errorRow('memory', $err)
 	<tr>
 	  <td>Disk</td>
-	  <td><input type="text" name="disk" value="$defaults.disk" size=3/> gigabytes (${"%0.1f" % ($max_disk-0.05)} max)</td>
+	  <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>
@@ -51,6 +51,11 @@ $errorRow('vmtype', $err)
 	  <td>$cdromList($cdroms, $defaults.cdrom)</td>
 	</tr>
 $errorRow('cdrom', $err)
+	<tr>
+	  <td>Owner</td>
+	  <td><input type="text" name="owner" value="$defaults.owner"/></td>
+	</tr>
+	$errorRow('owner', $err)
       </table>
       <input type="submit" class="button" value="Create it!"/>
     </form>
@@ -62,6 +67,7 @@ $errorRow('cdrom', $err)
 	<td><a href="info?machine_id=$machine.machine_id">$machine.name</a></td>
 	<td>${machine.memory}M</td>
 	<td>$machine.owner</td>
+	<td>$machine.administrator</td>
 #if $machine.nics
 #set $nic = $machine.nics[0]
 	<td>$nic.ip</td>
@@ -88,7 +94,7 @@ $has_vnc[$machine]
 	    <input type="hidden" name="machine_id"
 		   value="$machine.machine_id"/>
 <input type="submit" class="button" name="action" value="#slurp
-#if $machine.uptime then 'Shutdown' else 'Power on'
+#if $machine.uptime then 'Power off' else 'Power on'
 "/>
 	  </form>
 	</td>
@@ -100,7 +106,8 @@ $has_vnc[$machine]
       <tr>
 	<td>Name</td>
 	<td>Memory</td>
-	<td>owner</td>
+	<td>Owner</td>
+        <td>Administrator</td>
 	<td>IP</td>
 	<td>Uptime</td>
 	<td>VNC</td>