Index: openacs-4/packages/dotlrn/www/configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/configure.adp	29 Jun 2003 23:30:49 -0000	1.18
+++ openacs-4/packages/dotlrn/www/configure.adp	13 Mar 2008 17:28:26 -0000	1.19
@@ -19,13 +19,13 @@
 %>
 
 <master>
-<property name="title">#dotlrn.Configure_name#</property>
+<property name="title">#dotlrn.Customize_Layout#</property>
 <property name="portal_id">@portal_id@</property>
 <property name="link_all">1</property>
 <property name="show_control_panel">1</property>
 <property name="link_control_panel">1</property>
 <property name="return_url">./</property>
-
+<property name="context">@context;noquote@</property>
 <p></p>
 
 @rendered_page;noquote@
Index: openacs-4/packages/dotlrn/www/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/dotlrn/www/configure.tcl	8 Aug 2006 21:26:24 -0000	1.21
+++ openacs-4/packages/dotlrn/www/configure.tcl	13 Mar 2008 17:28:26 -0000	1.22
@@ -28,7 +28,7 @@
     @version $Id$
 
 }
-    
+
 if {[parameter::get -parameter community_type_level_p] == 1} {
 
     # at a community type level, redirect
@@ -58,6 +58,9 @@
 
     
     set name [portal::get_name $portal_id]
+    set context [list \
+                     [list "control-panel" [parameter::get -localize -parameter admin_page_name]] \
+                     [_ dotlrn.Customize_Layout]]
     set rendered_page [portal::configure -allow_theme_change_p 0 $portal_id "index"]
 }
 
Index: openacs-4/packages/dotlrn/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/dotlrn/www/index.adp	12 Mar 2008 22:11:31 -0000	1.27
+++ openacs-4/packages/dotlrn/www/index.adp	13 Mar 2008 17:28:26 -0000	1.28
@@ -21,6 +21,8 @@
 <master>
   <property name="portal_page_p">1</property>
   <property name="title">@title@</property>
-  <property name="context">@context;noquote@</property>
+  <if @context@ defined>
+    <property name="context">@context;noquote@</property>
+  </if>
 
 @rendered_page;noquote@
Index: openacs-4/packages/dotlrn/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v
diff -u -r1.46 -r1.47
--- openacs-4/packages/dotlrn/www/index.tcl	12 Mar 2008 22:11:31 -0000	1.46
+++ openacs-4/packages/dotlrn/www/index.tcl	13 Mar 2008 17:28:26 -0000	1.47
@@ -61,7 +61,10 @@
     where portal_id = :portal_id
     and sort_key = :page_num
 } -default ""]
-set context [list [lang::util::localize $title]]
+if { $page_num ne 0 } {
+    set context [list [lang::util::localize $title]]
+}
+
 set rendered_page [dotlrn::render_page -page_num $page_num -hide_links_p t $portal_id]
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/one-community-portal-configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-portal-configure.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/one-community-portal-configure.adp	29 Jun 2003 23:30:49 -0000	1.8
+++ openacs-4/packages/dotlrn/www/one-community-portal-configure.adp	13 Mar 2008 17:28:26 -0000	1.9
@@ -20,7 +20,7 @@
 
 <master>
 <property name="title">#dotlrn.Customize_Layout#</property>
-
+<property name="context">@context;noquote@</property>
 <p></p>
 
 @rendered_page;noquote@
Index: openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl	8 Aug 2006 21:26:24 -0000	1.9
+++ openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl	13 Mar 2008 17:28:26 -0000	1.10
@@ -41,7 +41,9 @@
 
 # we are in a community
 set community_name [dotlrn_community::get_community_name $community_id]
-
+set context [list \
+                 [list "one-community-admin" [_ dotlrn.Admin]] \
+                 [_ dotlrn.Customize_Layout]]
 set rendered_page [portal::configure \
     -allow_theme_change_p 1 \
     [dotlrn_community::get_portal_id] \