Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.125.2.9 -r1.125.2.10
--- openacs-4/packages/dotlrn/dotlrn.info	22 Apr 2007 18:49:15 -0000	1.125.2.9
+++ openacs-4/packages/dotlrn/dotlrn.info	21 Jul 2007 14:50:02 -0000	1.125.2.10
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.3.0" url="http://openacs.org/repository/download/apm/dotlrn-2.3.0.apm">
+    <version name="2.3.1d1" url="http://openacs.org/repository/download/apm/dotlrn-2.3.1d1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>A Course Management System</summary>
         <release-date>2007-04-22</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Course Management</description>
 
-        <provides url="dotlrn" version="2.3.0"/>
+        <provides url="dotlrn" version="2.3.1d1"/>
         <requires url="acs-kernel" version="5.3.1a1"/>
         <requires url="acs-lang" version="5.3.1a1"/>
         <requires url="attachments" version="0.10"/>
@@ -31,6 +31,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultSiteTemplate"  default="#new-portal.sloan_theme_name#" description="The name of the default site template"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AdminChangeSiteTemplate_p"  default="1" description="desc" section_name=".LRN Portal Types"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="admin_page_name"  default="#dotlrn.admin_page_name#" description="The name of the admin page"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="admin_layout_name"  default="#new-portal.simple_2column_layout_name#" description="The layout of the admin page"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AutoAddAuthorities"  default="*" description="A comma-separated list of short-names of authorities for which users should be automatically added to .LRN, or '*' for all. In order for users to be auto-added, AutoAddUsersP needs to be set to 1, and this needs to be set to * or include the relevant authority short_names. Example: 'local,ldap'." section_name="Auto-Adding Users to .LRN"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AutoAddUsersP"  default="0" description="Automatically add OpenACS users to .LRN. 1 = yes, 0 = no. In order for users to be auto-added, this needs to be set to 1, and AutoAddAuthorities needs to be set to * or include the relevant authority short_names." section_name="Auto-Adding Users to .LRN"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="auto_dotlrn_user_email_patterns"  description="Automatic dotLRN user email patterns"/>
@@ -71,6 +72,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="group_type_key"  default="dotlrn_community" description="Class Group Type"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="hide_personal_portal_p"  default="0" description="Some systems may wish to keep the personal portal hidden.  Setting this value to 1 will cause dotlrn to exclude navigation to the personal portal from community portals, and disable the entire navbar on non-community portal pages."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="non_member_page_name"  default="#dotlrn.non_member_page_name#" description="The name of the not a member page"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="non_member_layout_name"  default="#new-portal.simple_2column_layout_name#" description="The name of the not a member page"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="show_portrait_p"  default="1" description="Should we show and solicit user portraits? 1=Yes, 0=No"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcomm_pages_csv"  default="#dotlrn.subcomm_page_home_title#,#new-portal.simple_2column_layout_name#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#new-portal.simple_1column_layout_name#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#new-portal.simple_1column_layout_name#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#new-portal.simple_1column_layout_name#,#dotlrn.subcomm_page_file_storage_accesskey#" description="default page names and layouts for subcomms"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcommunities_pretty_name"  default="#dotlrn.subcommunities_pretty_name#" description="what subcomms are called"/>
Index: openacs-4/packages/dotlrn/install.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/install.xml,v
diff -u -r1.14.2.4 -r1.14.2.5
--- openacs-4/packages/dotlrn/install.xml	17 Apr 2007 18:55:13 -0000	1.14.2.4
+++ openacs-4/packages/dotlrn/install.xml	21 Jul 2007 14:50:02 -0000	1.14.2.5
@@ -25,9 +25,17 @@
     <set-parameter package-key="acs-subsite" name="DefaultMaster" value="/packages/theme-zen/lib/lrn-master"/>
 
     <set-parameter-default package-key="dotlrn" name="class_instance_pages_csv" value="#dotlrn.class_page_home_title#,#theme-zen.Zen_2_column#,#dotlrn.class_page_home_accesskey#;#dotlrn.class_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_calendar_accesskey#;#dotlrn.class_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_file_storage_accesskey#"/>
+
     <set-parameter-default package-key="dotlrn" name="club_pages_csv" value="#dotlrn.club_page_home_title#,#theme-zen.Zen_2_column#,#dotlrn.club_page_home_accesskey#;#dotlrn.club_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_calendar_accesskey#;#dotlrn.club_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_file_storage_accesskey#;#dotlrn.club_page_people_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_people_accesskey#"/>
+
     <set-parameter-default package-key="dotlrn" name="subcomm_pages_csv" value="#dotlrn.subcomm_page_home_title,#theme-zen.Zen_2_column#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_file_storage_accesskey#"/>
+
     <set-parameter-default package-key="dotlrn" name="user_portal_pages_csv" value="#dotlrn.user_portal_page_home_title#,#theme-zen.Zen_2_column#,#dotlrn.user_portal_page_home_accesskey#;#dotlrn.user_portal_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_calendar_accesskey#;#dotlrn.user_portal_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_file_storage_accesskey#"/>
+
+    <set-parameter-default package-key="dotlrn" name="admin_layout_name" value="#theme-zen.Zen_2_column#"/>
+
+    <set-parameter-default package-key="dotlrn" name="non_member_layout_name" value="#theme-zen.Zen_2_column#"/>
+
     <set-parameter-default package-key="dotlrn" name="DefaultSiteTemplate" value="#theme-zen.Zen_Theme#"/>
 
     <mount package="dotlrn" mount-point="/dotlrn" instance-name="dotLRN"/>
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.198 -r1.198.2.1
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	21 Dec 2006 15:57:53 -0000	1.198
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	21 Jul 2007 14:50:02 -0000	1.198.2.1
@@ -231,6 +231,7 @@
             set non_member_portal_id [portal::create \
                 -name "$pretty_name Non-Member Portal" \
                 -default_page_name [dotlrn::parameter -name non_member_page_name] \
+                -layout_name [dotlrn::parameter -name non_member_layout_name] \
                 -context_id $community_id \
                 $user_id \
             ]
@@ -239,6 +240,7 @@
             set admin_portal_id [portal::create \
                 -name "$pretty_name Administration Portal" \
                 -default_page_name [dotlrn::parameter -name admin_page_name] \
+                -layout_name [dotlrn::parameter -name admin_layout_name] \
                 -context_id $community_id \
                 $user_id \
             ]