Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificate-void.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificate-void.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificate-void.adp	18 Aug 2008 10:45:37 -0000	1.1
@@ -0,0 +1,11 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p>Please explain why you are voiding this gift certificate:</p>
+<form method=post action=gift-certificate-void-2>
+  @export_form_vars_html;noquote@
+  <textarea wrap name=reason_for_void rows=3 cols=50></textarea>
+  <center><input type=submit value="Continue"></center>
+</form>
Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificate-void.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificate-void.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/orders/gift-certificate-void.tcl	9 Mar 2004 00:59:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificate-void.tcl	18 Aug 2008 10:45:37 -0000	1.4
@@ -13,27 +13,8 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set page_title "Void Gift Certificate"
-doc_body_append "[ad_admin_header $page_title]
-<h2>$page_title</h2>
+set title "Void Gift Certificate"
+set context [list [list index "Orders / Shipments / Refunds"] $title]
 
-[ad_context_bar [list "../index" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "gift-certificates" "Gift Certificates"] "Void One"]
+set export_form_vars_html [export_form_vars gift_certificate_id]
 
-<hr>
-Please explain why you are voiding this gift certificate:
-
-<form method=post action=gift-certificate-void-2>
-[export_form_vars gift_certificate_id]
-
-<blockquote>
-<textarea wrap name=reason_for_void rows=3 cols=50></textarea>
-</blockquote>
-
-<center>
-<input type=submit value=\"Continue\">
-</center>
-
-</form>
-
-[ad_admin_footer]
-"
Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.adp	18 Aug 2008 10:45:37 -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 @found_p@ false>
+<p>Gift certificate not found.</p>
+</if><else>
+  <table>
+    @doc_body;noquote@
+  </table>
+</else>
Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.tcl	9 Aug 2008 10:33:13 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.tcl	18 Aug 2008 10:45:37 -0000	1.5
@@ -13,65 +13,41 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "[ad_admin_header "One Gift Certificate"]
+set title "One Gift Certificate"
+set context [list [list index "Orders / Shipments / Refunds"] $title]
 
-<h2>One Gift Certificate</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "gift-certificates" "Gift Certificates"] "One"]
-
-<hr>
-<blockquote>
-"
-
-
-
-
-
-if {![db_0or1row gift_certificate_select "
+set found_p [db_0or1row gift_certificate_select "
 select c.*, i.first_names || ' ' || i.last_name as issuer, i.user_id as issuer_user_id, p.first_names || ' ' || p.last_name as purchaser, p.user_id as purchaser_user_id, gift_certificate_amount_left(c.gift_certificate_id) as amount_left, decode(sign(sysdate-expires),1,'t',0,'t','f') as expired_p, v.first_names as voided_by_first_names, v.last_name as voided_by_last_name, o.first_names || ' ' || o.last_name as owned_by
 from ec_gift_certificates c, cc_users i, cc_users p, cc_users v, cc_users o
 where c.issued_by=i.user_id(+)
 and c.purchased_by=p.user_id(+)
 and c.voided_by=v.user_id(+)
 and c.user_id=o.user_id(+)
 and c.gift_certificate_id=:gift_certificate_id
-"]} {
-  doc_body_append "Not Found. [ad_admin_footer]"
-  return
-}
+"]
 
-doc_body_append "
-<table>
-<tr><td>Gift Certificate ID &nbsp;&nbsp;&nbsp;</td><td>$gift_certificate_id</td></tr>
-<tr><td>Amount Left</td><td>[ec_pretty_pure_price $amount_left] <font size=-1>(out of [ec_pretty_pure_price $amount])</font></td></tr>
-"
-if { ![empty_string_p $issuer_user_id] } {
-    doc_body_append "<tr><td>Issued By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$issuer_user_id\">$issuer</a> on [util_AnsiDatetoPrettyDate $issue_date]</td></tr>
+if { $found_p } {
+set doc_body ""
+    if { ![empty_string_p $issuer_user_id] } {
+        append doc_body "<tr><td>Issued By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$issuer_user_id\">$issuer</a> on [util_AnsiDatetoPrettyDate $issue_date]</td></tr>
     <tr><td>Issued To</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$user_id\">$owned_by</a></td><tr>"
-} else {
-    doc_body_append "<tr><td>Purchased By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$purchaser_user_id\">$purchaser</a> on [util_AnsiDatetoPrettyDate $issue_date]</td></tr>
-    <tr><td>Sent To</td><td>$recipient_email</td></tr>
-    "
+    } else {
+        append doc_body "<tr><td>Purchased By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$purchaser_user_id\">$purchaser</a> on [util_AnsiDatetoPrettyDate $issue_date]</td></tr>
+    <tr><td>Sent To</td><td>$recipient_email</td></tr>"
 
-    if { ![empty_string_p $user_id] } {
-	doc_body_append "<tr><td>Claimed By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$user_id\">$owned_by</a> on [util_AnsiDatetoPrettyDate $claimed_date]</td></tr>"
+        if { ![empty_string_p $user_id] } {
+            append doc_body "<tr><td>Claimed By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$user_id\">$owned_by</a> on [util_AnsiDatetoPrettyDate $claimed_date]</td></tr>"
+        }
+
     }
+    append doc_body "<tr><td>[ec_decode $expired_p "t" "Expired" "Expires"]</td><td>[ec_decode $expires "" "never" [util_AnsiDatetoPrettyDate $expires]]</td></tr>"
 
-}
-doc_body_append "<tr><td>[ec_decode $expired_p "t" "Expired" "Expires"]</td><td>[ec_decode $expires "" "never" [util_AnsiDatetoPrettyDate $expires]]</td></tr>
-"
+    if { $gift_certificate_state == "void" } {
+        append doc_body "<tr><td>Voided</td><td>[util_AnsiDatetoPrettyDate $voided_date] by <a href=\"[ec_acs_admin_url]users/one?user_id=$voided_by\">$voided_by_first_names $voided_by_last_name</a> because: $reason_for_void</td></tr>"
+    }
 
-if { $gift_certificate_state == "void" } {
-    doc_body_append "<tr><td><font color=red>Voided</font></td><td>[util_AnsiDatetoPrettyDate $voided_date] by <a href=\"[ec_acs_admin_url]users/one?user_id=$voided_by\">$voided_by_first_names $voided_by_last_name</a> because: $reason_for_void</td></tr>"
+    if { $expired_p == "f" && $amount_left > 0 && $gift_certificate_state != "void"} {
+        append doc_body "<tr><td colspan=2>(<a href=\"gift-certificate-void?[export_url_vars gift_certificate_id]\">void this</a>)</td></tr>"
+    }
 }
 
-doc_body_append "</table>"
-
-if { $expired_p == "f" && $amount_left > 0 && $gift_certificate_state != "void"} {
-    doc_body_append "<font size=-1>(<a href=\"gift-certificate-void?[export_url_vars gift_certificate_id]\">void this</a>)</font>
-    "
-}
-
-doc_body_append "</blockquote>
-[ad_admin_footer]
-"
Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.adp	18 Aug 2008 10:45:37 -0000	1.1
@@ -0,0 +1,36 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<form method=post action=gift-certificates-issued>
+  <table border=0 cellspacing=0 cellpadding=0 width=100%>
+    <tr bgcolor=ececec>
+      <td align=center><b>Rep</b></td>
+      <td align=center><b>Issue Date</b></td>
+    </tr>
+    <tr>
+      <td align=center>
+          <select name=view_rep>
+            <option value="all">All</option>
+            @customer_service_reps_select_html;noquote@
+          </select>
+          <input type=submit value="Change">
+      </td>
+      <td align=center>
+        @linked_issue_date_list_html;noquote@
+      </td>
+    </tr>
+  </table>
+</form>
+
+<if @row_counter@ gt 0>
+  <table>
+    <tr>
+      @header_html;noquote
+    </tr>
+    @gift_certificates_select_html;noquote@
+  </table>
+</if><else>
+  <center><p>None found.</p></center>
+</else>
Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.tcl	9 Aug 2008 10:33:13 -0000	1.6
+++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.tcl	18 Aug 2008 10:45:37 -0000	1.7
@@ -16,65 +16,35 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "
-    [ad_admin_header "Gift Certificate Issue History"]
+set title "Gift Certificate Issue History"
+set context [list [list index "Orders / Shipments / Refunds"] $title]
 
-    <h2>Gift Certificate Issue History</h2>
+set export_form_vars_html [export_form_vars view_issue_date order_by]
 
-    [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] "Gift Certificate Issue History"]
-
-    <hr>
-
-    <form method=post action=gift-certificates-issued>
-    [export_form_vars view_issue_date order_by]
-
-    <table border=0 cellspacing=0 cellpadding=0 width=100%>
-      <tr bgcolor=ececec>
-        <td align=center><b>Rep</b></td>
-        <td align=center><b>Issue Date</b></td>
-      </tr>
-      <tr>
-        <td align=center>
-          <select name=view_rep>
-            <option value=\"all\">All"
-
-db_foreach ec_customer_service_reps_select "
-    select user_id as rep, first_names as rep_first_names, last_name as rep_last_name
+set customer_service_reps_select_html ""
+db_foreach ec_customer_service_reps_select "select user_id as rep, first_names as rep_first_names, last_name as rep_last_name
     from ec_customer_service_reps
     order by last_name, first_names" {
 
     if { $view_rep == $rep } {
-	doc_body_append "<option value=$rep selected>$rep_last_name, $rep_first_names\n"
+        append customer_service_reps_select_html "<option value=$rep selected>$rep_last_name, $rep_first_names</option>\n"
     } else {
-	doc_body_append "<option value=$rep>$rep_last_name, $rep_first_names\n"
+        append customer_service_reps_select_html "<option value=$rep>$rep_last_name, $rep_first_names</option>\n"
     }
 }
 
-doc_body_append "
-        </select>
-      <input type=submit value=\"Change\">
-    </td>
-    <td align=center>"
-
 set issue_date_list [list [list last_24 "last 24 hrs"] [list last_week "last week"] [list last_month "last month"] [list all all]]
 
 set linked_issue_date_list [list]
-
 foreach issue_date $issue_date_list {
     if {$view_issue_date == [lindex $issue_date 0]} {
-	lappend linked_issue_date_list "<b>[lindex $issue_date 1]</b>"
+        lappend linked_issue_date_list "<b>[lindex $issue_date 1]</b>"
     } else {
-	lappend linked_issue_date_list "<a href=\"gift-certificates-issued?[export_url_vars view_rep order_by]&view_issue_date=[lindex $issue_date 0]\">[lindex $issue_date 1]</a>"
+        lappend linked_issue_date_list "<a href=\"gift-certificates-issued?[export_url_vars view_rep order_by]&view_issue_date=[lindex $issue_date 0]\">[lindex $issue_date 1]</a>"
     }
 }
 
-doc_body_append "
-    	    \[ [join $linked_issue_date_list " | "] \]
-          </td>
-        </tr>
-      </table>
-    </form>
-    <blockquote>"
+set linked_issue_date_list_html "\[ [join $linked_issue_date_list " | "] \]"
 
 if { $view_issue_date == "last_24" } {
     set issue_date_query_bit [db_map last_24]
@@ -101,53 +71,34 @@
 			 "recipient" "r.last_name, r.first_names" \
 			 "amount" "g.amount"]
 
-set table_header "
-    <table>
-      <tr>
-        <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "gift_certificate_id"]\">ID</a></b></td>
+set table_header "<td><b><a href=\"$link_beginning&order_by=[ns_urlencode "gift_certificate_id"]\">ID</a></b></td>
         <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "issue_date"]\">Date Issued</a></b></td>
         <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "issued_by"]\">Issued By</a></b></td>
         <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "recipient"]\">Recipient</a></b></td>
-        <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "amount"]\">Amount</a></b></td>
-      </tr>"
+        <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "amount"]\">Amount</a></b></td>"
 
 set row_counter 0
-
-db_foreach gift_certificates_select "
-    select g.gift_certificate_id, g.issue_date, g.amount,
+set gift_certificates_select_html ""
+db_foreach gift_certificates_select "select g.gift_certificate_id, g.issue_date, g.amount,
        g.issued_by, u.first_names, u.last_name,
        g.user_id as issued_to, r.first_names as issued_to_first_names, r.last_name as issued_to_last_name
     from ec_gift_certificates_issued g, cc_users u, cc_users r
     where g.issued_by=u.user_id and g.user_id=r.user_id
     $issue_date_query_bit $rep_query_bit
     order by $order_by_clause" {
 
-    if { $row_counter == 0 } {
-	doc_body_append $table_header
-    }
     # even rows are white, odd are grey
     if { [expr floor($row_counter/2.)] == [expr $row_counter/2.] } {
-	set bgcolor "white"
+        set bgcolor "#ffffff"
     } else {
-	set bgcolor "ececec"
+        set bgcolor "#ececec"
     }
-    doc_body_append "
-	<tr bgcolor=$bgcolor>
+    append gift_certificates_select_html "<tr bgcolor=$bgcolor>
  	  <td><a href=\"gift-certificate?[export_url_vars gift_certificate_id]\">$gift_certificate_id</a></td>
 	  <td>[ec_nbsp_if_null [util_AnsiDatetoPrettyDate $issue_date]]</td>
 	  <td>[ec_decode $last_name "" "&nbsp;" "<a href=\"[ec_acs_admin_url]users/one?user_id=$issued_by\">$last_name, $first_names</a>"]</td>
 	  <td>[ec_decode $last_name "" "&nbsp;" "<a href=\"[ec_acs_admin_url]users/one?user_id=$issued_to\">$issued_to_last_name, $issued_to_first_names</a>"]</td>
-	  <td>[ec_pretty_pure_price $amount]</td>"
+	  <td>[ec_pretty_pure_price $amount]</td></tr>"
     incr row_counter
 }
 
-if { $row_counter != 0 } {
-    doc_body_append "</table>"
-} else {
-    doc_body_append "<center>None Found</center>"
-}
-
-doc_body_append "
-    </blockquote>
-
-    [ad_admin_footer]"
Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.adp	18 Aug 2008 10:45:37 -0000	1.1
@@ -0,0 +1,33 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<form method=post action=gift-certificates>
+  @export_form_vars_html;noquote@
+  <table border=0 cellspacing=0 cellpadding=0 width=100%>
+    <tr bgcolor=#ececec>
+      <td align=center><b>Gift Certificate State</b></td>
+      <td align=center><b>Issue Date</b></td>
+    </tr>
+    <tr>
+      <td align=center><select name=view_gift_certificate_state>
+        @gift_certificate_state_list_html;noquote@
+        </select>
+        <input type=submit value=\"Change\"></td>
+      <td align=center>@linked_issue_date_list_html;noquote@
+          </td>
+    </tr>
+  </table>
+</form>
+
+<if @row_counter@ gt 0>
+    <table>
+      <tr>
+  @table_header_html;noquote@
+      </tr>
+  @gift_certificates_select_html;noquote@
+    </table>
+</if><else>
+  <center><p>None found.</p></center>
+</else>
Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.tcl	9 Aug 2008 10:33:13 -0000	1.6
+++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.tcl	18 Aug 2008 10:45:37 -0000	1.7
@@ -16,64 +16,37 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "
-    [ad_admin_header "Gift Certificate Purchase History"]
+set title "Gift Certificate Purchase History"
+set context [list [list index "Orders / Shipments / Refunds"] $title]
 
-    <h2>Gift Certificate Purchase History</h2>
+set export_form_vars_html [export_form_vars view_issue_date order_by]
 
-    [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] "Gift Certificate Purchase History"]
-
-    <hr>
-
-    <form method=post action=gift-certificates>
-    [export_form_vars view_issue_date order_by]
-
-    <table border=0 cellspacing=0 cellpadding=0 width=100%>
-      <tr bgcolor=ececec>
-        <td align=center><b>Gift Certificate State</b></td>
-        <td align=center><b>Issue Date</b></td>
-      </tr>
-      <tr>
-        <td align=center><select name=view_gift_certificate_state>"
-
 set gift_certificate_state_list [list \
 				     [list confirmed confirmed] \
 				     [list authorized authorized] \
 				     [list failed_authorization failed_authorization]]
 
+set gift_certificate_state_list_html ""
 foreach gift_certificate_state $gift_certificate_state_list {
     if {[lindex $gift_certificate_state 0] == $view_gift_certificate_state} {
-	doc_body_append "<option value=\"[lindex $gift_certificate_state 0]\" selected>[lindex $gift_certificate_state 1]"
+        append gift_certificate_state_list_html "<option value=\"[lindex $gift_certificate_state 0]\" selected>[lindex $gift_certificate_state 1]</option>"
     } else {
-	doc_body_append "<option value=\"[lindex $gift_certificate_state 0]\">[lindex $gift_certificate_state 1]"
+        append gift_certificate_state_list_html "<option value=\"[lindex $gift_certificate_state 0]\">[lindex $gift_certificate_state 1]</option>"
     }
 }
 
-doc_body_append "
-        </select>
-      <input type=submit value=\"Change\">
-    </td>
-    <td align=center>"
-
 set issue_date_list [list [list last_24 "last 24 hrs"] [list last_week "last week"] [list last_month "last month"] [list all all]]
 
 set linked_issue_date_list [list]
-
 foreach issue_date $issue_date_list {
     if {$view_issue_date == [lindex $issue_date 0]} {
-	lappend linked_issue_date_list "<b>[lindex $issue_date 1]</b>"
+        lappend linked_issue_date_list "<b>[lindex $issue_date 1]</b>"
     } else {
-	lappend linked_issue_date_list "<a href=\"gift-certificates?[export_url_vars view_gift_certificate_state order_by]&view_issue_date=[lindex $issue_date 0]\">[lindex $issue_date 1]</a>"
+        lappend linked_issue_date_list "<a href=\"gift-certificates?[export_url_vars view_gift_certificate_state order_by]&view_issue_date=[lindex $issue_date 0]\">[lindex $issue_date 1]</a>"
     }
 }
 
-doc_body_append "
-    	    \[ [join $linked_issue_date_list " | "] \]
-          </td>
-        </tr>
-      </table>
-    </form>
-    <blockquote>"
+set linked_issue_date_list_html "\[ [join $linked_issue_date_list " | "] \]"
 
 set gift_certificate_state_query_bit "and g.gift_certificate_state=:view_gift_certificate_state"
 
@@ -97,54 +70,34 @@
 			 "recipient_email" "g.recipient_email" \
 			 "amount" "g.amount"]
 
-set table_header "
-    <table>
-      <tr>
-        <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "gift_certificate_id"]\">ID</a></b></td>
+set table_header_html "<td><b><a href=\"$link_beginning&order_by=[ns_urlencode "gift_certificate_id"]\">ID</a></b></td>
         <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "issue_date"]\">Date Issued</a></b></td>
         <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "gift_certificate_state"]\">Gift Certificate State</a></b></td>
         <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "name"]\">Purchased By</a></b></td>
         <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "recipient_email"]\">Recipient</a></b></td>
-        <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "amount"]\">Amount</a></b></td>
-      </tr>"
+        <td><b><a href=\"$link_beginning&order_by=[ns_urlencode "amount"]\">Amount</a></b></td>"
 
 set row_counter 0
+set gift_certificates_select_html ""
 db_foreach gift_certificates_select "
     select g.gift_certificate_id, g.issue_date, g.gift_certificate_state, g.recipient_email, g.purchased_by, g.amount, u.first_names, u.last_name
     from ec_gift_certificates g, cc_users u
     where g.purchased_by=u.user_id
     $issue_date_query_bit $gift_certificate_state_query_bit
     order by $order_by_clause" {
 
-    if { $row_counter == 0 } {
-	doc_body_append $table_header
-    }
-
     # Even rows are white, odd are grey
-
     if { [expr floor($row_counter/2.)] == [expr $row_counter/2.] } {
-	set bgcolor "white"
+        set bgcolor "#ffffff"
     } else {
-	set bgcolor "ececec"
+        set bgcolor "#ececec"
     }
-    doc_body_append "
-	<tr bgcolor=$bgcolor>
+    append gift_certificates_select_html "<tr bgcolor=$bgcolor>
 	  <td><a href=\"gift-certificate?[export_url_vars gift_certificate_id]\">$gift_certificate_id</a></td>
 	  <td>[ec_nbsp_if_null [util_AnsiDatetoPrettyDate $issue_date]]</td>
 	  <td>$gift_certificate_state</td>
 	  <td>[ec_decode $last_name "" "&nbsp;" "<a href=\"[ec_acs_admin_url]users/one?user_id=$purchased_by\">$last_name, $first_names</a>"]</td>
 	  <td>$recipient_email</td>
-	  <td>[ec_pretty_pure_price $amount]</td>"
+	  <td>[ec_pretty_pure_price $amount]</td></tr>"
     incr row_counter
 }
-
-if { $row_counter != 0 } {
-    doc_body_append "</table>"
-} else {
-    doc_body_append "<center>None Found</center>"
-}
-
-doc_body_append "
-    </blockquote>
-
-    [ad_admin_footer]"