Style logged-in message.

Moved to upper right, name in bold.

Also fixed a bug where a tag went unmatched when 'simple' is true.

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

diff --git a/code/static/style.css b/code/static/style.css
index 3b713ec..cf11700 100644 (file)
--- a/code/static/style.css
+++ b/code/static/style.css
@@ -64,3 +64,11 @@ td.error {
   display: inline;
   padding: .2em;
 }
   display: inline;
   padding: .2em;
 }

+
+/* Logged-in welcome message. */
+.loggedin {
+  float: right;
+}
+.loggedin .name {
+  font-weight: bold;
+}

diff --git a/code/templates/skeleton.tmpl b/code/templates/skeleton.tmpl
index 99962db..4e3e51a 100644 (file)
--- a/code/templates/skeleton.tmpl
+++ b/code/templates/skeleton.tmpl
@@ -44,7 +44,7 @@ function helppopup(name){
 </div>
 
 #if not $varExists('simple') or not $simple
 </div>
 
 #if not $varExists('simple') or not $simple

-<p>[You are logged in as $user.]</p>
+<p class="loggedin">Welcome, <span class="name">$user</span>.</p>

 
 <ul class="navigation">
 <li><a href="list">List</a></li>
 
 <ul class="navigation">
 <li><a href="list">List</a></li>

@@ -53,8 +53,8 @@ function helppopup(name){
 <li><a href="vnc?machine_id=$machine.machine_id">Console</a></li>
 #end if
 <li><a href="help">Help</a></ul></li>
 <li><a href="vnc?machine_id=$machine.machine_id">Console</a></li>
 #end if
 <li><a href="help">Help</a></ul></li>

-#end if

 </ul>
 </ul>

+#end if

 
 <div id="result" class="result">
 #if $varExists('result')
 
 <div id="result" class="result">
 #if $varExists('result')