Index: openacs-4/packages/ecommerce/www/admin/orders/creditcard-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/creditcard-add.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/creditcard-add.adp	17 Aug 2008 23:21:24 -0000	1.1
@@ -0,0 +1,40 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p>Entering a new credit card will cause all future transactions
+involving this order to use this credit card.  However, it will
+not have any effect on transactions that are currently
+underway. For example, if a transaction has been previously authorized
+with a different credit card, that transaction will use the credit
+card that is already associated with it (through authorization).
+</p>
+
+<p>
+  @billing_address_html;noquote@
+</p>
+<form method="post" action="creditcard-add-2">
+  <input type="hidden" name="address_id" value="@billing_address@"></input>
+  @export_form_vars_html;noquote@
+  <table>
+ <tr>
+  <td>Credit card number:</td>
+  <td><input type="text" name="creditcard_number" size="21"></td>
+ </tr>
+ <tr>
+  <td>Type:</td>
+  <td>@credit_card_type_html;noquote@</td>
+ </tr>
+ <tr>
+  <td>Expires:</td>
+  <td>@credit_card_exp_html;noquote@</td>
+ </tr>
+ <tr>
+  <td colspan="2">
+   <center><input type="submit" value="Submit"></center>
+  </td>
+ </tr>
+  </table>
+</form>
+
Index: openacs-4/packages/ecommerce/www/admin/orders/creditcard-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/creditcard-add.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/orders/creditcard-add.tcl	9 Mar 2004 00:59:50 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/orders/creditcard-add.tcl	17 Aug 2008 23:21:24 -0000	1.5
@@ -14,21 +14,9 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "
-    [ad_admin_header "New Credit Card"]
+set title "New Credit Card"
+set context [list [list index "Orders / Shipments / Refunds"] $title]
 
-    <h2>New Credit Card</h2>
-
-    [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One Order"] "New Credit Card"]
-
-    <hr>
-    <p>Entering a new credit card will cause all future transactions
-    involving this order to use this credit card.  However, it will
-    not have any effect on transactions that are currently
-    underway (e.g., if a transaction has already been authorized
-    with a different credit card, that credit card will be used to
-    complete the transaction). </p>"
-
 db_0or1row select_billing_address "
       select c.billing_address, a.country_code
       from ec_creditcards c, ec_orders o, ec_addresses a
@@ -37,42 +25,8 @@
       and o.order_id = :order_id
       limit 1"
 
-doc_body_append "
-  <table>
-    <tr>
-      <td>
-	[ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $billing_address]]
-      </td>
-      <td>"
-doc_body_append "
-      </td>
-      <td width=\"20%\">
-      </td>
-      <td valign=\"top\">
-	<form method=\"post\" action=\"creditcard-add-2\">
-	  <input type=\"hidden\" name=\"address_id\" value=\"$billing_address\"></input>
-          [export_form_vars order_id]
-	  <table>
-	    <tr>
-	      <td>Credit card number:</td>
-	      <td><input type=\"text\" name=\"creditcard_number\" size=\"21\"></td>
-	    </tr>
-	    <tr>
-	      <td>Type:</td>
-	      <td>[ec_creditcard_widget]</td>
-	      <td>
-		<center>
-		  <input type=\"submit\" value=\"Submit\">
-		</center>
-	      </td>
-	    </tr>
-	    <tr>
-	      <td>Expires:</td>
-	      <td>[ec_creditcard_expire_1_widget] [ec_creditcard_expire_2_widget]</td>
-	    </tr>
-	  </table>
-	</form>
-      </td>
-    </tr>
-  </table>
-    [ad_admin_footer]"
+set billing_address_html "[ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $billing_address]]"
+
+set export_form_vars_html [export_form_vars order_id]
+set credit_card_type_html [ec_creditcard_widget]
+set credit_card_exp_html "[ec_creditcard_expire_1_widget] [ec_creditcard_expire_2_widget]"