Index: openacs-4/packages/ecommerce/www/admin/customer-reviews/index-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-reviews/index-2.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/customer-reviews/index-2.adp	18 Aug 2008 11:41:43 -0000	1.1
@@ -0,0 +1,12 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<if @review_count@ gt 0>
+  <ul>
+    @doc_body;noquote@
+  </ul>
+</if><else>
+  <p>No reviews found.</p>
+</else>
Index: openacs-4/packages/ecommerce/www/admin/customer-reviews/index-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-reviews/index-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/customer-reviews/index-2.tcl	9 Mar 2004 00:59:46 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/customer-reviews/index-2.tcl	18 Aug 2008 11:41:43 -0000	1.4
@@ -1,5 +1,4 @@
 # index-2.tcl
-
 ad_page_contract {
     @param approved_p:optional
     @param product_id:optional
@@ -15,48 +14,36 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set page_title ""
-set navbar ""
+set page_title "Customer Reviews"
+
 set query_end ""
 if { [info exists approved_p] } {
     if { $approved_p == "null" } {
-	set review_status "Not Yet Approved/Disapproved"
-	set query_end "and approved_p is null"
+        set review_status "Not Yet Approved/Disapproved"
+        set query_end "and approved_p is null"
     } elseif { $approved_p == "t" } {
-	set review_status "Approved"
-	set query_end "and approved_p='t'"
+        set review_status "Approved"
+        set query_end "and approved_p='t'"
     } elseif { $approved_p == "f" } {
-	set review_status "Disapproved"
-	set query_end "and approved_p='f'"
+        set review_status "Disapproved"
+        set query_end "and approved_p='f'"
     } else {
-	set review_status ""
-	set query_end ""
+        set review_status ""
+        set query_end ""
     }
 
-    set page_title "$review_status Reviews"
-    set navbar [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Reviews"] "$review_status Reviews"]
+    set title "$review_status Reviews"
+    set context [list [list index "Customer Reviews"] $title]
     set return_url "index-2.tcl?[export_url_vars approved_p]"
 
 } elseif { [info exists product_id] } {
     set product_name [ec_product_name $product_id]
-    set page_title $product_name
-    set navbar [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "../products/index.tcl" "Products"] [list "../products/one.tcl?product_id=$product_id" "One"] "Customer Reviews"]
+    set title $product_name
+    set context [list [list "../products/index.tcl" "Products"] [list "../products/one.tcl?product_id=$product_id" "One"] [list index "Customer Reviews"] $title]
     set query_end "and p.product_id=:product_id"
     set return_url "index-2.tcl?[export_url_vars product_id]"
-}
+} 
 
-
-append doc_body "[ad_admin_header $page_title]
-
-<h2>$page_title</h2>
-
-$navbar
-
-<hr>
-
-<ul>
-"
-
 # Set audit variables
 # audit_id_column, return_url, audit_tables, main_tables
 set audit_id_column "comment_id"
@@ -68,48 +55,35 @@
 where c.product_id = p.product_id
 and c. user_id = u.user_id 
 $query_end
-order by c.comment_date desc
-"
+order by c.comment_date desc"
 
+set review_count 0
 db_foreach get_customer_reviews $sql {
-    
+    incr review_count
     append doc_body "<li>[util_AnsiDatetoPrettyDate $comment_date]<br>
     <a href=\"../products/one?[export_url_vars product_id]\">$product_name</a><br>
     <a href=\"[ec_acs_admin_url]users/one?[export_url_vars user_id]\">$email</a> [ec_display_rating $rating]<br>
     <b>$one_line_summary</b><br>
-    [ns_quotehtml $user_comment]
-    <br>
-    "
+    [ns_quotehtml $user_comment]<br>"
 
     if { [info exists product_id] } {
-	# then we don't know a priori whether this is an approved review
-	append doc_body "<b>Review Status: "
-	if { $approved_p == "t" } {
-	    append doc_body "Approved</b><br>"
-	} elseif { $approved_p == "f" } {
-	    append doc_body "Disapproved</b><br>"
-	} else {
-	    append doc_body "Not yet Approved/Disapproved</b><br>"
-	}
+        # then we don't know a priori whether this is an approved review
+        append doc_body "<b>Review Status: "
+        if { $approved_p == "t" } {
+            append doc_body "Approved</b><br>"
+        } elseif { $approved_p == "f" } {
+            append doc_body "Disapproved</b><br>"
+        } else {
+            append doc_body "Not yet Approved/Disapproved</b><br>"
+        }
     }
 
     # Set audit variables
-    # audit_name, audit_id
     set audit_name "Customer Review $one_line_summary"
     set audit_id $comment_id
 
-    append doc_body "\[<a href=\"approval-change?approved_p=t&[export_url_vars comment_id return_url]\">Approve</a> | <a href=\"approval-change?approved_p=f&[export_url_vars comment_id return_url]\">Disapprove</a> | <a href=\"[ec_url_concat [ec_url] /admin]/audit?[export_url_vars audit_name audit_id audit_id_column return_url audit_tables main_tables]\">Audit Trail</a>\]
-    <p>
-    "
-} if_no_rows {
-    append doc_body "No reviews were found.\n"
+    append doc_body "\[<a href=\"approval-change?approved_p=t&[export_url_vars comment_id return_url]\">Approve</a> | <a href=\"approval-change?approved_p=f&[export_url_vars comment_id return_url]\">Disapprove</a> | <a href=\"[ec_url_concat [ec_url] /admin]/audit?[export_url_vars audit_name audit_id audit_id_column return_url audit_tables main_tables]\">Audit Trail</a>\]</li>"
 } 
 
 db_release_unused_handles
 
-append doc_body "</ul>
-
-[ad_admin_footer]
-"
-
-doc_return  200 text/html $doc_body
Index: openacs-4/packages/ecommerce/www/admin/customer-reviews/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-reviews/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/customer-reviews/index.adp	18 Aug 2008 11:41:43 -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 @requires_approval@ true>
+  <p>Comments must be approved before they will appear on the web site.</p>
+</if><else>
+<p>The ecommerce system is set up so that user's comments about products automatically appear
+on the web site, unless you specifically Disapprove them.  Even though
+it is not necessary, you may also wish to specifically Approve comments
+so that you can distinguish them from comments that you have not yet
+looked at.</p>
+</else>
+
+  <ul>
+    @approved_reviews_html;noquote@
+    <li><a href=\"@audit_url;noquote@\">Audit All Customer Reviews</a></li>
+  </ul>
Index: openacs-4/packages/ecommerce/www/admin/customer-reviews/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-reviews/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/customer-reviews/index.tcl	9 Mar 2004 00:59:46 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/customer-reviews/index.tcl	18 Aug 2008 11:41:43 -0000	1.5
@@ -1,5 +1,4 @@
-# index.tcl<2>
-
+# index.tcl
 ad_page_contract {
     @author
     @creation-date
@@ -10,64 +9,36 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-append doc_body "[ad_admin_header "Customer Reviews"]
+set title "Customer Reviews"
+set context [list $title]
 
-<h2>Customer Reviews</h2>
+set requires_approval [parameter::get -package_id [ec_id] -parameter ProductCommentsNeedApprovalP -default 1]
 
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] "Customer Reviews"]
-
-<hr>
-"
-
-if {[ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP ecommerce]} {
-    append doc_body "Comments must be approved before they will appear on the web site."
-} else {
-    append doc_body "Your ecommerce system is set up so that comments automatically appear on the web site, unless you specifically Disapprove them.  Even though it's not necessary, you may also wish to specifically Approve comments so that you can distinguish them from comments that you have not yet looked at."
-}
-
-append doc_body "
-<ul>
-"
-
-
-
 set sql "select approved_p, count(*) as n_reviews
 from ec_product_comments
 group by approved_p
 order by approved_p desc"
 
+set approved_reviews_html ""
 db_foreach get_approved_reviews $sql {
-    
     if [empty_string_p $approved_p] {
-	set passthrough_approved_p "null"
-	set anchor_value "Not Yet Approved/Disapproved Customer Reviews"
+        set passthrough_approved_p "null"
+        set anchor_value "Not Yet Approved/Disapproved Customer Reviews"
     } elseif { $approved_p == "t" } {
-	set passthrough_approved_p "t"
-	set anchor_value "Approved Reviews"
+        set passthrough_approved_p "t"
+        set anchor_value "Approved Reviews"
     } elseif { $approved_p == "f" } {
-	set passthrough_approved_p "f"
-	set anchor_value "Disapproved Reviews"
+        set passthrough_approved_p "f"
+        set anchor_value "Disapproved Reviews"
     } else {
-	ns_log Error "[ec_url_concat [ec_url] /admin]/customer-reviews/index.tcl found unrecognized approved_p value of \"$approved_p\""
-	# note that we'll probably also get a Tcl error below
+        ns_log Error "[ec_url_concat [ec_url] /admin]/customer-reviews/index.tcl found unrecognized approved_p value of \"$approved_p\""
+        # note that we'll probably also get a Tcl error below
     }
-    append doc_body "<li><a href=\"index-2?approved_p=$passthrough_approved_p\">$anchor_value</a> ($n_reviews)\n\n<p>\n\n"
+    append approved_reviews_html "<li><a href=\"index-2?approved_p=$passthrough_approved_p\">$anchor_value</a> ($n_reviews)</li>\n"
 }
 
-db_release_unused_handles
-
 set table_names_and_id_column [list ec_product_comments ec_product_comments_audit comment_id]
 
-append doc_body "
+set audit_url "[ec_url_concat [ec_url] /admin]/audit-tables?[export_url_vars table_names_and_id_column]"
 
-<p>
-
-<li><a href=\"[ec_url_concat [ec_url] /admin]/audit-tables?[export_url_vars table_names_and_id_column]\">Audit All Customer Reviews</a>
-
-</ul>
-
-[ad_admin_footer]
-"
-
-
-doc_return  200 text/html $doc_body
+db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/admin/customer-reviews/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-reviews/one.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/customer-reviews/one.adp	18 Aug 2008 11:41:43 -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>
+On @comment_date_html;noquote@<br>
+about: @product_link_html;noquote@<br>
+by: @user_link_html;noquote@<br>
+rating: @rating_html;noquote@<br> 
+summary: @one_line_summary@<br>
+comments: @user_comment@</p>
+<p>@doc_body;noquote@</p>
Index: openacs-4/packages/ecommerce/www/admin/customer-reviews/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-reviews/one.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/customer-reviews/one.tcl	9 Mar 2004 00:59:46 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/customer-reviews/one.tcl	18 Aug 2008 11:41:43 -0000	1.4
@@ -12,17 +12,9 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-append doc_body "[ad_admin_header "One Review"]
+set title "One Review"
+set context [list [list index "Customer Reviews"] $title]
 
-<h2>One Review</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Reviews"] "One Review"]
-
-<hr>
-<blockquote>
-"
-
-
 if { ![db_0or1row get_product_info "select c.product_id, c.user_id, c.user_comment, c.one_line_summary, c.rating, p.product_name, u.email, c.comment_date, c.approved_p
 from ec_product_comments c, ec_products p, cc_users u
 where c.product_id = p.product_id
@@ -31,32 +23,21 @@
     ad_return_complaint 1 "Invalid Comment ID passed in"
 }
 
+set comment_date_html [util_AnsiDatetoPrettyDate $comment_date]
+set product_link_html "<a href=\"../products/one?[export_url_vars product_id]\">$product_name</a>"
+set user_link_html "<a href=\"[ec_acs_admin_url]users/one?[export_url_vars user_id]\">$email</a>"
+set rating_html "[ec_display_rating $rating]"
 
-
-append doc_body "[util_AnsiDatetoPrettyDate $comment_date]<br>
-<a href=\"../products/one?[export_url_vars product_id]\">$product_name</a><br>
-<a href=\"[ec_acs_admin_url]users/one?[export_url_vars user_id]\">$email</a> [ec_display_rating $rating]<br>
-<b>$one_line_summary</b><br>
-$user_comment
-<br>
-"
-
+set doc_body ""
 if { [info exists product_id] } {
     # then we don't know a priori whether this is an approved review
     append doc_body "<b>Review Status: "
     if { $approved_p == "t" } {
-	append doc_body "Approved</b><br>"
+        append doc_body "Approved</b><br>"
     } elseif { $approved_p == "f" } {
-	append doc_body "Disapproved</b><br>"
+        append doc_body "Disapproved</b><br>"
     } else {
-	append doc_body "Not yet Approved/Disapproved</b><br>"
+        append doc_body "Not yet Approved/Disapproved</b><br>"
     }
 }
-
-append doc_body "\[<a href=\"approval-change?approved_p=t&[export_url_vars comment_id return_url]\">Approve</a> | <a href=\"approval-change?approved_p=f&[export_url_vars comment_id return_url]\">Disapprove</a>\]
-
-</blockquote>
-[ad_admin_footer]
-"
- 
-doc_return  200 text/html $doc_body
+append doc_body "\[<a href=\"approval-change?approved_p=t&[export_url_vars comment_id return_url]\">Approve</a> | <a href=\"approval-change?approved_p=f&[export_url_vars comment_id return_url]\">Disapprove</a>\]"