Index: openacs-4/packages/dotlrn/www/configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.adp,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/dotlrn/www/configure.adp	8 Oct 2002 16:42:52 -0000	1.14
+++ openacs-4/packages/dotlrn/www/configure.adp	17 Oct 2002 12:27:19 -0000	1.14.2.1
@@ -18,10 +18,21 @@
 
 %>
 
-<master src="dotlrn-master">
-<property name="title">Customize Layout</property>
-<property name="link_control_panel">0</property>
+<master>
+<property name="title">Configure @name@</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>
 
 <p></p>
 
 @rendered_page@
+
+
+
+
+
+
+
Index: openacs-4/packages/dotlrn/www/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.tcl,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/dotlrn/www/configure.tcl	9 Aug 2002 18:39:26 -0000	1.16
+++ openacs-4/packages/dotlrn/www/configure.tcl	17 Oct 2002 12:27:19 -0000	1.16.2.1
@@ -44,25 +44,14 @@
 } else {
     set user_id [ad_conn user_id]
 
-    # am i not a limited access user with 0 or 1 communities?
-    # if so, i have a user portal that i can configure
-    if {![dotlrn::user_can_browse_p -user_id $user_id]} {
-    
-        set communities [dotlrn_community::get_all_communities_by_user $user_id]
-    
-        if {[llength $communities] == 0} {
-            ad_returnredirect "index-not-a-user"
-            ad_script_abort
-        } elseif {[llength $communities] == 1} {
-            ad_returnredirect [ns_set get [lindex $communities 0] url]
-            ad_script_abort
-        }
-    
-    }
+    # I don't see under what circumstance we wouldn't want users to
+    # customize thier own portal. -Caroline.
 
+    #    dotlrn::require_user_browse -user_id $user_id
+
     set portal_id [dotlrn::get_portal_id -user_id $user_id]
     set name [portal::get_name $portal_id]
-    set rendered_page [portal::configure $portal_id "index"]
+    set rendered_page [portal::configure -allow_theme_change_p 0 $portal_id "index"]
 }
 
 ad_return_template
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.4 -r1.4.2.1
--- openacs-4/packages/dotlrn/www/control-panel.adp	10 Oct 2002 05:41:31 -0000	1.4
+++ openacs-4/packages/dotlrn/www/control-panel.adp	17 Oct 2002 12:27:19 -0000	1.4.2.1
@@ -24,24 +24,65 @@
 
 <% set dotlrn_url [dotlrn::get_url] %>
 
+<table border="0" width="100%">
+  <tr>
+    <td valign="top" width="50%">
+<table class="element" border=0 cellpadding="0" cellspacing="0" width="100%">
+<tr> 
+  <td colspan=3 class="element-header-text">Help and Personal Configuration</td>
+</tr>
+<tr><td colspan=3 class="dark-line" height="0"><img src="/graphics/spacer.gif"></td></tr>
+<tr>
+  <td class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
+  <td class="element-text" width="100%">
+<table cellspacing="0" cellpadding="0" class="element-content" width="100%">
+	<tr><td>
+<h3>General Site Help</h3> 
 <ul>
   <li><a href="@dotlrn_url@/help">Help</a></li>
+  <li>Ask a question <a href=mailto:@system_owner@>@system_owner@</a>
+</ul>
+<h3>Personal Options</h3>
+<ul>
+<li><include src="weblog-control-panel">
   <li>
     <a href="/user/basic-info-update?return_url=@referer@">Edit My Personal Information</a>
-    <br>
-    <small>
-      (What others see about me:
-      <%= [acs_community_member_link -user_id $user_id -label "[ad_url][acs_community_member_url -user_id $user_id]"] %>)
-     </small>
+    <li>
+      What others see about me:
+      <%= [acs_community_member_link -user_id $user_id -label "[ad_url][acs_community_member_url -user_id $user_id]"] %>
+
   </li>
   <li><a href="/user/password-update?return_url=@referer@">Change My Password</a></li>
   <li><a href="/notifications/manage">Edit My Notifications</a></li>
-  <li><a href="configure">Customize Layout</a></li>
+  <li><a href="configure">Customize My Portal Layout</a></li>
+
 <if @admin_p@>
   <li><a href="@admin_url@">@admin_pretty_name@</a></li>
 </if>
 </ul>
+</td></tr></table>
+ </td>
+	  <td align="right" class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
 
-<blockquote>
-  <include src="my-communities" title="Groups" referer="control_panel">
-</blockquote>
+</tr>
+<tr><td colspan=3 class="light-line" width="1"><img src="/graphics/spacer.gif"></td></tr>
+</table>
+
+    <td valign="top" width="50%">
+<table class="element" border=0 cellpadding="0" cellspacing="0" width="100%">
+<tr> 
+  <td colspan=3 class="element-header-text">Join/Drop Classes or Communities</td>
+</tr>
+<tr><td colspan=3 class="dark-line" height="0"><img src="/graphics/spacer.gif"></td></tr>
+<tr>
+  <td class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
+  <td class="element-text" width="100%">
+  <include src="dotlrn-main-portlet" show_buttons_p=1 title="Groups" referer="@dotlrn_url@/control-panel">
+ </td>
+	  <td align="right" class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
+
+</tr>
+<tr><td colspan=3 class="light-line" width="1"><img src="/graphics/spacer.gif"></td></tr>
+</table>
+</table>
+
Index: openacs-4/packages/dotlrn/www/control-panel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/dotlrn/www/control-panel.tcl	9 Aug 2002 18:39:26 -0000	1.3
+++ openacs-4/packages/dotlrn/www/control-panel.tcl	17 Oct 2002 12:27:19 -0000	1.3.2.1
@@ -36,10 +36,11 @@
 # Make sure user is logged in
 set user_id [ad_maybe_redirect_for_registration]
 
-set title "Control Panel"
+set title [parameter::get -parameter admin_page_name]
 set admin_p [dotlrn::admin_p]
 set admin_url "[dotlrn::get_url]/admin"
 set referer [ns_conn url]
 set admin_pretty_name [parameter::get -parameter dotlrn_admin_pretty_name]
+set system_owner [ad_system_owner]
 
 ad_return_template