Index: openacs-4/packages/ecommerce/www/admin/problems/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/problems/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/problems/index.adp	18 Aug 2008 12:11:29 -0000	1.1
@@ -0,0 +1,20 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<if @display_all@ nil>
+  <p><b>Unresolved Problems</b> (@unresolved_problem_count@) | 
+  <a href="index?display_all=true">All Problems</a> (@problem_count@)</p>
+</if><else>
+  <p><a href="index">Unresolved Problems</a> (@unresolved_problem_count@) | 
+  <b>All Problems</b> (@problem_count@)</p>
+</else>
+
+<if problem_count gt 0>
+<ul>
+  @problem_select_html;noquote@
+</ul>
+</if><else>
+  <p>No problems reported.</p>
+</else>
Index: openacs-4/packages/ecommerce/www/admin/problems/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/problems/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/problems/index.tcl	9 Mar 2004 00:59:51 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/problems/index.tcl	18 Aug 2008 12:11:29 -0000	1.5
@@ -15,13 +15,9 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "
-    [ad_admin_header "Potental Problems"]
-    <h2>Potential Problems</h2>
+set title "Potential Problems"
+set context [list $title]
 
-    [ad_context_bar [list "[ec_url_concat [ec_url] /admin]/" Ecommerce([ec_system_name])] "Potential Problems"]
-   <hr>"
-
 set problem_count [db_string problem_count "
     select count(*) 
     from ec_problems_log"]
@@ -31,45 +27,29 @@
 
 if { ![info exists display_all] } {
     set sql_clause [db_map include_resolved_date]
-    doc_body_append "
-        <p><b>Unresolved Problems</b> <font size=-1>($unresolved_problem_count)</font> | <a href=\"index?display_all=true\">
-           All Problems</a> <font size=-1>($problem_count)</font></p>"
 } else {
     set sql_clause ""
-    doc_body_append "
-    	<p><a href=\"index\">Unresolved Problems</a> <font size=-1>($unresolved_problem_count)</font> | 
-           <b>All Problems</b> <font size=-1>($problem_count)</font></p>"
 }
 
-doc_body_append "<ul>"
-
-db_foreach problems_select "
-    select l.*, u.first_names || ' ' || u.last_name as user_name
+set problem_select_html ""
+db_foreach problems_select "select l.*, u.first_names || ' ' || u.last_name as user_name
     from ec_problems_log l, cc_users u
     where l.resolved_by = u.user_id(+)
     $sql_clause
     order by problem_date asc" {
 
-     doc_body_append "
-        <li>[util_AnsiDatetoPrettyDate $problem_date] ("
+     append problem_select_html "<li>[util_AnsiDatetoPrettyDate $problem_date] ("
 
      if { ![empty_string_p $order_id] } {
-	 doc_body_append "order #<a href=\"[ec_url_concat [ec_url] /admin]/orders/one?[export_url_vars order_id]\">$order_id</a> | "
+         append problem_select_html "order #<a href=\"[ec_url_concat [ec_url] /admin]/orders/one?[export_url_vars order_id]\">$order_id</a> | "
      }
 
      if { [empty_string_p $resolved_date] } {
-	 doc_body_append "<a href=\"resolve?[export_url_vars problem_id]\">mark resolved</a>"
+         append problem_select_html "<a href=\"resolve?[export_url_vars problem_id]\">mark resolved</a>"
      } else {
-	 doc_body_append "resolved by [ec_admin_present_user $resolved_by $user_name] on [util_AnsiDatetoPrettyDate $resolved_date]"
+         append problem_select_html "resolved by [ec_admin_present_user $resolved_by $user_name] on [util_AnsiDatetoPrettyDate $resolved_date]"
      }
 
-     doc_body_append ")
-    	<p>$problem_details</p>
-	</li>"
+     append problem_select_html ") <p>$problem_details</p></li>"
 }
 
-doc_body_append "
-   </ul>
-   [ad_admin_footer]"
-
-
Index: openacs-4/packages/ecommerce/www/admin/problems/resolve.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/problems/resolve.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/problems/resolve.adp	18 Aug 2008 12:11:29 -0000	1.1
@@ -0,0 +1,17 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p>Confirm that the problem is resolved.</p>
+
+<form method=post action="resolve-2">
+  @export_form_vars_html;noquote@
+  <p>
+  @problem_date_html;noquote@
+  </p><p>
+  @problem_details@
+ <center>
+  <input type=submit value="Problem is resolved">
+ </center>
+</form>
Index: openacs-4/packages/ecommerce/www/admin/problems/resolve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/problems/resolve.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/problems/resolve.tcl	9 Mar 2004 00:59:51 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/problems/resolve.tcl	18 Aug 2008 12:11:29 -0000	1.4
@@ -17,30 +17,9 @@
 
 db_release_unused_handles
 
-doc_return  200 text/html "[ad_admin_header "Confirm the Problem is Resolved"]
+set title "Confirm the Problem is Resolved"
+set context [list [list index "Potential Problems"] $title]
 
-<h2>Confirm that Problem is Resolved</h2>
+set export_form_vars_html [export_form_vars problem_id]
+set problem_date_html [util_AnsiDatetoPrettyDate $problem_date]
 
-[ad_context_bar [list "[ec_url_concat [ec_url] /admin]/" Ecommerce([ec_system_name])] [list "index.tcl" "Potential Problems"] "Confirm Resolve Problem"]
-
-<hr>
-
-<form method=post action=\"resolve-2\">
-[export_form_vars problem_id]
-<blockquote>
-
-<p>
-<blockquote>
-[util_AnsiDatetoPrettyDate $problem_date]
-<p>
-$problem_details
-</blockquote>
-<center>
-<input type=submit value=\"Yes, it is resolved\">
-</center>
-
-</blockquote>
-</form>
-
-[ad_admin_footer]
-"
Index: openacs-4/packages/ecommerce/www/admin/searches/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/searches/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/searches/index.adp	18 Aug 2008 12:17:27 -0000	1.1
@@ -0,0 +1,8 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<table><tr><th>Term</th><th>Count</th></tr>
+  @search_summary_html;noquote@
+</table>
Index: openacs-4/packages/ecommerce/www/admin/searches/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/searches/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/searches/index.tcl	15 Mar 2004 16:12:07 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/searches/index.tcl	18 Aug 2008 12:17:27 -0000	1.2
@@ -1,6 +1,6 @@
 ad_page_contract {
 
-    Main admin page for a single product.
+    Search history
 
     @author Alfred Werner (alfred@thunderstick.com)
     @creation-date Mar 2004
@@ -11,38 +11,16 @@
 
 ad_require_permission [ad_conn package_id] admin
 
+set title "Search History"
+set context [list $title]
 
-
-doc_body_append "
-    [ad_admin_header "Search History"]
-
-    <h2>Search History</h2>
-    
-    [ad_context_bar [list "../" "Ecommerce([ec_system_name])"]  "Search Results"]
-
-    "
-
-doc_body_append "<table><tr><th>Term</th><th>Count</th></tr>"
-db_foreach search_summary "        SELECT count(search_text) as num_searches, search_text
+set search_summary_html ""
+db_foreach search_summary "SELECT count(search_text) as num_searches, search_text
         FROM ec_user_session_info
         WHERE search_text is not null and length(trim(search_text)) > 0
         GROUP BY search_text
-        ORDER BY count(search_text) desc;
- " {
+        ORDER BY count(search_text) desc" {
 
-
-doc_body_append "
-<tr>
-  <td>
-    $search_text
-  </td>
-  <td>
-    $num_searches
-  </td>
-</tr>
-"
-
+        append search_summary_html "<tr><td>$search_text</td><td>$num_searches</td></tr>\n"
 }
-doc_body_append "</table>"
 
-doc_body_append [ad_admin_footer]