Index: openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	16 Jul 2005 12:51:06 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	16 Jul 2005 14:23:51 -0000	1.3
@@ -56,4 +56,21 @@
 	-body [subst "[_ dotlrn-ecommerce.lt_Your_application_to_j]"]
 }
 
+# Send email to applicant
+set actor_id [ad_conn user_id]
+
+if { $user_id != $actor_id } {
+    set applicant_email [cc_email_from_party $user_id]
+    set actor_email [cc_email_from_party $actor_id]
+    set community_name [dotlrn_community::get_community_name $community_id]
+
+#    set application_url [ad_url]/[apm_package_url_from_key dotlrn-ecommerce]ecommerce/prerequisite-confirm
+
+    acs_mail_lite::send \
+	-to_addr $applicant_email \
+	-from_addr $actor_email \
+	-subject [subst "[_ dotlrn-ecommerce.Application_approved]"] \
+	-body [subst "[_ dotlrn-ecommerce.lt_Your_application_to_j]"]
+}
+
 ad_returnredirect applications
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/application-approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/application-approve.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/admin/application-approve.tcl	16 Jul 2005 12:51:06 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/application-approve.tcl	16 Jul 2005 14:23:52 -0000	1.3
@@ -18,4 +18,4 @@
 
 dotlrn_community::membership_approve -community_id $community_id -user_id $user_id
 
-ad_returnredirect applications
+ad_returnredirect ../applications
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/application-reject.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/application-reject.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/admin/application-reject.tcl	16 Jul 2005 12:51:06 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/application-reject.tcl	16 Jul 2005 14:23:52 -0000	1.3
@@ -18,4 +18,4 @@
 
 dotlrn_community::membership_reject -community_id $community_id -user_id $user_id
 
-ad_returnredirect applications
+ad_returnredirect ../applications
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp	16 Jul 2005 12:51:06 -0000	1.7
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp	16 Jul 2005 14:23:52 -0000	1.8
@@ -22,13 +22,13 @@
 <h2>Administrative Setup</h2>
 
 <ul>
-<if @scholarship_installed_p@ eq "1"><li><a href=/dotlrn-ecommerce/Administration/sch/>Scholarship Funds</a></if>
-<if @expenses_installed_p@ eq "1"><li><a href="/dotlrn-ecommerce/Administration/expenses/admin/">Expenses</a></if>
+<if @scholarship_installed_p@ eq "1"><li><a href=../Administration/sch/>Scholarship Funds</a></if>
+<if @expenses_installed_p@ eq "1"><li><a href="../Administration/expenses/admin/">Expenses</a></if>
 <li>Instructors - <a href=@instructor_community_url@>Community</a> <a href=@instructor_community_url@/members>List</a>
 <li>Assistant Instuctors - <a href=@assistant_community_url@>Community</a> <a href=@assistant_community_url@/members>List</a>
-<li><a href="/dotlrn-ecommerce/Administration/categories/cadmin">Manage Category Trees</a>
+<li><a href="../Administration/categories/cadmin">Manage Category Trees</a>
 <li><a href="../applications">Pending Applications</a>
-
+<li><a href="@relationships_category_url;noquote@">Manage Relationship Types</a>
 </ul>
 
 <h2 class="page-title">System Setup</h2>
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl	16 Jul 2005 12:51:06 -0000	1.7
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl	16 Jul 2005 14:23:52 -0000	1.8
@@ -97,4 +97,7 @@
 set registration_assessment_id [parameter::get -parameter RegistrationId -package_id [subsite::main_site_id]]
 if { ! [empty_string_p $registration_assessment_id] } {
     set registration_assessment_url [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]asm-admin/one-a" { {assessment_id $registration_assessment_id} return_url }]
-}
\ No newline at end of file
+}
+
+set tree_id [parameter::get -parameter PatronRelationshipCategoryTree]
+set relationships_category_url [export_vars -base ../Administration/categories/cadmin/tree-view { tree_id }]
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/login.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/login.adp	30 Jun 2005 11:48:45 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/login.adp	16 Jul 2005 14:23:52 -0000	1.2
@@ -3,7 +3,7 @@
   <property name="context">{#acs-subsite.Log_In#}</property>
   <if @header_stuff@ not nil><property name="header_stuff">@header_stuff;noquote@</property></if>
   
-  <h3>Registering for classes with @service_name@ is quick and easy</h3>
+  <h3>#dotlrn-ecommerce.lt_Registering_for_class#</h3>
   <p />
 
   <include src="/packages/dotlrn-ecommerce/lib/login" 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/dotlrn-ecommerce/www/ecommerce/participant-change-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change-2.tcl	16 Jul 2005 12:51:07 -0000	1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change-2.tcl	16 Jul 2005 14:23:52 -0000	1.4
@@ -44,7 +44,6 @@
 
 set rel_id [relation::get_id -object_id_one $patron_id -object_id_two $user_id -rel_type "patron_rel"]
 set add_url [export_vars -base "shopping-cart-add" { product_id {user_id $patron_id} {participant_id $user_id} return_url }]
-	
 if { ![empty_string_p $rel_id] || $user_id == $patron_id } {
     if { $new_user_p } {
 	ad_returnredirect $add_url
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.tcl	16 Jul 2005 12:51:07 -0000	1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.tcl	16 Jul 2005 14:23:52 -0000	1.4
@@ -32,6 +32,14 @@
 	where product_id = :product_id
     }
 
+if { [exists_and_not_null product_id] } {
+#     db_1row order {
+# 	select user_id,
+# 	participant_id
+# 	from dotlrn_ecommerce_orders
+# 	where item_id = :item_id
+#     }
+    
     template::list::create \
 	-name "relations" \
 	-multirow "relations" \