Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.59 -r1.60
--- openacs-4/packages/dotlrn/dotlrn.info	6 Mar 2002 05:12:53 -0000	1.59
+++ openacs-4/packages/dotlrn/dotlrn.info	6 Mar 2002 20:32:22 -0000	1.60
@@ -146,6 +146,8 @@
             <file type="content_page" path="www/admin/departments.adp"/>
             <file type="content_page" path="www/admin/departments.tcl"/>
             <file type="query_file" path="www/admin/departments.xql"/>
+            <file type="content_page" path="www/admin/edit-preapproved-emails.adp"/>
+            <file type="content_page" path="www/admin/edit-preapproved-emails.tcl"/>
             <file type="content_page" path="www/admin/index.adp"/>
             <file type="content_page" path="www/admin/index.tcl"/>
             <file type="content_page" path="www/admin/master.adp"/>
@@ -317,14 +319,16 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="auto_dotlrn_user_email_patterns"  description="Automatic dotLRN user email patterns"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_name"  default="Department" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_plural"  default="Departments" description="used everywhere in the ui"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultCommunityApplets"  default="dotlrn_dotlrn,dotlrn_bboard,dotlrn_calendar,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_research,dotlrn_static,dotlrn_survey" description="dotLRN applets to add by default to each new community"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_class_instance_applets"  default="dotlrn_dotlrn,dotlrn_members_staff,dotlrn_bboard,dotlrn_calendar,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_research,dotlrn_static,dotlrn_survey" description="dotLRN applets to add by default to each new community"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcommunities_pretty_name"  default="Subgroup" description="what subcomms are called"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcommunities_pretty_plural"  default="Subgroups" description="the plural"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="class_instance_pages_csv"  default="Class Home,Simple 2-Column;Calendar,Simple 1-Column;File Storage,Simple 1-Column;Survey,Simple 1-Column" description="cvs list of the page_name/layout to create"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="club_pages_csv"  default="Community Home,Simple 2-Column;Calendar,Simple 1-Column;File Storage,Simple 1-Column;People,Simple 1-Column" description="same"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcomm_pages_csv"  default="Subcommunity Home,Simple 2-Column;Calendar,Simple 1-Column;File Storage,Simple 1-Column;People,Simple 1-Column" description="foo"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="non_member_page_name"  default="Not-A-Member" description="The name of the not a member page"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="admin_page_name"  default="Contol Panel" description="The name of the admin page"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_club_applets"  default="dotlrn_dotlrn,dotlrn_members,dotlrn_bboard,dotlrn_calendar,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_static,dotlrn_survey" description="the applets to add when making a new club"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_subcomm_applets"  default="dotlrn_members,dotlrn_dotlrn,dotlrn_bboard,dotlrn_calendar,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_static" description="see above"/>
         </parameters>
 
     </version>
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.64 -r1.65
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	6 Mar 2002 05:12:54 -0000	1.64
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	6 Mar 2002 20:32:22 -0000	1.65
@@ -148,14 +148,20 @@
                     -extra_vars $extra_vars $object_type]
 
             set user_id [ad_conn user_id]
-
-            # based on the community_type, get the page_names and layouts
+            
+            # based on the community_type:
+            # 1. get the page_names and layouts
+            # 2. the the list of default applets for this type
             if {[string equal $community_type "dotlrn_community"]} {
                 set csv_list [ad_parameter subcomm_pages_csv]
+                set default_applets [ad_parameter default_subcomm_applets]
             } elseif {[string equal $community_type "dotlrn_club"]} {
                 set csv_list [ad_parameter club_pages_csv]
-            } else {
+                set default_applets [ad_parameter default_club_applets]
+             } else {
                 set csv_list [ad_parameter class_instance_pages_csv]
+                set default_applets \
+                        [ad_parameter default_class_instance_applets]
             }
 
             set non_member_page_name [ad_parameter non_member_page_name]
@@ -205,7 +211,13 @@
             set new_node_id [site_node_create $parent_node_id $community_key]
 
             # Instantiate the package
-            set package_id [site_node_create_package_instance $new_node_id $pretty_name $community_id [one_community_package_key]]
+            set package_id \
+                    [site_node_create_package_instance \
+                      $new_node_id \
+                      $pretty_name \
+                      $community_id \
+                      [one_community_package_key] \
+                    ]
 
             # Set the right parameters
             ad_parameter -package_id $package_id -set 0 dotlrn_level_p
@@ -215,11 +227,16 @@
             # Set up the node
             dotlrn_community::set_package_id $community_id $package_id
 
-            # Add the applets specified as default applets for a community as
-            # specified by the DefaultCommunityApplets ad_parameter
-            foreach applet_key [string trim [split [ad_parameter DefaultCommunityApplets] {,}]] {
+            # Add the default applets specified above. They are
+            # different per community type!
+            set default_applets_list \
+                    [string trim [split $default_applets {,}]]
+
+            foreach applet_key $default_applets_list {
                 if {[dotlrn_applet::applet_exists_p -applet_key $applet_key]} {
-                    dotlrn_community::add_applet_to_community $community_id $applet_key
+                    dotlrn_community::add_applet_to_community \
+                            $community_id \
+                            $applet_key
                 }
             }
         }