projects / invirt/packages/invirt-web.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c8c25d0)
more and better titles
authorGreg Price <price@mit.edu>
Thu, 17 Apr 2008 02:59:48 +0000 (22:59 -0400)
committerGreg Price <price@mit.edu>
Thu, 17 Apr 2008 02:59:48 +0000 (22:59 -0400)
* Title with <h1> 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 patch | blob | history
code/templates/create.tmpl patch | blob | history
code/templates/error.tmpl patch | blob | history
code/templates/help.tmpl patch | blob | history
code/templates/info.tmpl patch | blob | history
code/templates/invalid.tmpl patch | blob | history
code/templates/list.tmpl patch | blob | history
code/templates/skeleton.tmpl patch | blob | history
code/templates/vnc.tmpl patch | blob | history

diff --git a/code/templates/command.tmpl b/code/templates/command.tmpl
index 4ea55a5..904cba7 100644 (file)
--- a/code/templates/command.tmpl
+++ b/code/templates/command.tmpl
@@ -7,7 +7,6 @@ $command $machine.name
 
 
 #def body
 
 
 #def body
-<h1>Command successful</h1>
 <p>$command ${machine.name} was successful.</p>
 #if $command == "Delete VM" or True
 <p><a href="list">Return</a></p>
 <p>$command ${machine.name} was successful.</p>
 #if $command == "Delete VM" or True
 <p><a href="list">Return</a></p>
diff --git a/code/templates/create.tmpl b/code/templates/create.tmpl
index 768f0ed..8123d23 100644 (file)
--- a/code/templates/create.tmpl
+++ b/code/templates/create.tmpl
@@ -6,7 +6,6 @@ Created!
 #end def
 
 #def body
 #end def
 
 #def body
-<h1>Created</h1>
 #if $machine
 <p>Congratulations!  You have a new machine named ${machine.name}.</p>
 #else
 #if $machine
 <p>Congratulations!  You have a new machine named ${machine.name}.</p>
 #else
diff --git a/code/templates/error.tmpl b/code/templates/error.tmpl
index 3a53f49..678d36f 100644 (file)
--- a/code/templates/error.tmpl
+++ b/code/templates/error.tmpl
@@ -6,8 +6,6 @@ ERROR!
 #end def
 
 #def body
 #end def
 
 #def body
-<h1>ERROR</h1>
-
 <p>$errorMessage in operation $op.  This shouldn't happen!  Please
 email sipb-xen@mit.edu to explain how it happened.  Stderr:</p>
 <pre>$stderr</pre>
 <p>$errorMessage in operation $op.  This shouldn't happen!  Please
 email sipb-xen@mit.edu to explain how it happened.  Stderr:</p>
 <pre>$stderr</pre>
diff --git a/code/templates/help.tmpl b/code/templates/help.tmpl
index 804255a..055f75c 100644 (file)
--- a/code/templates/help.tmpl
+++ b/code/templates/help.tmpl
@@ -12,7 +12,6 @@ Help
 
 #def body
 #if not $simple
 
 #def body
 #if not $simple
-<h1>Help</h1>
 <p>Topics: 
 #for $key in sorted($mapping)
 <a href="help?subject=$key">$key</a>
 <p>Topics: 
 #for $key in sorted($mapping)
 <a href="help?subject=$key">$key</a>
diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl
index 26d7a24..e5eb5eb 100644 (file)
--- a/code/templates/info.tmpl
+++ b/code/templates/info.tmpl
@@ -86,7 +86,6 @@ $errorRow('disk', $err)
 #end def
 
 #def body
 #end def
 
 #def body
-<h1>Info</h1>
 <div id="info">
   $infoTable()
 </div>
 <div id="info">
   $infoTable()
 </div>
diff --git a/code/templates/invalid.tmpl b/code/templates/invalid.tmpl
index c0d8f77..952e1c3 100644 (file)
--- a/code/templates/invalid.tmpl
+++ b/code/templates/invalid.tmpl
@@ -2,11 +2,10 @@
 #extends skeleton
 
 #def title
 #extends skeleton
 
 #def title
-Invalid input
+Invalid Input
 #end def
 
 #def body
 #end def
 
 #def body
-<h1>Invalid Input</h1>
 <p>Your input was bad:</p>
 <table>
 <tr><td>operation</td><td>Field</td><td>value</td><td>reason</td></tr>
 <p>Your input was bad:</p>
 <table>
 <tr><td>operation</td><td>Field</td><td>value</td><td>reason</td></tr>
diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index 9beb4bb..c5c3e9d 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()
diff --git a/code/templates/skeleton.tmpl b/code/templates/skeleton.tmpl
index c2d2396..f3983ef 100644 (file)
--- 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">
 <html>
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
-<head><title>$title</title>
+<head><title>$title &mdash; SIPB Virtual Servers</title>
   <link href="static/favicon.ico" type="image/x-icon" rel="shortcut icon">
   <link rel="stylesheet" href="static/style.css" type="text/css" />
   <link rel="stylesheet" href="static/layout.css" type="text/css" media="screen" />
   <link href="static/favicon.ico" type="image/x-icon" rel="shortcut icon">
   <link rel="stylesheet" href="static/style.css" type="text/css" />
   <link rel="stylesheet" href="static/layout.css" type="text/css" media="screen" />
@@ -62,6 +62,9 @@ $result
 #end if
 </div>
 
 #end if
 </div>
 
+#if not $varExists('simple') or not $simple
+<h1>$title &mdash; SIPB Virtual Servers</h1>
+#end if
 $body
 #if not $varExists('simple') or not $simple
 <hr />
 $body
 #if not $varExists('simple') or not $simple
 <hr />
diff --git a/code/templates/vnc.tmpl b/code/templates/vnc.tmpl
index 85d7697..a9b8b93 100644 (file)
--- a/code/templates/vnc.tmpl
+++ b/code/templates/vnc.tmpl
@@ -6,7 +6,6 @@ Console to $machine.name
 #end def
 
 #def body
 #end def
 
 #def body
-<h1>Console to ${machine.name}</h1>
 #if not $on
 <p> Your machine appears to be off.</p>
 #else if not $has_vnc
 #if not $on
 <p> Your machine appears to be off.</p>
 #else if not $has_vnc
Unnamed repository; edit this file 'description' to name the repository.