Index: openacs-4/packages/theme-selva/www/selva-site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-site-master.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/theme-selva/www/selva-site-master.adp	27 Apr 2006 11:44:28 -0000	1.13
+++ openacs-4/packages/theme-selva/www/selva-site-master.adp	8 Aug 2006 21:27:21 -0000	1.14
@@ -24,15 +24,11 @@
 -->
 </if>
 
-<if @is_logo_url@ not nil> 
-<!-- header (contains logo) -->
-<div id="header">
-<img src="@is_logo_url;noquote@" alt="Logo">
-</div>
-</if>
 <!-- Header -->
-<br>
 <div id="site-header">
+<if @is_logo_url@ not nil> 
+  <img src="@is_logo_url;noquote@" alt="Logo">
+</if>
 
 	#theme-selva.You_are_here#:
 <div id="status">
@@ -60,27 +56,46 @@
 <div id="breadcrumbs">
 <div id="context-bar">
   <if @context_bar@ not nil>
-    <div id="breadcrumbs">@context_bar;noquote@</div>
+    @context_bar;noquote@
   </if>
   <else>
     <if @context:rowcount@ not nil>
           <multiple name="context">
             <if @context.url@ not nil>
-              <a href="@context.url@">@context.label@</a> &#187;
+              <a href="@context.url@">@context.label@</a> :
             </if>
             <else>
               @context.label@
             </else>
           </multiple>
     </if>
   </else>
-  <div id="navlinks">@subnavbar_link;noquote@</div>
-  <div style="clear: both;"></div>
-</div>
 
   </div> <!-- end of breadcrumbs -->
   
+<div id="status">
+<!-- memebers online -->
+<div class="action-list users-online">
+     <a href="@whos_online_url@">@num_users_online@ <if @num_users_online@ eq 1>member</if><else>members</else> #theme-selva.online#</a>
+     <if @untrusted_user_id@ ne 0>
+      | <a href="@logout_url@" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
+    </if>
+    <else>
+      | <a href="/register/">#acs-subsite.Log_In#</a>
+    </else>
+  </div>
 
+<!-- user greeting -->
+<div class="user-greeting">
+    <if @untrusted_user_id@ ne 0>
+      #acs-subsite.Welcome_user#  |
+    </if>
+  </div>
+
+
+</div> <!-- end of status -->
+
+</div>
   
 
 </div>
@@ -100,11 +115,10 @@
 <slave>
 
 <div class="footer">
-    <a href="/doc/theme-selva/">Selva theme theme</a> |
  <a href="http://validator.w3.org/check/referer">XHTML</a>,
  <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>,
  <a href="http://feedvalidator.org/check?url=@url@">RSS</a>,
- <a href="http://www.contentquality.com/mynewtester/cynthia.exe?Url1=@url@" title="Please note that no software can truly test your site for accessibility compliance.">508</a>.
+ <a href="http://www.contentquality.com/mynewtester/cynthia.exe?Url1=@url@" title="#theme-selva.accessibility_note#">508</a>
 </div>
 
 <if @curriculum_bar_p@ true>