Index: openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.adp	21 Jul 2005 22:10:24 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.adp	20 Dec 2005 15:40:51 -0000	1.2
@@ -1,4 +1,7 @@
 <master>
   <property name="title">@title@</property>
-  
+@template@<br />
+<#Sent_sent_when Sent: @sent_when@#>  <br />
+
 <include src="/packages/dotlrn/lib/member-email" community_id="@community_id@" type="@type@" return_url="@return_url@" enabled_p="t" &="extra_vars" />
+
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.tcl	13 Sep 2005 14:57:56 -0000	1.6
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.tcl	20 Dec 2005 15:40:51 -0000	1.7
@@ -63,4 +63,6 @@
     set title "Add/edit Section email template"
 }
 
+set template [dotlrn_ecommerce::email_type_pretty -type $type]
+set sent_when [dotlrn_ecommerce::email_type_sent_when -type $type] 
 set extra_vars [list [list action $action] [list section_id $section_id]]
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/email-templates.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/email-templates.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/email-templates.adp	20 Dec 2005 15:40:51 -0000	1.1
@@ -0,0 +1,4 @@
+<master>
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+<include src="/packages/dotlrn-ecommerce/lib/email-templates" community_id="@community_id@" course_name="@course_name@" return_url="@return_url@">
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/email-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/email-templates.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/email-templates.tcl	20 Dec 2005 15:40:51 -0000	1.1
@@ -0,0 +1,26 @@
+ad_page_contract {
+    Show email templates list
+} {
+    {community_id:integer ""}
+}
+if {$community_id ne ""} {
+    if {[db_0or1row get_section_info "select ds.section_id, ('Section:' || ds.section_name || case when ds.section_name = dc.course_name then '' else '(' || dc.course_name || ')' end ) as course_name from dotlrn_ecommerce_section ds, dotlrn_catalogx dc where ds.community_id=:community_id and ds.course_id=dc.item_id limit 1"]} {
+	set community_url [export_vars -base one-section {section_id}]
+    } elseif {[db_0or1row get_course_info "select course_id, 'Course:' || course_name as course_name from dotlrn_catalogx, cr_items where live_revision=revision_id and community_id=:community_id"]} {
+	set community_url [export_vars -base course-info {course_id}]
+    } else {
+	ns_returnnotfound
+    }
+    
+} else {
+    set course_name ""
+}
+
+set return_url [ad_return_url]
+set title "Email Templates"
+if {[info exists community_url]} {
+    set context [list [list $community_url $course_name] $title]
+} else {
+    set context [list $title]
+}
+ad_return_template
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/email-test.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/email-test.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/email-test.adp	20 Dec 2005 15:40:51 -0000	1.1
@@ -0,0 +1,7 @@
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
+
+#dotlrn-ecommerce.lt_Test_email_sent_to_user#
+
+#dotlrn-ecommerce.Return_to_where#
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/email-test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/email-test.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/admin/email-test.tcl	19 Dec 2005 02:37:10 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/email-test.tcl	20 Dec 2005 15:40:51 -0000	1.2
@@ -8,6 +8,8 @@
     return_url
 }
 acs_user::get -user_id [ad_conn user_id] -array user
+
 set email_data [dotlrn_community::send_member_email -community_id $community_id -type $type -to_user $user(user_id)]
 
-ad_returnredirect -message "Test email send to $user(email)" $return_url
\ No newline at end of file
+set page_title "[_ dotlrn-ecommerce.Test_email_sent]"
+set context [list $page_title]