better headings, labels in info page

svn path=/trunk/packages/sipb-xen-www/; revision=430

diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl
index e5eb5eb..f0bc865 100644 (file)
--- a/code/templates/info.tmpl
+++ b/code/templates/info.tmpl
@@ -6,7 +6,7 @@ Info on $machine.name
 #end def
 
 #def infoTable()
 #end def
 
 #def infoTable()

-<p>Info on ${machine.name}:</p>
+<h2>Info</h2>

 <table>
   #for $key, $value in $fields
   <tr><td>$key:</td><td>$value</td></tr>
 <table>
   #for $key, $value in $fields
   <tr><td>$key:</td><td>$value</td></tr>

@@ -20,12 +20,12 @@ Info on $machine.name
   <input type="hidden" name="machine_id" value="$machine.machine_id"/>
   <table>
     
   <input type="hidden" name="machine_id" value="$machine.machine_id"/>
   <table>
     

-    <tr><td>
+    <tr><td colspan=3>

        #if $on
        #if $has_vnc
        #if $on
        #if $has_vnc

-       <a href="vnc?machine_id=$machine.machine_id">Console</a>
+       <strong><a href="vnc?machine_id=$machine.machine_id">Get Console</a></strong>

        #else
        #else

-       VNC is not enabled
+       VNC console not enabled; still booting?

        #end if
        #else
 
        #end if
        #else
 

@@ -33,8 +33,8 @@ Info on $machine.name
     </td></tr>
       <tr>
        #if $on
     </td></tr>
       <tr>
        #if $on

-       <td><input type="submit" class="button" name="action" value="Power off"/></td>
-       <td><input type="submit" class="button" name="action" value="Shutdown"/></td>
+       <td><button type="submit" class="button" name="action" value="Power off">Power off (hard)</button></td>
+       <td><input type="submit" class="button" name="action" value="Shut down"/></td>

        <td><input type="submit" class="button" name="action" value="Reboot"/></td>
        #else
        <td><input type="submit" class="button" name="action" value="Power on"/></td>
        <td><input type="submit" class="button" name="action" value="Reboot"/></td>
        #else
        <td><input type="submit" class="button" name="action" value="Power on"/></td>

@@ -90,11 +90,11 @@ $errorRow('disk', $err)
   $infoTable()
 </div>
 
   $infoTable()
 </div>
 

-<p>Commands:</p>
+<h2>Commands</h2>

 <div id="commands">
   $commands()
 </div>
 <div id="commands">
   $commands()
 </div>

-<p>Change settings:
+<h2>Settings</h2>

 <div id="modify">
   $modifyForm()
 </div>
 <div id="modify">
   $modifyForm()
 </div>