Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.125.2.2 -r1.125.2.3
--- openacs-4/packages/dotlrn/dotlrn.info	29 Mar 2007 19:20:57 -0000	1.125.2.2
+++ openacs-4/packages/dotlrn/dotlrn.info	30 Mar 2007 03:26:21 -0000	1.125.2.3
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.3.0d2" url="http://openacs.org/repository/download/apm/dotlrn-2.3.0d2.apm">
+    <version name="2.3.0d3" url="http://openacs.org/repository/download/apm/dotlrn-2.3.0d3.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>A Course Management System</summary>
         <release-date>2006-12-31</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Course Management</description>
 
-        <provides url="dotlrn" version="2.3.0d2"/>
+        <provides url="dotlrn" version="2.3.0d3"/>
         <requires url="acs-kernel" version="5.3.0b2"/>
         <requires url="acs-lang" version="5.3.0b2"/>
         <requires url="attachments" version="0.10"/>
@@ -28,6 +28,7 @@
             <callback type="after-upgrade"  proc="dotlrn::apm::after_upgrade"/>
         </callbacks>
         <parameters>
+            <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="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"/>
Index: openacs-4/packages/dotlrn/install.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/install.xml,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/dotlrn/install.xml	22 Mar 2007 09:04:20 -0000	1.14.2.1
+++ openacs-4/packages/dotlrn/install.xml	30 Mar 2007 03:26:21 -0000	1.14.2.2
@@ -20,12 +20,26 @@
     <install package="dotlrn-assessment"/>
     <install package="dotlrn-evaluation"/>
 
+    <install package="theme-zen"/>
+    <install package="acs-developer-support"/>
+
+    <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_thin_thick#,#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_thin_thick#,#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_thin_thick#,#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_thin_thick#,#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="DefaultSiteTemplate" value="#theme-zen.Zen_Theme#"/>
+
     <mount package="dotlrn" mount-point="/dotlrn" instance-name="dotLRN"/>
-    <set-parameter url="/" name="DefaultMaster" value="/packages/dotlrn/www/dotlrn-master-custom"/>
+
+    <set-parameter package-key="dotlrn" name="DefaultMaster_p" value="/packages/theme-zen/lib/lrn-master"/>
+
     <set-parameter package-key="acs-kernel" name="IndexRedirectUrl" value="/dotlrn/index"/>
     <set-parameter package-key="acs-kernel" name="CommunityMemberURL" value="/dotlrn/community-member"/>
     <set-parameter package-key="acs-kernel" name="CommunityMemberAdminURL" value="/dotlrn/admin/user"/>
-    <set-parameter package-key="new-portal" name="default_theme_name" value="#new-portal.sloan_theme_name#"/>
+
+    <set-parameter package-key="new-portal" name="default_theme_name" value="#theme-zen.Zen_Theme#"/>
     <set-parameter package-key="acs-bootstrap-installer" name="post_installation_message" value="When the server restarts click <a href='/dotlrn'>here</a> to configure .LRN"/>
   </actions>
 
Index: openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl	29 Mar 2007 02:35:32 -0000	1.5.2.1
+++ openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl	30 Mar 2007 03:26:21 -0000	1.5.2.2
@@ -56,7 +56,10 @@
 
         }
        # Get the default Site Template
-       set site_template_id [db_string select_st_id "select site_template_id from dotlrn_site_templates where pretty_name = '#new-portal.sloan_theme_name#'"]
+       set default_template_name [parameter::get \
+                                     -package_id $package_id \
+                                     -parameter DefaultSiteTemplate]
+       set site_template_id [db_string select_st_id {}]
        
        # for communities
        parameter::set_value -package_id $package_id \
Index: openacs-4/packages/dotlrn/tcl/apm-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/apm-callback-procs.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/dotlrn/tcl/apm-callback-procs.xql	29 Mar 2007 02:35:32 -0000	1.1.2.1
+++ openacs-4/packages/dotlrn/tcl/apm-callback-procs.xql	30 Mar 2007 03:26:21 -0000	1.1.2.2
@@ -2,6 +2,14 @@
 
 <queryset>
 
+  <fullquery name="dotlrn::apm::after_instantiate.select_st_id">
+    <querytext>
+       select site_template_id
+       from dotlrn_site_templates
+       where pretty_name = :default_template_name
+    </querytext>
+  </fullquery>
+
   <fullquery name="dotlrn::apm::after_upgrade.get_default_values">
     <querytext>
       select default_value
Index: openacs-4/packages/theme-zen/tcl/apm-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/tcl/apm-callback-procs.xql,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/theme-zen/tcl/apm-callback-procs.xql	23 Jan 2007 01:54:19 -0000	1.1.2.3
+++ openacs-4/packages/theme-zen/tcl/apm-callback-procs.xql	30 Mar 2007 03:26:21 -0000	1.1.2.4
@@ -8,7 +8,7 @@
       insert into dotlrn_site_templates
         (site_template_id, pretty_name, site_master, portal_theme_id ) 
       values 
-        (:site_template_id, 'Zen Theme', '/packages/theme-zen/lib/lrn-master',
+        (:site_template_id, '#theme-zen.Zen_Theme#', '/packages/theme-zen/lib/lrn-master',
          :theme_id)
     </querytext>
   </fullquery>