projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better sectioning in list page
[invirt/packages/invirt-web.git]
/
code
/
templates
/
list.tmpl
diff --git
a/code/templates/list.tmpl
b/code/templates/list.tmpl
index
249541e
..
dc4ad47
100644
(file)
--- a/
code/templates/list.tmpl
+++ b/
code/templates/list.tmpl
@@
-3,14
+3,14
@@
#def title
#def title
-List of your VMs
+VM List
#end def
#end def
-#def createTable()
+#def createForm()
#if $cant_add_vm
<p>$cant_add_vm</p>
#else
#if $cant_add_vm
<p>$cant_add_vm</p>
#else
-<p>Create a new VM:</p>
+<h2>Create a new VM</h2>
#if $err
<p class="error">We had a problem with your request:</p>
#else if $varExists('new_machine')
#if $err
<p class="error">We had a problem with your request:</p>
#else if $varExists('new_machine')
@@
-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,17
+126,13
@@
$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>
#if not $machines
<p>You don't currently control any VMs.</p>
-#else
- <p>You have the following VMs:</p>
#end if
<p><a href="list">refresh</a></p>
<div id="machinelist">
$machineList($machines)
</div>
#end if
<p><a href="list">refresh</a></p>
<div id="machinelist">
$machineList($machines)
</div>
-<div id="createtable">
-$createTable()
-</div>
+$createForm()
#end def
#end def