Index: openacs.org-dev/packages/ecommerce/www/address-international.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/address-international.adp,v
diff -u -r1.1.1.2 -r1.1.1.3
--- openacs.org-dev/packages/ecommerce/www/address-international.adp	5 Aug 2002 21:38:45 -0000	1.1.1.2
+++ openacs.org-dev/packages/ecommerce/www/address-international.adp	8 Oct 2002 15:47:06 -0000	1.1.1.3
@@ -1,18 +1,20 @@
-<master src="default-ec-master">
-<property name="title">Enter Your Address</property>
+<master>
+  <property name="title">Enter Your Address</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
 <if @address_type@ eq "shipping">
-  <property name="navbar">checkout {Select Shipping Address}</property>
+  <include src="checkout-progress" step="1">
   <h2>Enter Your Shipping Address</h2>
 </if>
 <else>
-  <if @action@ ne "gift-certificate-billing">
-    <property name="navbar">checkout {Select Billing Address}</property>
+  <if @referer@ ne "gift-certificate-billing">
+    <include src="checkout-progress" step="4">
   </if>
   <h2>Enter Your Billing Address</h2>
 </else>
 
-<form method="post" action="address-international-2.tcl">
+<form method="post" action="address-international-2">
   @hidden_form_vars@
   <blockquote>
     <table>