From 61154617919ca57b6f1d4bed02aa9847ef14232a Mon Sep 17 00:00:00 2001 From: Greg Price Date: Wed, 16 Apr 2008 22:59:48 -0400 Subject: [PATCH] more and better titles * Title with

on VM list * append 'SIPB Virtual Servers' to each title * only write title once per page svn path=/trunk/packages/sipb-xen-www/; revision=422 --- code/templates/command.tmpl | 1 - code/templates/create.tmpl | 1 - code/templates/error.tmpl | 2 -- code/templates/help.tmpl | 1 - code/templates/info.tmpl | 1 - code/templates/invalid.tmpl | 3 +-- code/templates/list.tmpl | 2 +- code/templates/skeleton.tmpl | 5 ++++- code/templates/vnc.tmpl | 1 - 9 files changed, 6 insertions(+), 11 deletions(-) diff --git a/code/templates/command.tmpl b/code/templates/command.tmpl index 4ea55a5..904cba7 100644 --- a/code/templates/command.tmpl +++ b/code/templates/command.tmpl @@ -7,7 +7,6 @@ $command $machine.name #def body -

Command successful

$command ${machine.name} was successful.

#if $command == "Delete VM" or True

Return

diff --git a/code/templates/create.tmpl b/code/templates/create.tmpl index 768f0ed..8123d23 100644 --- a/code/templates/create.tmpl +++ b/code/templates/create.tmpl @@ -6,7 +6,6 @@ Created! #end def #def body -

Created

#if $machine

Congratulations! You have a new machine named ${machine.name}.

#else diff --git a/code/templates/error.tmpl b/code/templates/error.tmpl index 3a53f49..678d36f 100644 --- a/code/templates/error.tmpl +++ b/code/templates/error.tmpl @@ -6,8 +6,6 @@ ERROR! #end def #def body -

ERROR

-

$errorMessage in operation $op. This shouldn't happen! Please email sipb-xen@mit.edu to explain how it happened. Stderr:

$stderr
diff --git a/code/templates/help.tmpl b/code/templates/help.tmpl index 804255a..055f75c 100644 --- a/code/templates/help.tmpl +++ b/code/templates/help.tmpl @@ -12,7 +12,6 @@ Help #def body #if not $simple -

Help

Topics: #for $key in sorted($mapping) $key diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl index 26d7a24..e5eb5eb 100644 --- a/code/templates/info.tmpl +++ b/code/templates/info.tmpl @@ -86,7 +86,6 @@ $errorRow('disk', $err) #end def #def body -

Info

$infoTable()
diff --git a/code/templates/invalid.tmpl b/code/templates/invalid.tmpl index c0d8f77..952e1c3 100644 --- a/code/templates/invalid.tmpl +++ b/code/templates/invalid.tmpl @@ -2,11 +2,10 @@ #extends skeleton #def title -Invalid input +Invalid Input #end def #def body -

Invalid Input

Your input was bad:

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl index 9beb4bb..c5c3e9d 100644 --- a/code/templates/list.tmpl +++ b/code/templates/list.tmpl @@ -3,7 +3,7 @@ #def title -List of your VMs +VM List #end def #def createTable() diff --git a/code/templates/skeleton.tmpl b/code/templates/skeleton.tmpl index c2d2396..f3983ef 100644 --- a/code/templates/skeleton.tmpl +++ b/code/templates/skeleton.tmpl @@ -6,7 +6,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -$title +$title — SIPB Virtual Servers @@ -62,6 +62,9 @@ $result #end if +#if not $varExists('simple') or not $simple +

$title — SIPB Virtual Servers

+#end if $body #if not $varExists('simple') or not $simple
diff --git a/code/templates/vnc.tmpl b/code/templates/vnc.tmpl index 85d7697..a9b8b93 100644 --- a/code/templates/vnc.tmpl +++ b/code/templates/vnc.tmpl @@ -6,7 +6,6 @@ Console to $machine.name #end def #def body -

Console to ${machine.name}

#if not $on

Your machine appears to be off.

#else if not $has_vnc -- 1.7.9.5
operationFieldvaluereason