Autoinstalls

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

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index 7d484f3..a72c558 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
@@ -24,12 +25,19 @@ VM List
 #end filter
        <tr>
          <td>Name</td>
-         <td><input type="text" name="name" value="$defaults.name"/></td>
+         <td><input type="text" name="name" value="$defaults.name"/>.xvm.mit.edu</td>
        </tr>
 #filter None
 $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>
@@ -38,7 +46,7 @@ $errorRow('memory', $err)
 #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)
@@ -46,7 +54,7 @@ $errorRow('disk', $err)
         <tr>
           <td>HVM/ParaVM#slurp
 #filter None
-$helppopup('hvm_paravm')#slurp
+$helppopup('HVM/ParaVM')#slurp
 #end filter
 </td>
           <td>
@@ -58,10 +66,13 @@ $vmTypeList($defaults.type)
 #filter None
 $errorRow('vmtype', $err)
 #end filter
+#filter None
+$errorRow('autoinstall', $err)
+#end filter
        <tr>
          <td>Autoinstall#slurp
 #filter None
-$helppopup('autoinstall')#slurp
+$helppopup('Autoinstall')#slurp
 #end filter
 </td>
          <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto">
@@ -97,6 +108,16 @@ $errorRow('cdrom', $err)
 
 #def machineRow($machine)
       <tr> 
+       <td rowspan="2">
+         <form action="command" method="post">
+           <input type="hidden" name="back" value="list"/>
+           <input type="hidden" name="machine_id"
+                  value="$machine.machine_id"/>
+<input type="submit" class="button" name="action" value="#slurp
+#if $machine.uptime then 'Power off' else 'Power on'
+"/>
+         </form>
+       </td>
        <td><a href="info?machine_id=$machine.machine_id">$machine.name</a></td>
        <td>${machine.memory}M</td>
        <td>$machine.owner</td>
@@ -109,7 +130,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
@@ -121,38 +142,31 @@ $has_vnc[$machine]
 #end filter
 #end if
 </td>
-       <td>
-         <form action="command" method="post">
-           <input type="hidden" name="back" value="list"/>
-           <input type="hidden" name="machine_id"
-                  value="$machine.machine_id"/>
-<input type="submit" class="button" name="action" value="#slurp
-#if $machine.uptime then 'Power off' else 'Power on'
-"/>
-         </form>
-       </td>
+      </tr>
+      <tr>
+        <td colspan="7" style="padding-left: 1em; color: #666">$machine.description</td>
       </tr>
 #end def
 
 #def machineList($machines)
-    <table>
+    <table cellspacing="0" cellpadding="2">
       <tr>
+       <th></th>
        <th>Name</th>
        <th>Memory</th>
        <th>Owner#slurp
 #filter None
-$helppopup('owner')#slurp
+$helppopup('Owner')#slurp
 #end filter
 </th>
         <th>Administrator#slurp
 #filter None
-$helppopup('administrator')#slurp
+$helppopup('Administrator')#slurp
 #end filter
 </th>
        <th>IP</th>
        <th>Uptime</th>
        <th>VNC</th>
-       <th></th>
       </tr>
       #for $machine in $machines:
     #filter None
@@ -160,6 +174,13 @@ $helppopup('administrator')#slurp
     #end filter
       #end for
     </table>
+    <script type="text/javascript" src="/static/stripe.js"></script>
+    <script type="text/javascript">
+        document.observe("dom:loaded", function() {
+            stripe(\$('machinelist').getElementsByTagName('table')[0],
+                   'stripedrow');
+        });
+    </script>
 #end def