Clear SQL cache on each request.

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

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index 5c6f2c5..8d8b8f6 100644 (file)
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -31,6 +31,13 @@ VM List
 $errorRow('name', $err)
 #end filter
        <tr>
 $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>
          <td>Memory</td>
          <td><input type="text" name="memory" value="$defaults.memory" size=3/> MiB ($max_memory max)</td>
        </tr>

@@ -39,7 +46,7 @@ $errorRow('memory', $err)
 #end filter
        <tr>
          <td>Disk</td>
 #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)
        </tr>
 #filter None
 $errorRow('disk', $err)

@@ -66,7 +73,7 @@ $errorRow('vmtype', $err)
               (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
               (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 maintenence</td>
+         <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
 #end if
         </tr>
 #filter None

@@ -135,7 +142,7 @@ $has_vnc[$machine]
 #end filter
 #end if
 </td>
 #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"
          <form action="command" method="post">
            <input type="hidden" name="back" value="list"/>
            <input type="hidden" name="machine_id"

@@ -146,6 +153,9 @@ $has_vnc[$machine]
          </form>
        </td>
       </tr>
          </form>
        </td>
       </tr>

+      <tr>
+        <td colspan="7" style="padding-left: 1em; color: #666">$machine.description</td>
+      </tr>

 #end def
 
 #def machineList($machines)
 #end def
 
 #def machineList($machines)