Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.104.2.2 -r1.104.2.3
--- openacs-4/packages/dotlrn/dotlrn.info	2 Mar 2003 22:40:18 -0000	1.104.2.2
+++ openacs-4/packages/dotlrn/dotlrn.info	13 Mar 2003 18:03:00 -0000	1.104.2.3
@@ -538,7 +538,7 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="show_portrait_p"  default="0" description="show or hide all portrait related stuff?"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="user_portal_pretty_name"  default="User" description="the pretty name for the user portal"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="class_instance_portal_pretty_name"  default="Classes" description="the nice name for the class instance portal template"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="user_portal_pages_csv"  default="MySpace,Simple 2-Column;Calendar,Simple 1-Column;My Files,Simple 1-Column" description="a csv list of the other pages to create on the user wsp by default"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="user_portal_pages_csv"  default="MySpace,Simple 2-Column;My Calendar,Simple 1-Column;My Files,Simple 1-Column" description="a csv list of the other pages to create on the user wsp by default"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_user_portal_applets"  default="dotlrn_dotlrn,dotlrn_calendar,dotlrn_forums,dotlrn_faq,dotlrn_fs,dotlrn_news" description="a csv list of the applets to call when creating the user portal template"/>
         </parameters>
 
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.9.2.6 -r1.9.2.7
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	13 Mar 2003 13:17:34 -0000	1.9.2.6
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	13 Mar 2003 18:03:00 -0000	1.9.2.7
@@ -68,7 +68,6 @@
 set extra_spaces "<img src=$dotlrn_url/graphics/spacer.gif border=0 width=15>"
 set td_align "align=\"center\" valign=\"top\""
 
-
 if {[dotlrn::user_p -user_id $user_id]} {
     set portal_id [dotlrn::get_portal_id -user_id $user_id]
 }
@@ -119,8 +118,10 @@
 }
 
 if {$have_comm_id_p} {
-    # We are under a dotlrn package instance
+    # in a community or just under one in a mounted package like /calendar 
     # get this comm's info
+    set control_panel_text "Administer"
+
     set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
     set text [dotlrn_community::get_community_header_name $community_id] 
     set link [dotlrn_community::get_community_url $community_id]
@@ -139,6 +140,8 @@
         set portal_id ""
     }
 } elseif {[parameter::get -parameter community_type_level_p] == 1} {
+    set control_panel_text "Administer"
+
     set extra_td_html ""
     set link_all 1
     set link [dotlrn::get_url]
@@ -154,6 +157,7 @@
     }
 } else {
     # we could be anywhere (maybe under /dotlrn, maybe not)
+    set control_panel_text "My Account"
     set link "[dotlrn::get_url]/"
     set community_id ""
     set text ""
@@ -175,7 +179,7 @@
     set navbar [dotlrn::portal_navbar \
         -user_id $user_id \
         -link_control_panel $link_control_panel \
-        -control_panel_text "Control Panel" \
+        -control_panel_text $control_panel_text \
 	-pre_html "$extra_spaces" \
 	-post_html $extra_spaces \
         -link_all $link_all