Index: openacs-4/packages/acs-subsite/www/admin/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/configure.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/configure.tcl	11 Dec 2003 21:39:55 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/configure.tcl	8 May 2008 01:35:58 -0000	1.9
@@ -16,10 +16,10 @@
         {label "Subsite name"}
         {html {size 50}}
     }
-    {master_template:text(select)
-        {label "Template"}
-        {help_text "Choose the layout and navigation you want for your subsite."}
-        {options [subsite::get_template_options]}
+    {theme:text(select)
+        {label "Theme"}
+        {help_text "Choose the layout and navigation theme you want for your subsite."}
+        {options [subsite::get_theme_options]}
     }
     {visibility:text(select)
         {label "Visible to"}
@@ -31,7 +31,7 @@
     }
 } -on_request {
     set instance_name [ad_conn instance_name]
-    set master_template [parameter::get -parameter DefaultMaster -package_id [ad_conn package_id]]
+    set theme [parameter::get -parameter ThemeKey -package_id [ad_conn package_id]]
 
     if { [permission::inherit_p -object_id [ad_conn package_id]] } {
         set visibility "any"
@@ -43,7 +43,7 @@
 
 } -on_submit {
     apm_package_rename -instance_name $instance_name
-    parameter::set_value -parameter DefaultMaster -package_id [ad_conn package_id] -value $master_template
+    subsite::set_theme -theme $theme
     set group(join_policy) $join_policy
     group::update -group_id [application_group::group_id_from_package_id] -array group