Index: openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.adp	17 Aug 2008 10:37:00 -0000	1.1
@@ -0,0 +1,27 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+    <form method=post action=by-order-state-and-time>
+@export_form_vars_html;noquote@
+      <table border=0 cellspacing=0 cellpadding=0 width=100%>
+        <tr bgcolor=#ececec>
+	  <td align=center><b>Order State</b></td>
+          <td align=center><b>Confirmed Date</b></td>
+        </tr>
+        <tr>
+          <td align=center><select name=view_order_state>
+@order_state_list_html;noquote@
+      </select>
+      <input type=submit value="Change">
+    </td>
+    <td align=center>
+@linked_confirmed_list_html;noquote@
+        </td>
+      </tr>
+    </table>
+   </form>
+   <blockquote>
+@order_select_html;noquote@
+    </blockquote>
Index: openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl	9 Aug 2008 10:33:13 -0000	1.8
+++ openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl	17 Aug 2008 10:37:00 -0000	1.9
@@ -16,24 +16,9 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "
-    [ad_admin_header "Order History"]
+set title "Order History"
+set context [list [list index "Orders / Shipments / Refunds"] $title]
 
-    <h2>Order History</h2>
-
-    [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] "History"]
-    <hr>
-
-    <form method=post action=by-order-state-and-time>
-      [export_form_vars view_confirmed order_by]
-      <table border=0 cellspacing=0 cellpadding=0 width=100%>
-        <tr bgcolor=ececec>
-	  <td align=center><b>Order State</b></td>
-          <td align=center><b>Confirmed Date</b></td>
-        </tr>
-        <tr>
-          <td align=center><select name=view_order_state>"
-
 set order_state_list [list \
 			  [list reportable "reportable (authorized, partially fulfilled, or fulfilled)"] \
 			  [list in_basket in_basket] \
@@ -46,24 +31,18 @@
 			  [list returned returned] \
 			  [list void void]]
 
+set order_state_list_html ""
 foreach order_state $order_state_list {
     if {[lindex $order_state 0] == $view_order_state} {
-	doc_body_append "<option value=\"[lindex $order_state 0]\" selected>[lindex $order_state 1]"
+        append order_state_list_html "<option value=\"[lindex $order_state 0]\" selected>[lindex $order_state 1]"
     } else {
-	doc_body_append "<option value=\"[lindex $order_state 0]\">[lindex $order_state 1]"
+        append order_state_list_html "<option value=\"[lindex $order_state 0]\">[lindex $order_state 1]"
     }
 }
 
-doc_body_append "
-      </select>
-      <input type=submit value=\"Change\">
-    </td>
-    <td align=center>"
-
 set confirmed_list [list [list last_24 "last 24 hrs"] [list last_week "last week"] [list last_month "last month"] [list all all]]
 
 set linked_confirmed_list [list]
-
 foreach confirmed $confirmed_list {
     if {$view_confirmed == [lindex $confirmed 0]} {
 	lappend linked_confirmed_list "<b>[lindex $confirmed 1]</b>"
@@ -72,13 +51,7 @@
     }
 }
 
-doc_body_append "
-          \[ [join $linked_confirmed_list " | "] \]
-        </td>
-      </tr>
-    </table>
-   </form>
-   <blockquote>"
+set linked_confirmed_list_html "\[ [join $linked_confirmed_list " | "] \]"
 
 if { $view_order_state == "reportable" } {
     set order_state_query_bit "and o.order_state in ('authorized', 'partially_fulfilled', 'fulfilled')"
@@ -98,6 +71,8 @@
 
 set link_beginning "by-order-state-and-time?[export_url_vars view_order_state view_confirmed]"
 
+set export_form_vars_html [export_form_vars view_confirmed order_by]
+
 set order_by_clause [ec_decode $order_by \
 			 "order_id" "order_id" \
 			 "confirmed_date" "confirmed_date" \
@@ -118,8 +93,8 @@
       </tr>"
 
 set row_counter 0
-db_foreach orders_select "
-    select o.order_id, o.confirmed_date, o.order_state, ec_total_price(o.order_id) as price_to_display, o.user_id, u.first_names, u.last_name, count(*) as n_items
+set order_select_html ""
+db_foreach orders_select "select o.order_id, o.confirmed_date, o.order_state, ec_total_price(o.order_id) as price_to_display, o.user_id, u.first_names, u.last_name, count(*) as n_items
     from ec_orders o, cc_users u, ec_items i
     where o.user_id=u.user_id(+)
     and o.order_id=i.order_id
@@ -128,25 +103,20 @@
     order by $order_by_clause" {
 
 	if { $row_counter == 0 } {
-	    doc_body_append $table_header
+	    append order_select_html $table_header
 	} elseif { $row_counter == 20 } {
-	    doc_body_append "</table>
-      <p>
-      $table_header
-      "
+	    append order_select_html "</table> <br> $table_header"
 	    set row_counter 1
 	}
 
 	# 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 order_select_html "<tr bgcolor=\"$bgcolor\">
 	      <td><a href=\"one?[export_url_vars order_id]\">$order_id</a></td>
 	      <td>[ec_nbsp_if_null [util_AnsiDatetoPrettyDate $confirmed_date]]</td>
 	      <td>$order_state</td>
@@ -158,14 +128,7 @@
 }
 
 if { $row_counter != 0 } {
-    doc_body_append "
-	</table>"
+    append order_select_html "</table>"
 } else {
-    doc_body_append "
-	<center>None Found</center>"
+    append order_select_html "<center>None Found</center>"
 }
-
-doc_body_append "
-    </blockquote>
-
-    [ad_admin_footer]"
Index: openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.adp	17 Aug 2008 10:37:00 -0000	1.1
@@ -0,0 +1,27 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+    <form method=post action=by-state-and-time>
+@export_form_vars_html;noquote@
+      <table border=0 cellspacing=0 cellpadding=0 width=100%>
+        <tr bgcolor=#ececec>
+	  <td align=center><b>Basket (Order) State</b></td>
+          <td align=center><b>In Basket Date</b></td>
+        </tr>
+        <tr>
+          <td align=center><select name=view_order_state>
+@order_state_list_html;noquote@
+      </select>
+      <input type=submit value="Change">
+    </td>
+    <td align=center>
+@linked_confirmed_list_html;noquote@
+        </td>
+      </tr>
+    </table>
+   </form>
+   <blockquote>
+@orders_select_html;noquote@
+   </blockquote>
Index: openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.tcl	9 Aug 2008 10:33:13 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.tcl	17 Aug 2008 10:37:00 -0000	1.4
@@ -17,24 +17,11 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "
-    [ad_admin_header "Shopping Basket History"]
+set title "Shopping Basket History"
+set context [list [list index "Orders / Shipments / Refunds"] $title]
 
-    <h2>Shopping Basket History</h2>
+set export_form_vars_html [export_form_vars view_confirmed order_by]
 
-    [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] "Basket History"]
-    <hr>
-
-    <form method=post action=by-state-and-time>
-      [export_form_vars view_confirmed order_by]
-      <table border=0 cellspacing=0 cellpadding=0 width=100%>
-        <tr bgcolor=ececec>
-	  <td align=center><b>Basket (Order) State</b></td>
-          <td align=center><b>In Basket Date</b></td>
-        </tr>
-        <tr>
-          <td align=center><select name=view_order_state>"
-
 set order_state_list [list \
 			  [list reportable "reportable (authorized, partially fulfilled, or fulfilled)"] \
 			  [list in_basket in_basket] \
@@ -47,39 +34,28 @@
 			  [list returned returned] \
 			  [list void void]]
 
+set order_state_list_html ""
 foreach order_state $order_state_list {
     if {[lindex $order_state 0] == $view_order_state} {
-	doc_body_append "<option value=\"[lindex $order_state 0]\" selected>[lindex $order_state 1]"
+        append order_state_list_html "<option value=\"[lindex $order_state 0]\" selected>[lindex $order_state 1]"
     } else {
-	doc_body_append "<option value=\"[lindex $order_state 0]\">[lindex $order_state 1]"
+        append order_state_list_html "<option value=\"[lindex $order_state 0]\">[lindex $order_state 1]"
     }
 }
 
-doc_body_append "
-      </select>
-      <input type=submit value=\"Change\">
-    </td>
-    <td align=center>"
-
 set confirmed_list [list [list last_24 "last 24 hrs"] [list last_week "last week"] [list last_month "last month"] [list all all]]
 
 set linked_confirmed_list [list]
 
 foreach confirmed $confirmed_list {
     if {$view_confirmed == [lindex $confirmed 0]} {
-	lappend linked_confirmed_list "<b>[lindex $confirmed 1]</b>"
+        lappend linked_confirmed_list "<b>[lindex $confirmed 1]</b>"
     } else {
-	lappend linked_confirmed_list "<a href=\"by-state-and-time?[export_url_vars view_order_state order_by]&view_confirmed=[lindex $confirmed 0]\">[lindex $confirmed 1]</a>"
+        lappend linked_confirmed_list "<a href=\"by-state-and-time?[export_url_vars view_order_state order_by]&view_confirmed=[lindex $confirmed 0]\">[lindex $confirmed 1]</a>"
     }
 }
 
-doc_body_append "
-          \[ [join $linked_confirmed_list " | "] \]
-        </td>
-      </tr>
-    </table>
-   </form>
-   <blockquote>"
+set linked_confirmed_list_html "\[ [join $linked_confirmed_list " | "] \]"
 
 if { $view_order_state == "reportable" } {
     set order_state_query_bit "and o.order_state in ('authorized', 'partially_fulfilled', 'fulfilled')"
@@ -119,6 +95,7 @@
       </tr>"
 
 set row_counter 0
+set orders_select_html ""
 db_foreach orders_select "
     select o.order_id, o.in_basket_date, o.order_state, ec_total_price(o.order_id) as price_to_display, o.user_id, u.first_names, u.last_name, count(*) as n_items
     from ec_orders o, cc_users u, ec_items i
@@ -129,25 +106,21 @@
     order by $order_by_clause" {
 
 	if { $row_counter == 0 } {
-	    doc_body_append $table_header
+	    append orders_select_html $table_header
 	} elseif { $row_counter == 20 } {
-	    doc_body_append "</table>
-      <p>
-      $table_header
-      "
+	    append orders_select_html "</table> <br> $table_header"
 	    set row_counter 1
 	}
 
 	# 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 orders_select_html "<tr bgcolor=\"$bgcolor\">
 	      <td><a href=\"one?[export_url_vars order_id]\">$order_id</a></td>
 	      <td>[ec_nbsp_if_null [util_AnsiDatetoPrettyDate $in_basket_date]]</td>
 	      <td>$order_state</td>
@@ -159,14 +132,7 @@
 }
 
 if { $row_counter != 0 } {
-    doc_body_append "
-	</table>"
+    append orders_select_html "</table>"
 } else {
-    doc_body_append "
-	<center>None Found</center>"
+    append orders_select_html "<center>None Found</center>"
 }
-
-doc_body_append "
-    </blockquote>
-
-    [ad_admin_footer]"