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.5 -r1.6
--- openacs-4/packages/theme-selva/www/selva-master.tcl	27 Jul 2005 20:10:03 -0000	1.5
+++ openacs-4/packages/theme-selva/www/selva-master.tcl	1 Aug 2005 05:04:45 -0000	1.6
@@ -41,7 +41,6 @@
 # Author: Arjun Sanyal (arjun@openforce.net), yon@openforce.net
 #
 # $Id$
-
 set user_id [ad_get_user_id] 
 set community_id [dotlrn_community::get_community_id]
 set dotlrn_url [dotlrn::get_url]
@@ -168,11 +167,37 @@
 }
 
 # Set up some basic stuff
-set user_id [ad_get_user_id]
-if { [ad_conn untrusted_user_id] == 0 } {
-    set user_name {}
+# Get user information
+set sw_admin_p 0
+set user_id [ad_conn user_id]
+set untrusted_user_id [ad_conn untrusted_user_id]
+if { $untrusted_user_id != 0 } {
+    set user_name [person::name -person_id $untrusted_user_id]
+    set pvt_home_url [ad_pvt_home]
+    set pvt_home_name [_ acs-subsite.Your_Account]
+    set logout_url [ad_get_logout_url]
+
+    # Site-wide admin link
+    set admin_url {}
+
+    set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id]
+
+    if { $sw_admin_p } {
+        set admin_url "/acs-admin/"
+        set locale_admin_url "/acs-lang/admin"
+    } else {
+        set subsite_admin_p [permission::permission_p \
+                                 -object_id [subsite::get_element -element object_id] \
+                                 -privilege admin \
+                                 -party_id $untrusted_user_id]
+
+        if { $subsite_admin_p  } {
+            set admin_url "[subsite::get_element -element url]admin/"
+        }
+    }
 } else {
-    set user_name [acs_user::get_element -user_id [ad_conn untrusted_user_id] -element name]
+    set login_url [ad_get_login_url -return]
+    set user_name {}
 }
 
 if {![exists_and_not_null title]} {
@@ -311,7 +336,6 @@
     }
     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 \
@@ -340,12 +364,30 @@
 	}
     }
 
-    set subnavbar "<ul>
-	<li><a href=\"/dotlrn/\">My Workspace</a></li>
-	<li><a href=\"/dotlrn/?&page%5fnum=3\">Courses</a></li>
-	<li><a href=\"/pvt/home\">Preferences</a></li>
-	<li><a href=\"/dotlrn/control-panel\">Control Panel</a></li>
-</ul>"
+    set subnavbar "<ul>"
+
+    if {[exists_and_not_null community_id]} {
+	append subnavbar "<li><a href=\"\"><b>[dotlrn_community::get_community_name $community_id]</b></a></li>"
+    } 
+
+    append subnavbar "	<li><a href=\"/dotlrn/\">[_ dotlrn.My_Workspace]</a></li>"
+    foreach {url name} [parameter::get_from_package_key -package_key "theme-selva" -parameter "AdditionalSubnavbarTabs" -default ""] {
+	append subnavbar "\n<li><a href=\"$url\">$name</a></li>"
+    }
+
+    append subnavbar "\n<li><a href=\"/dotlrn/control-panel\">[_ dotlrn.control_panel]</a></li>"
+
+    set system_name [ad_system_name]
+    if {[exists_and_not_null logout_url]} {
+        append subnavbar "\n<li><a href=\"$logout_url\" title=\"#acs-subsite.Logout_from_system#\">#acs-subsite.Logout#</a></li>"
+    } else {
+        append subnavbar "\n<li><a href=\"$login_url\" title=\"#acs-subsite.Log_in_to_system#\">#acs-subsite.Log_In#</a></li>"
+    }
+    if { $sw_admin_p } {
+	append subnavbar "\n<li><a href=\"$admin_url\" title=\"#acs-subsite.Site_wide_administration#\">#acs-subsite.Site_Wide_Admin#</a></li>"
+	append subnavbar "\n<li><a href=\"@locale_admin_url@\">#acs-subsite.Install_locales#</a></li>"
+    }
+    append subnavbar "</ul>"
     
 } else {
     set navbar " "