improve display of VM list

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

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index ae0d564..88bab49 100644 (file)
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -84,14 +84,12 @@ $errorRow('cdrom', $err)
 <td>#slurp
 #if $machine.uptime
 $machine.uptime#slurp
-#else
-Off#slurp
 #end if
 </td>
        <td>#slurp
 #if $has_vnc[$machine] == True
 <a href="vnc?machine_id=$machine.machine_id">Console</a>#slurp
-#else
+#else if $has_vnc[$machine] != 'Off'
 $has_vnc[$machine]
 #end if
 </td>
@@ -111,14 +109,15 @@ $has_vnc[$machine]
 #def machineList($machines)
     <table>
       <tr>
-       <td>Name</td>
-       <td>Memory</td>
-       <td>Owner</td>
-        <td>Administrator</td>
-       <td>IP</td>
-       <td>Uptime</td>
-       <td>VNC</td>
-       <td></td>
+       <th>Name</th>
+       <th>Memory</th>
+       <th>Owner</th>
+        <th>Administrator</th>
+       <th>IP</th>
+       <th>Uptime</th>
+       <th>VNC</th>
+       <th></th>
+      </tr>
       #for $machine in $machines:
        $machineRow($machine)
       #end for