Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -r1.29 -r1.29.2.1
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	13 Nov 2003 09:11:21 -0000	1.29
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	25 Nov 2003 01:55:49 -0000	1.29.2.1
@@ -164,25 +164,6 @@
     }
 }
 
-if { $make_navbar_p } {
-    if {$link_control_panel} {
-	set link_control_panel 1
-    } else {
-	set link_control_panel 0
-    }
-    set extra_spaces "<img src=\"/resources/dotlrn/spacer.gif\" border=0 width=15>"    
-    set navbar [dotlrn::portal_navbar \
-        -user_id $user_id \
-        -link_control_panel $link_control_panel \
-        -control_panel_text [_ "dotlrn.control_panel"] \
-	-pre_html "$extra_spaces" \
-	-post_html $extra_spaces \
-        -link_all $link_all
-    ]
-} else {
-    set navbar "<br>"
-}
-
 # Set up some basic stuff
 set user_id [ad_get_user_id]
 if { [ad_conn untrusted_user_id] == 0 } {
@@ -203,9 +184,12 @@
 
 set community_id [dotlrn_community::get_community_id]
 
+set control_panel_text [_ "dotlrn.control_panel"]
+
 if {![empty_string_p $community_id]} {
     # in a community or just under one in a mounted package like /calendar 
     set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
+    set control_panel_text [_ acs-subsite.Admin]
 
     if {[dotlrn_community::subcommunity_p -community_id $community_id]} {
 	#The colors for a subgroup are set by the parent group with a few overwritten.
@@ -316,6 +300,26 @@
     set text ""
 }
 
+if { $make_navbar_p } {
+    if {$link_control_panel} {
+	set link_control_panel 1
+    } else {
+	set link_control_panel 0
+    }
+    set extra_spaces "<img src=\"/resources/dotlrn/spacer.gif\" border=0 width=15>"    
+    set navbar [dotlrn::portal_navbar \
+        -user_id $user_id \
+        -link_control_panel $link_control_panel \
+        -control_panel_text $control_panel_text \
+	-pre_html "$extra_spaces" \
+	-post_html $extra_spaces \
+        -link_all $link_all
+    ]
+} else {
+    set navbar "<br>"
+}
+
+
 if { ![info exists header_stuff] } {
     set header_stuff ""
 }