Check quotas against the machine's owner and not the user committing the act

[invirt/packages/invirt-web.git] / templates / list.tmpl

diff --git a/templates/list.tmpl b/templates/list.tmpl
index 95cb96c..19b4c6e 100644 (file)
--- a/templates/list.tmpl
+++ b/templates/list.tmpl
@@ -27,12 +27,12 @@ List of your VMs
 $errorRow('name', $err)
        <tr>
          <td>Memory</td>
 $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>
        </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>
        </tr>
 $errorRow('disk', $err)
        <tr>

@@ -67,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><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>
 #if $machine.nics
 #set $nic = $machine.nics[0]
        <td>$nic.ip</td>

@@ -106,6 +107,7 @@ $has_vnc[$machine]
        <td>Name</td>
        <td>Memory</td>
        <td>Owner</td>
        <td>Name</td>
        <td>Memory</td>
        <td>Owner</td>

+        <td>Administrator</td>

        <td>IP</td>
        <td>Uptime</td>
        <td>VNC</td>
        <td>IP</td>
        <td>Uptime</td>
        <td>VNC</td>