Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.43.2.14 -r1.43.2.15
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	15 May 2006 21:00:07 -0000	1.43.2.14
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	18 May 2006 00:39:34 -0000	1.43.2.15
@@ -235,6 +235,7 @@
   <msg key="Header_Logo_Item_ID">Header Logo Item ID</msg>
   <msg key="help">Help</msg>
   <msg key="hide_lrn_toolbar">Hide .LRN toolbar</msg>
+  <msg key="Home">Home</msg>
   <msg key="HTML">HTML</msg>
   <msg key="ID">ID:</msg>
   <msg key="ID_1">ID</msg>
Index: openacs-4/packages/dotlrn/www/control-panel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v
diff -u -r1.15.2.3 -r1.15.2.4
--- openacs-4/packages/dotlrn/www/control-panel.adp	13 Dec 2005 15:32:35 -0000	1.15.2.3
+++ openacs-4/packages/dotlrn/www/control-panel.adp	18 May 2006 00:39:34 -0000	1.15.2.4
@@ -49,7 +49,7 @@
   <p><li><a href="change-site-template?referer=@dotlrn_url@/control-panel">#dotlrn.Customize_Template#</a></li>
 
 <if @admin_p@>
-  <p><li><a href="@admin_url@">@admin_pretty_name@</a> (<a href="@cockpit_url@">#dotlrn.Cockpit#</a>)</li>
+  <p><li><a href="@admin_url@">@admin_pretty_name@</a></li>
 </if>
 </ul>
 
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v
diff -u -r1.13.2.4 -r1.13.2.5
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	14 May 2006 00:36:27 -0000	1.13.2.4
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	18 May 2006 00:39:34 -0000	1.13.2.5
@@ -32,12 +32,15 @@
     set show_archived_p 0
 }
 
+#DRB: This is a hack that depends on .LRN having clubs and classes.  Done quickly for
+#theme-selva for .LRN 2.2.
+
 set community_type_clause ""
 if { [exists_and_not_null community_filter] } {
     if { $community_filter eq "class_instances" } {
         set community_type_clause "and dotlrn_communities_all.community_type not in ('dotlrn_community', 'dotlrn_club', 'dotlrn_pers_community')"
     } elseif { $community_filter eq "communities" } {
-        set community_type_clause "and dotlrn_communities_all.community_type in ('dotlrn_community', 'dotlrn_club', 'dotlrn_pers_community')"
+        set community_type_clause "and dotlrn_communities_all.community_type in ('dotlrn_club', 'dotlrn_pers_community')"
     }
 }
 
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.2.4 -r1.14.2.5
--- openacs-4/packages/theme-selva/theme-selva.info	16 May 2006 10:03:41 -0000	1.14.2.4
+++ openacs-4/packages/theme-selva/theme-selva.info	18 May 2006 00:39:35 -0000	1.14.2.5
@@ -20,7 +20,7 @@
         <callbacks>
         </callbacks>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="AdditionalNavbarTabs"  default="/dotlrn/ #dotlrn.My_Workspace# /theme-selva/courses #dotlrn.Courses# /theme-selva/communities #dotlrn.Communities# /pvt/home #dotlrn.Preferences# /dotlrn/control-panel #dotlrn.control_panel#" description="list of URL Names pairs which will make it into additional navbar tabs"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="AdditionalNavbarTabs"  default="/dotlrn/ #dotlrn.Home# /theme-selva/courses #dotlrn.Courses# /theme-selva/communities #dotlrn.Communities# /pvt/home #dotlrn.Preferences# /dotlrn/control-panel #dotlrn.control_panel#" description="list of URL Names pairs which will make it into additional navbar 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"/>
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.2.6 -r1.5.2.7
--- openacs-4/packages/theme-selva/tcl/selva-procs.tcl	15 May 2006 21:05:32 -0000	1.5.2.6
+++ openacs-4/packages/theme-selva/tcl/selva-procs.tcl	18 May 2006 00:39:35 -0000	1.5.2.7
@@ -57,7 +57,7 @@
 	    if { $sw_admin_p } {
 		set admin_url "/acs-admin/"
 		set locale_admin_url "/acs-lang/admin"
-		set dotlrn_admin_url "/dotlrn/admin"
+		set dotlrn_admin_url "/dotlrn/admin/"
 	    } else {
 		set subsite_admin_p [permission::permission_p \
 					 -object_id [subsite::get_element -element object_id] \
@@ -79,7 +79,9 @@
 
 	if { [exists_and_not_null community_id] } {
             set type [dotlrn_community::get_community_type_from_community_id $community_id]
-            if { $type eq "dotlrn_community" || $type eq "dotlrn_club" || $type eq "dotlrn_pers_community" } {
+            if { $type eq "dotlrn_community" || $type eq "dotlrn_pers_community" } {
+                 set community_message_key "#dotlrn.subcommunities_pretty_name#"
+            } elseif { $type eq "dotlrn_club" } {
                  set community_message_key "#dotlrn.clubs_pretty_name#"
             } else {
                  set community_message_key "#dotlrn.dotlrn_class_instance_pretty_name#"
@@ -100,9 +102,10 @@
 	    set url [lindex $tab_entry 0]
 	    set name [lindex $tab_entry 1]
 	    ns_log Debug "URL:: $url"
+	    ns_log Debug "CURRENT URL:: $current_url"
 	    ns_log Debug "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")} {
+	    if { $url eq $current_url || ($url eq "/dotlrn/" && $current_url eq "/dotlrn/index")} {
 		append navbar "\n<li class=\"active\"><a href=\"$url\">"
 		#if {$picture != "null" } { append navbar "<img src=\"$picture\" alt=\"$picture\">" }
 		append navbar "[lang::util::localize $name]</a></li>"