Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/mailing-lists/index.adp	19 Aug 2008 11:29:03 -0000	1.1
@@ -0,0 +1,13 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<h3>Mailing Lists with Users</h3>
+  @mailing_list_widget_html;noquote@
+
+<h3>All Mailing Lists</h3>
+<form method=post action=one>
+  @category_widget_html;noquote@
+  <input type=submit value=\"Go\">
+</form>
Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/mailing-lists/index.tcl	9 Mar 2004 00:59:49 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/mailing-lists/index.tcl	19 Aug 2008 11:29:03 -0000	1.4
@@ -6,32 +6,9 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set page_html "[ad_admin_header "Mailing Lists"]
+set title "Mailing Lists"
+set context [list $title]
 
-<h2>Mailing Lists</h2>
+set mailing_list_widget_html "[ec_mailing_list_widget "f"]"
 
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] "Mailing Lists"]
-
-<hr>
-
-<h3>Mailing Lists with Users</h3>
-"
-
-
-
-append page_html "[ec_mailing_list_widget "f"]
-
-<h3>All Mailing Lists</h3>
-
-<blockquote>
-<form method=post action=one>
-
-[ec_category_widget]
-<input type=submit value=\"Go\">
-</form>
-
-</blockquote>
-
-[ad_admin_footer]
-"
-doc_return  200 text/html $page_html
+set category_widget_html "[ec_category_widget]"
Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.adp	19 Aug 2008 11:29:03 -0000	1.1
@@ -0,0 +1,19 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+ <if @last_name_p@ true>
+  <h3>Users whose last name contains '@last_name@':</h3>
+</if><else>
+  <h3>Users whose email contains '@email@':</h3>
+</else>
+<if @user_counter@ gt 0>
+  <ul>
+    @user_info_html;noquote@
+  </ul>
+  <p>Click on a name to add user to the mailing list.</p>
+</if><else>
+  <p>No users found.</p>
+</else>
+
Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.tcl	9 Mar 2004 00:59:49 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.tcl	19 Aug 2008 11:29:04 -0000	1.5
@@ -1,4 +1,3 @@
-
 ad_page_contract {
     @param category_id the category of the item
     @param subcategory_id the id of the subcategory
@@ -18,49 +17,26 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set page_html "[ad_admin_header "Add Member to this Mailing List"]
+set title "Add Member to this Mailing List"
+set context [list [list index "Mailing Lists"] $title]
 
-<h2>Add Member to this Mailing List</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Mailing Lists"] "Add Member" ] 
-
-<hr>
-"
-
-
 if { [info exists last_name] } {
     set u_last_name %[string toupper $last_name]%
-    append page_html "<h3>Users whose last name contains '$last_name':</h3>\n"
     set last_bit_of_query "upper(last_name) like :u_last_name"
+    set last_name_p 1
 } else {
     set l_email %[string tolower $email]%
-    append page_html "<h3>Users whose email contains '$email':</h3>\n"
     set last_bit_of_query "email like :l_email"
+    set last_name_p 0
 }
 
-append page_html "<ul>
-"
-
 set user_counter 0
-db_foreach get_user_info "
-select user_id, first_names, last_name, email
+set user_info_html ""
+db_foreach get_user_info "select user_id, first_names, last_name, email
   from cc_users
- where $last_bit_of_query
-" {
-
-    append page_html "<li><a href=\"member-add-2?[export_url_vars user_id category_id subcategory_id subsubcategory_id]\">$first_names $last_name</a> ($email)\n"
+ where $last_bit_of_query" {
+    append user_info_html "<li><a href=\"member-add-2?[export_url_vars user_id category_id subcategory_id subsubcategory_id]\">$first_names $last_name</a> ($email)</li>\n"
     incr user_counter
 } 
 
-if { $user_counter == 0 } {
-    append page_html "No such users were found.\n</ul>\n"
-} else {
-    append page_html "</ul>\n<p>Click on a name to add them to the mailing list.\n"
-}
-
 db_release_unused_handles
-
-append page_html "[ad_admin_footer]
-"
-doc_return  200 text/html $page_html
-
Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/member-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/member-remove.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/mailing-lists/member-remove.adp	19 Aug 2008 11:29:04 -0000	1.1
@@ -0,0 +1,13 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p>Are you sure you want to remove this user from this mailing list?</p>
+
+<form method=post action=member-remove-2>
+  @export_form_vars_html;noquote@
+<center>
+  <input type=submit value="Confirm">
+</center>
+</form>
Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/member-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/member-remove.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/mailing-lists/member-remove.tcl	9 Mar 2004 00:59:49 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/mailing-lists/member-remove.tcl	19 Aug 2008 11:29:04 -0000	1.4
@@ -1,5 +1,4 @@
 # member-remove.tcl
-
 ad_page_contract {  
     @param category_id
     @param subcategory_id:optional
@@ -19,28 +18,7 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-append doc_body "[ad_admin_header "Confirm Removal"]
+set title "Confirm Removal"
+set context [list [list index "Mailing Lists"] $title]
 
-<h2>Confirm Removal</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Mailing Lists"] "Confirm Removal"]
-
-<hr>
-
-Please confirm that you wish to remove this user from this mailing list.
-
-<form method=post action=member-remove-2>
-[export_form_vars category_id subcategory_id subsubcategory_id user_id]
-<center>
-<input type=submit value=\"Confirm\">
-</center>
-</form>
-
-[ad_admin_footer]
-"
-
-
-
-doc_return  200 text/html $doc_body
-
-
+set export_form_vars_html [export_form_vars category_id subcategory_id subsubcategory_id user_id]
Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/one.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/mailing-lists/one.adp	19 Aug 2008 11:29:04 -0000	1.1
@@ -0,0 +1,26 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<h3>Members</h3>
+<if @users_count@ gt 0>
+<ul>
+  @user_info_html;noquote@
+</ul>
+</if><else>
+<p>None.</p>
+</else>
+<br>
+<h3>Add a Member</h3>
+<form method=post action=member-add>
+@export_form_vars_html;noquote@
+<p>By last name: <input type=text name=last_name size=30>
+<input type=submit value="Search"></p>
+</form>
+
+<form method=post action=member-add>
+@export_form_vars_html;noquote@
+<p>By email address: <input type=text name=email size=30>
+<input type=submit value="Search"></p>
+</form>
Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/one.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/mailing-lists/one.tcl	9 Mar 2004 00:59:49 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/mailing-lists/one.tcl	19 Aug 2008 11:29:04 -0000	1.4
@@ -1,5 +1,4 @@
 # one.tcl
-
 ad_page_contract {
     @author
     @creation-date
@@ -33,25 +32,14 @@
     set subsubcategory_id ""
 }
 
-
 set mailing_list_name [ec_full_categorization_display $category_id $subcategory_id $subsubcategory_id]
 
+set title "List ${mailing_list_name}"
+set context [list [list index "Mailing Lists"] $title]
 
-append doc_body "[ad_admin_header "$mailing_list_name"]
-
-<h2>$mailing_list_name</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Mailing Lists"] "One Mailing List"]
-
-<hr>
-<h3>Members</h3>
-<ul>
-"
-
 set user_query "select u.user_id, first_names, last_name
     from cc_users u, ec_cat_mailing_lists m
-    where u.user_id=m.user_id
-    "
+    where u.user_id=m.user_id"
 
 if { ![empty_string_p $subsubcategory_id] } {
     append user_query "and m.subsubcategory_id=$subsubcategory_id"
@@ -66,36 +54,12 @@
 }
 
 set sql $user_query
-
+set users_count 0
+set user_info_html
 db_foreach get_user_info $sql {
-    
-    append doc_body "<li><a href=\"[ec_acs_admin_url]users/one?user_id=$user_id\">$first_names $last_name</a> \[<a href=\"member-remove?[export_url_vars category_id subcategory_id subsubcategory_id user_id]\">remove</a>\]"
-} if_no_rows {
-    append doc_body "None"
-}
+    incr users_count
+    append user_info_html "<li><a href=\"[ec_acs_admin_url]users/one?user_id=$user_id\">$first_names $last_name</a> \[<a href=\"member-remove?[export_url_vars category_id subcategory_id subsubcategory_id user_id]\">remove</a>\]</li>"
+} 
 
+set export_form_vars_html [export_form_vars category_id subcategory_id subsubcategory_id]
 db_release_unused_handles
-
-append doc_body "</ul>
-
-<h3>Add a Member</h3>
-
-<form method=post action=member-add>
-[export_form_vars category_id subcategory_id subsubcategory_id]
-By last name: <input type=text name=last_name size=30>
-<input type=submit value=\"Search\">
-</form>
-
-<form method=post action=member-add>
-[export_form_vars category_id subcategory_id subsubcategory_id]
-By email address: <input type=text name=email size=30>
-<input type=submit value=\"Search\">
-</form>
-
-[ad_admin_footer]
-"
-
-
-
-doc_return  200 text/html $doc_body
-