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 249541e..88bab49 100644 (file)
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -3,7 +3,7 @@
 
 
 #def title
 
 
 #def title

-List of your VMs
+VM List

 #end def
 
 #def createTable()
 #end def
 
 #def createTable()

@@ -84,14 +84,12 @@ $errorRow('cdrom', $err)
 <td>#slurp
 #if $machine.uptime
 $machine.uptime#slurp
 <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
 #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>
 $has_vnc[$machine]
 #end if
 </td>

@@ -111,14 +109,15 @@ $has_vnc[$machine]
 #def machineList($machines)
     <table>
       <tr>
 #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
       #for $machine in $machines:
        $machineRow($machine)
       #end for

@@ -127,7 +126,7 @@ $has_vnc[$machine]
 
 
 #def body
 
 
 #def body

-<p style="font-size: 125%;"><strong>Note:</strong> sipb-xen is a very alpha service. <a href="/static/about.html">What does this mean?</a></p>
+<p style="font-size: 125%;">SIPB Virtual Servers is an <strong>alpha service</strong>.  <a href="/static/about.html">What does this mean?</a></p>

 #if not $machines
 <p>You don't currently control any VMs.</p>   
 #else
 #if not $machines
 <p>You don't currently control any VMs.</p>   
 #else