Use joins, new xmlist.py

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

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index 7d484f3..f6c9a09 100644 (file)
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -1,5 +1,6 @@
 #from skeleton import skeleton
 #extends skeleton
+#import datetime
 
 
 #def title
@@ -58,7 +59,16 @@ $vmTypeList($defaults.type)
 #filter None
 $errorRow('vmtype', $err)
 #end filter
-       <tr>
+        <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>
+#filter None
+$errorRow('autoinstall', $err)
+#end filter
+       <!--<tr>
          <td>Autoinstall#slurp
 #filter None
 $helppopup('autoinstall')#slurp
@@ -70,7 +80,7 @@ $autoList($defaults.cdrom, "document.getElementById('cd_or_auto_auto').checked =
              (experimental; 1-2 minutes, and you have a machine; root pw is 'password'.)
 #end filter
          </input>
-       </tr>
+       </tr>-->
        <tr>
          <td>Boot CD</td>
          <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked>
@@ -109,7 +119,7 @@ $errorRow('cdrom', $err)
 #end if
 <td>#slurp
 #if $machine.uptime
-$machine.uptime#slurp
+${datetime.timedelta(seconds=int(machine.uptime))}#slurp
 #end if
 </td>
        <td>#slurp