Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.88 -r1.89
--- openacs-4/packages/acs-subsite/acs-subsite.info	5 May 2007 13:07:35 -0000	1.88
+++ openacs-4/packages/acs-subsite/acs-subsite.info	6 May 2007 06:58:39 -0000	1.89
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.4.0d3" url="http://openacs.org/repository/download/apm/acs-subsite-5.4.0d3.apm">
+    <version name="5.4.0d4" url="http://openacs.org/repository/download/apm/acs-subsite-5.4.0d4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2006-11-19</release-date>
@@ -16,7 +16,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.4.0d3"/>
+        <provides url="acs-subsite" version="5.4.0d4"/>
         <requires url="acs-authentication" version="5.3.0d1"/>
         <requires url="acs-content-repository" version="5.3.0d1"/>
         <requires url="acs-kernel" version="5.3.0d1"/>
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	5 May 2007 13:07:35 -0000	1.38
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	6 May 2007 06:58:40 -0000	1.39
@@ -654,7 +654,7 @@
     if {$url eq ""} {
 	set subsite_url [subsite::get_element -element url]
     } else {
-	set substie_url $url
+	set subsite_url $url
     }
 
     set subsite_id [ad_conn subsite_id]
Index: openacs-4/packages/acs-subsite/www/members/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/members/user-new.adp	8 Nov 2003 13:30:40 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/members/user-new.adp	6 May 2007 06:58:40 -0000	1.5
@@ -3,7 +3,7 @@
   <property name="title">@page_title;noquote@</property>
   <property name="focus">register.first_names</property>
 
-<include src="/packages/acs-subsite/lib/user-new" 
+<include src="@user_new_template@"
     self_register_p="0" 
     email="@email@" 
     return_url="." 
Index: openacs-4/packages/acs-subsite/www/members/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-new.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/members/user-new.tcl	10 Jan 2007 21:22:09 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/members/user-new.tcl	6 May 2007 06:58:40 -0000	1.9
@@ -65,3 +65,10 @@
     ad_returnredirect .
     ad_script_abort
 }
+
+set subsite_id [ad_conn subsite_id]
+set user_new_template [parameter::get -parameter "UserNewTemplate" -package_id $subsite_id]
+
+if {$user_new_template eq ""} {
+    set user_new_template "/packages/acs-subsite/lib/user-new"
+}
Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	4 Jun 2006 00:45:45 -0000	1.21
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	6 May 2007 06:58:40 -0000	1.22
@@ -66,7 +66,7 @@
 	<span><h2> #acs-subsite.My_Account# </h2></span>
 	</div>
         <div class="portlet">
-  	<include src="/packages/acs-subsite/lib/user-info" />
+  	<include src="@user_new_template@" />
   	<if @account_status@ eq "closed">
     	#acs-subsite.Account_closed_workspace_msg#
   	</if>
Index: openacs-4/packages/acs-subsite/www/pvt/home.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-subsite/www/pvt/home.tcl	10 Jan 2007 21:22:09 -0000	1.22
+++ openacs-4/packages/acs-subsite/www/pvt/home.tcl	6 May 2007 06:58:40 -0000	1.23
@@ -82,3 +82,10 @@
 set make_visible_url "[subsite::get_element -element url]shared/make-visible"
 set make_invisible_url "[subsite::get_element -element url]shared/make-invisible"
 set invisible_p [whos_online::user_invisible_p [ad_conn untrusted_user_id]]
+
+set subsite_id [ad_conn subsite_id]
+set user_new_template [parameter::get -parameter "UserNewTemplate" -package_id $subsite_id]
+
+if {$user_new_template eq ""} {
+    set user_new_template "/packages/acs-subsite/lib/user_new"
+}
Index: openacs-4/packages/acs-subsite/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-subsite/www/register/index.adp	16 Feb 2004 14:49:47 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/register/index.adp	6 May 2007 06:58:40 -0000	1.19
@@ -3,5 +3,5 @@
   <property name="context">{#acs-subsite.Log_In#}</property>
   <if @header_stuff@ not nil><property name="header_stuff">@header_stuff;noquote@</property></if>
 
-<include src="/packages/acs-subsite/lib/login" return_url="@return_url;noquote@" no_frame_p="1" authority_id="@authority_id@" username="@username;noquote@" email="@email;noquote@" &="__adp_properties">
+<include src="@login_template@" return_url="@return_url;noquote@" no_frame_p="1" authority_id="@authority_id@" username="@username;noquote@" email="@email;noquote@" &="__adp_properties">
 
Index: openacs-4/packages/acs-subsite/www/register/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/www/register/index.tcl	8 Feb 2004 17:20:48 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/register/index.tcl	6 May 2007 06:58:40 -0000	1.12
@@ -8,3 +8,9 @@
     {return_url ""}
 }
 
+set subsite_id [ad_conn subsite_id]
+set login_template [parameter::get -parameter "LoginTemplate" -package_id $subsite_id]
+
+if {$login_template eq ""} {
+    set login_template "/packages/acs-subsite/lib/login"
+}
Index: openacs-4/packages/acs-subsite/www/register/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/register/user-new.adp	16 Oct 2003 21:09:45 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/register/user-new.adp	6 May 2007 06:58:40 -0000	1.17
@@ -3,4 +3,4 @@
   <property name="context">{#acs-subsite.Register#}</property>
   <property name="focus">register.email</property>
 
-<include src="/packages/acs-subsite/lib/user-new" email="@email@" return_url="@return_url;noquote@" />
+<include src="@user_new_template@" email="@email@" return_url="@return_url;noquote@" />
Index: openacs-4/packages/acs-subsite/www/register/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/www/register/user-new.tcl	17 Mar 2007 06:31:18 -0000	1.21
+++ openacs-4/packages/acs-subsite/www/register/user-new.tcl	6 May 2007 06:58:40 -0000	1.22
@@ -10,4 +10,11 @@
 set registration_url [parameter::get -parameter RegistrationRedirectUrl]
 if {$registration_url ne ""} {
     ad_returnredirect [export_vars -base "$registration_url" -url {return_url email}]
-}
\ No newline at end of file
+}
+
+set subsite_id [ad_conn subsite_id]
+set user_new_template [parameter::get -parameter "UserNewTemplate" -package_id $subsite_id]
+
+if {$user_new_template eq ""} {
+    set user_new_template "/packages/acs-subsite/lib/user-new"
+}
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	30 Nov 2004 11:17:54 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	6 May 2007 06:58:40 -0000	1.13
@@ -8,4 +8,4 @@
   <div class="general-message">@message@</div>
 </if>
 
-<include src="/packages/acs-subsite/lib/user-info" user_id="@user_id@" return_url="@return_url;noquote@" &="__adp_properties" edit_p="@edit_p@" message="@message;noquote@">
+<include src="@user_new_template@" user_id="@user_id@" return_url="@return_url;noquote@" &="__adp_properties" edit_p="@edit_p@" message="@message;noquote@">
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	10 Jan 2007 21:22:10 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	6 May 2007 06:58:40 -0000	1.11
@@ -22,3 +22,10 @@
 
 set focus {}
 
+set subsite_id [ad_conn subsite_id]
+set user_new_template [parameter::get -parameter "UserNewTemplate" -package_id $subsite_id]
+
+if {$user_new_template eq ""} {
+    set user_new_template "/packages/acs-subsite/lib/user_new"
+}
+