Index: openacs-4/packages/theme-selva/theme-selva.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/theme-selva.info,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/theme-selva/theme-selva.info	28 Sep 2005 04:42:06 -0000	1.14
+++ openacs-4/packages/theme-selva/theme-selva.info	29 Sep 2005 10:19:38 -0000	1.15
@@ -8,23 +8,24 @@
     <singleton-p>f</singleton-p>
     <auto-mount>theme-selva</auto-mount>
 
-    <version name="0.7d2" url="http://openacs.org/repository/download/apm/theme-selva-0.7d2.apm">
+    <version name="0.7d3" url="http://openacs.org/repository/download/apm/theme-selva-0.7d3.apm">
         <owner url="http:/www.weg.ee.usyd.edu.au">Rafael Calvo</owner>
         <release-date>2005-09-28</release-date>
         <vendor url="http://www.weg.usyd.edu.au"></vendor>
         <maturity>0</maturity>
 
-        <provides url="theme-selva" version="0.7d2"/>
+        <provides url="theme-selva" version="0.7d3"/>
 
         <callbacks>
         </callbacks>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AdditionalSubnavbarTabs"  default="/dotlrn/ theme-selva.MySpace /theme-selva/courses theme-selva.Courses  /theme-selva/communities theme-selva.Communities /pvt/home dotlrn.Preferences  /dotlrn/control-panel theme-selva.Tools" description="list of URL Names pairs which will make it into additional subnavbar tabs"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="AdditionalSubnavbarTabs"  default="/dotlrn/ #dotlrn.My_Workspace# /theme-selva/courses #dotlrn.Courses# /pvt/home #dotlrn.Preferences# /dotlrn/control-panel #dotlrn.control_panel#" description="list of URL Names pairs which will make it into additional subnavbar tabs"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="communityCssUrl"  default="/resources/theme-selva/Selva/turquoise/Selva.css" description="default class css_url"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="courseCssUrl"  default="/resources/theme-selva/Selva/green/Selva.css" description="default comunity css_url"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="cssUrl"  default="/resources/theme-selva/Selva/default/Selva.css" description="default css_url"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="isLogoActivated"  default="1" description="Boolean to display the logo or not"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="logoUrl"  default="/resources/theme-selva/Selva/images/dotLRN-logo.gif" description="url for the logo"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="SmallTitleP"  default="0" description="This will take the title out from the prominent place on the top left, but add the name of community you are in as a special tab"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/theme-selva/tcl/selva-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/tcl/selva-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/theme-selva/tcl/selva-procs.tcl	28 Sep 2005 03:21:03 -0000	1.5
+++ openacs-4/packages/theme-selva/tcl/selva-procs.tcl	29 Sep 2005 10:19:38 -0000	1.6
@@ -35,9 +35,92 @@
 	for dotlrn. It is called from the selva-master template.
     } {
 	set current_url [ad_conn url]
+
+	# Set up some basic stuff
+	set community_id [dotlrn_community::get_community_id]
+
+	# 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 login_url [ad_get_login_url -return]
+	    set user_name {}
+	}
 	
 	set subnavbar "<ul>"
+
+	set tabs_list [list]
+
+	set small_title_p [parameter::get_from_package_key -package_key "theme-selva" -parameter "SmallTitleP" -default "0"]
+	if {[exists_and_not_null community_id] && $small_title_p} {
+	    lappend tabs_list [list "" [dotlrn_community::get_community_name $community_id]]
+	} 
+
+	foreach {url name} [parameter::get_from_package_key -package_key "theme-selva" -parameter "AdditionalSubnavbarTabs" -default ""] {
+	    lappend tabs_list [list "$url" "$name"]
+	}
+
+	# Login and Logout Link
+	if {[exists_and_not_null logout_url]} {
+	    lappend tabs_list [list "$logout_url" "#acs-subsite.Logout#"]
+	} else {
+	    lappend tabs_list [list "$login_url" "#acs-subsite.Log_In#"]
+	}
+
+	if { $sw_admin_p } {
+	    lappend tabs_list [list "$admin_url" "#acs-subsite.Site_Wide_Admin#"]
+	    lappend tabs_list [list "$locale_admin_url" "#acs-subsite.Install_locales#"]
+	}
+
+	ns_log Notice "TABS" $tabs_list
+	foreach tab_entry $tabs_list {
+	    set url [lindex $tab_entry 0]
+	    set name [lindex $tab_entry 1]
+	    ns_log Notice "URL:: $url"
+	    ns_log Notice "NAME:: $name"
+	    # if url is /dotlrn or /dotlrn/index we highlight the "Home" tab, otherwise we highlight the tab with the current_url, if there is one, i.e. we are not in a community
+	    if { $url == $current_url || ($url == "/dotlrn/" && $current_url == "/dotlrn/index")} {
+		append subnavbar "\n<li class=\"active\"><a href=\"$url\">"
+		#if {$picture != "null" } { append subnavbar "<img src=\"$picture\" alt=\"$picture\">" }
+		append subnavbar "[lang::util::localize $name]</a></li>"
+	    } else {
+		append subnavbar "\n<li><a href=\"$url\">[lang::util::localize $name]</a></li>"
+	    }
+	    
+	}
 	
+	append subnavbar "\n</ul>"
+    }
+
+	set current_url [ad_conn url]
+	
+	set subnavbar "<ul>"
+	
 	foreach {url name } [parameter::get_from_package_key -package_key "theme-selva" -parameter "AdditionalSubnavbarTabs" -default ""] {
 	    
 	    # if url is /dotlrn or /dotlrn/index we highlight the "Home" tab, otherwise we highlight the tab with the current_url, if there is one, i.e. we are not in a community
Index: openacs-4/packages/theme-selva/www/selva-lrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-lrn-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-selva/www/selva-lrn-master.adp	26 Sep 2005 07:49:41 -0000	1.2
+++ openacs-4/packages/theme-selva/www/selva-lrn-master.adp	29 Sep 2005 10:19:39 -0000	1.3
@@ -9,6 +9,7 @@
  
 
 <if @youarehere@ not nil><div id="youarehere">@youarehere;noquote@</div><br /></if> 
+<else><div id="youarehere"></div></else>
 
 <div id="portal-navigation">
 <if @navbar@ not nil>@navbar;noquote@</if> 
Index: openacs-4/packages/theme-selva/www/selva-lrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-lrn-master.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-selva/www/selva-lrn-master.tcl	26 Sep 2005 07:49:41 -0000	1.2
+++ openacs-4/packages/theme-selva/www/selva-lrn-master.tcl	29 Sep 2005 10:19:39 -0000	1.3
@@ -269,6 +269,11 @@
 	set youarehere "[_ theme-selva.MySpace]"
     }
 
+    # Behaviour of the title
+    if {[parameter::get_from_package_key -package_key "theme-selva" -parameter "SmallTitleP" -default "0"]} {
+	set youarehere ""
+    }
+
     set extra_spaces "<img src=\"/resources/dotlrn/spacer.gif\" alt=\"\" border=0 width=15>"    
     #set subnavbar [selva::portal_navbar]
     set subnavbar [selva::portal_subnavbar \
@@ -356,3 +361,4 @@
 
 # Curriculum bar
 set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $community_id]]
+
Index: openacs-4/packages/theme-selva/www/selva-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-master.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/theme-selva/www/selva-master.adp	29 Sep 2005 08:24:11 -0000	1.10
+++ openacs-4/packages/theme-selva/www/selva-master.adp	29 Sep 2005 10:19:39 -0000	1.11
@@ -8,6 +8,4 @@
   <property name="context">@context;noquote@</property>
   <property name="displayed_object_id">@displayed_object_id@</property>
   <property name="header_stuff">@header_stuff;noquote@</property>
-  </property>
-
 <slave>