Index: openacs-4/packages/theme-selva/www/selva-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-master.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/theme-selva/www/selva-master.tcl	26 Jul 2005 14:28:29 -0000	1.1
+++ openacs-4/packages/theme-selva/www/selva-master.tcl	26 Jul 2005 15:52:53 -0000	1.2
@@ -314,6 +314,7 @@
     set extra_spaces "<img src=\"/resources/dotlrn/spacer.gif\" border=0 width=15>"    
     #set subnavbar [selva::portal_navbar]
     if {$in_dotlrn_p == 1} {
+	set navbar "<ul>"
 	set navbar [selva::portal_navbar \
 			-user_id $user_id \
 			-link_control_panel $link_control_panel \
@@ -322,6 +323,13 @@
 			-post_html $extra_spaces \
 			-link_all $link_all
 		   ]
+	if {[exists_and_not_null navbar_list]} {
+	    append navbar "<li> --- </li>"
+	    foreach navbar_item $navbar_list {
+		append navbar "<li><a href=\"[lindex $navbar_item 0]\">[lindex $navbar_item 1]</a></li>"
+	    }
+	}
+	append navbar "</ul>"
     } else {
 	set navbar ""
 	if {[exists_and_not_null navbar_list]} {
@@ -338,11 +346,26 @@
     if {[exists_and_not_null community_id]} {
 	append subnavbar "<li><a href=\"\"><b>[dotlrn_community::get_community_name $community_id]</b></a></li>"
     } 
+    set untrusted_user_id [ad_conn untrusted_user_id]
+    if { $untrusted_user_id != 0 } {
+	set logout_url [ad_get_logout_url]
+    } else {
+	set login_url [ad_get_login_url -return]
+    }
+
     append subnavbar "	<li><a href=\"/dotlrn/\">My Workspace</a></li>
     <li><a href=\"/contacts\">Contacts</a></li>
 	<li><a href=\"/pvt/home\">Preferences</a></li>
 	<li><a href=\"/dotlrn/control-panel\">Control Panel</a></li>
-</ul>"
+"
+
+    set system_name [ad_system_name]
+    if {[exists_and_not_null logout_url]} {
+        append subnavbar "<li><a href=\"$logout_url\" title=\"#acs-subsite.Logout_from_system#\">#acs-subsite.Logout#</a></li>"
+    } else {
+        append subnavbar "<li><a href=\"$login_url\" title=\"#acs-subsite.Log_in_to_system#\">#acs-subsite.Log_In#</a></li>"
+    }
+    append subnavbar "</ul>"
     
 } else {
     set navbar " "
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.1 -r1.2
--- openacs-4/packages/theme-selva/www/selva-site-master.adp	26 Jul 2005 14:28:29 -0000	1.1
+++ openacs-4/packages/theme-selva/www/selva-site-master.adp	26 Jul 2005 15:52:53 -0000	1.2
@@ -1,123 +1,88 @@
-<master src="/www/blank-master">
-  <if @title@ not nil>
-    <property name="title">@title;noquote@</property>
-  </if>
-  <if @signatory@ not nil>
-    <property name="signatory">@signatory;noquote@</property>
-  </if>
-  <if @focus@ not nil>
-    <property name="focus">@focus;noquote@</property>
-  </if>
-  <property name="header_stuff">
-    <link rel="shortcut icon" href="/resources/theme-selva/Selva/default/images/myicon.ico">
+<master src="/www/blank-master" />
+<if @title@ not nil>
+  <property name="title">@title;noquote@</property>
+</if>
+<if @signatory@ not nil>
+  <property name="signatory">@signatory;noquote@</property>
+</if>
+<if @focus@ not nil>
+  <property name="focus">@focus;noquote@</property>
+</if>
+<property name="header_stuff">
+  <link rel="shortcut icon" href="/resources/theme-selva/Selva/default/images/myicon.ico">
     <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
-    
-    @header_stuff;noquote@
+      @header_stuff;noquote@
   </property>
-
-  
 <div id="wrapper">
-  
-<!-- header (contains logo) -->
-<div id="header">
-<img src="/resources/theme-selva/Selva/default/images/logo.gif">
-</div>
-<!-- Header -->
-
-<div id="site-header">
-
-<div id="breadcrumbs">
-<!-- displays "you are here" -->  
-<div id="context-bar">
-  <if @context_bar@ not nil>
-    <div id="breadcrumbs">@context_bar;noquote@</div>
-  </if>
-  <else>
-    <if @context:rowcount@ not nil>
-          <multiple name="context">
-            <if @context.url@ not nil>
-              <a href="@context.url@">@context.label@</a> &#187;
-            </if>
-            <else>
-              @context.label@
-            </else>
-          </multiple>
-    </if>
-  </else>
-  <div id="navlinks">@subnavbar_link;noquote@</div>
-  <div style="clear: both;"></div>
-</div>
-
-<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> online</a>
+  <!-- header (contains logo) -->
+  <div id="header">
+    <img src="/resources/theme-selva/Selva/default/images/logo.gif" />
   </div>
-
-<!-- small menu -->
-  <div class="action-list permanent-navigation">
-      <if @admin_url@ not nil>
-        <a href="@admin_url@" title="#acs-subsite.Site_wide_administration#">#acs-subsite.Admin#</a>
-      </if>
-      <if @pvt_home_url@ not nil>
-        <a href="@pvt_home_url@" title="#acs-subsite.Change_pass_email_por#">@pvt_home_name@</a>
-      </if>
-      <if @login_url@ not nil>
-        <a href="@login_url@" title="#acs-subsite.Log_in_to_system#">#acs-subsite.Log_In#</a>
-      </if>
-      <if @logout_url@ not nil>
-        <a href="@logout_url@" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
-      </if>
+  <!-- Header -->
+  <div id="site-header">
+    <div id="breadcrumbs">
+      <!-- displays "you are here" -->
+      <div id="context-bar">
+	<if @context_bar@ not nil>
+	  <div id="breadcrumbs">@context_bar;noquote@</div>
+	</if>
+	<else>
+	  <if @context:rowcount@ not nil>
+	    <multiple name="context">
+	      <if @context.url@ not nil>
+		<a href="@context.url@">@context.label@</a> &#187;
+	      </if>
+	      <else>
+		@context.label@
+	      </else>
+	    </multiple>
+	  </if>
+	</else>
+	<div id="navlinks">@subnavbar_link;noquote@</div>
+	<div style="clear: both;">
+	</div>
+      </div>
+      <!-- user greeting -->
+      <div class="user-greeting">
+	<if @untrusted_user_id@ ne 0>
+	  #acs-subsite.Welcome_user#
+	</if>
+	<else>
+	  #acs-subsite.Not_logged_in#
+	</else>
+      </div>
+    </div>
+    <!-- end of status -->
   </div>
-
-<!-- user greeting -->
-<div class="user-greeting">
-    <if @untrusted_user_id@ ne 0>
-      #acs-subsite.Welcome_user#
-    </if>
-    <else>
-      #acs-subsite.Not_logged_in#
-    </else>
-  </div>
-
-
-</div> <!-- end of status -->
-  </div> <!-- end of breadcrumbs -->
-  
-
-  
-
+  <!-- end of breadcrumbs -->
 </div>
-
 <if @user_messages:rowcount@ gt 0>
   <div id="user-message">
     <ul>
       <multiple name="user_messages">
-        <li>@user_messages.message;noquote@</li>
+	<li>@user_messages.message;noquote@</li>
       </multiple>
     </ul>
   </div>
 </if>
-
-
-
 <slave>
-
-<div id="footer">
-  <div class="action-list">
+  <div id="footer">
+    <div class="action-list">
       <if @num_of_locales@ gt 1>
-        <a href="@change_locale_url@">#acs-subsite.Change_locale_label#</a>
+	<a href="@change_locale_url@">#acs-subsite.Change_locale_label#</a>
       </if>
       <else>
-        <if @locale_admin_url@ not nil>
-          <a href="@locale_admin_url@">Install locales</a>
-        </if>
+	<if @locale_admin_url@ not nil>
+	  <a href="@locale_admin_url@">Install locales</a>
+	</if>
       </else>
-    <a href="/doc/theme-selva/">Documentation on this theme</a>
+      <a href="/doc/theme-selva/">Documentation on this theme</a>
+    </div>
   </div>
+  <if @curriculum_bar_p@ true>
+    <p>
+      <include
+	src="/packages/curriculum/lib/bar" />
+  </if>
 </div>
-
-<if @curriculum_bar_p@ true>
-  <p><include src="/packages/curriculum/lib/bar" />
-</if>
-</div> <!-- end of wrapper -->
\ No newline at end of file
+  <!-- end of wrapper -->
\ No newline at end of file