You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2009/08/28 18:26:59 UTC

svn commit: r808941 - in /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile: EditBillToAddress.ftl EditPostalAddress.ftl EditShipToAddress.ftl ManageAddress.ftl NewCustomer.ftl

Author: apatel
Date: Fri Aug 28 16:26:59 2009
New Revision: 808941

URL: http://svn.apache.org/viewvc?rev=808941&view=rev
Log:
Set of html markup improvements. 

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl?rev=808941&r1=808940&r2=808941&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl Fri Aug 28 16:26:59 2009
@@ -18,90 +18,72 @@
 -->
 
 <div id="billToServerError" class="errorMessage"></div>
-<form id="editBillToPostalAddress" name="editBillToPostalAddress" method="post" action="<@o...@ofbizUrl>">
-  <div>
+<form id="editBillToPostalAddress" method="post" action="<@o...@ofbizUrl>">
+  <fieldset>
     <input type="hidden" name="setBillingPurpose" value="Y"/>
     <input type="hidden" name="contactMechId" value="${billToContactMechId?if_exists}"/>
     <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
     <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyAddressLine1}*</label>
-      <span>
-        <input type="text" class="left required" name="address1" id="billToAddress1" value="${billToAddress1?if_exists}" size="30" maxlength="30">
-        <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyAddressLine2}</label>
-      <span>
-        <input type="text" class="left" name="address2" value="${billToAddress2?if_exists}" size="30" maxlength="30">
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyCity}*</label>
-      <span>
-        <input type="text" class="left required" name="city" id="billToCity" value="${billToCity?if_exists}" size="30" maxlength="30">
-        <span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyZipCode}*</label>
-      <span>
-        <input type="text" class="left required" name="postalCode" id="billToPostalCode" value="${billToPostalCode?if_exists}" size="12" maxlength="10">
-        <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyCountry}*</label>
-      <span>
-        <select name="countryGeoId" id="billToCountryGeoId" class="left required" style="width: 70%">
-          <#if billToCountryGeoId??>
-            <option value='${billToCountryGeoId!}'>${billToCountryProvinceGeo!(billToCountryGeoId!)}</option>
-          </#if>
-          ${screens.render("component://common/widget/CommonScreens.xml#countries")}
-        </select>
-        <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div id="billToStates" class="form-row">
-      <label>${uiLabelMap.PartyState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
-      <span>
-        <select name="stateProvinceGeoId" id="billToStateProvinceGeoId" style="width: 70%">
-          <#if billToStateProvinceGeoId?has_content>
-            <option value='${billToStateProvinceGeoId!}'>${billToStateProvinceGeo!(billToStateProvinceGeoId!)}</option>
-          <#else>
-            <option value="_NA_">${uiLabelMap.PartyNoState}</option>
-          </#if>
-        </select>
-      </span>
+    <div>
+      <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}*</label>
+      <input type="text" class="left required" name="address1" id="billToAddress1" value="${billToAddress1?if_exists}" size="30" maxlength="30" />
+      <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(required)</span>
+    </div>
+    <div>
+      <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label>
+      <input type="text" class="left" name="address2" id="billToAddress2" value="${billToAddress2?if_exists}" size="30" maxlength="30" />
+    </div>
+    <div>
+      <label for="billToCity">${uiLabelMap.PartyCity}*</label>
+      <input type="text" class="left required" name="city" id="billToCity" value="${billToCity?if_exists}" size="30" maxlength="30" />
+      <span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span>
+    </div>
+    <div>
+      <label for="billToPostalCode">${uiLabelMap.PartyZipCode}*</label>
+      <input type="text" class="left required" name="postalCode" id="billToPostalCode" value="${billToPostalCode?if_exists}" size="12" maxlength="10" />
+      <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span>
+    </div>
+    <div>
+      <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}*</label>
+      <select name="countryGeoId" id="billToCountryGeoId" class="left required" style="width: 70%">
+        <#if billToCountryGeoId??>
+          <option value='${billToCountryGeoId!}'>${billToCountryProvinceGeo!(billToCountryGeoId!)}</option>
+        </#if>
+        ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+      </select>
+      <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(required)</span>
+    </div>
+    <div id="billToStates">
+      <label for="billToStateProvinceGeoId">${uiLabelMap.PartyState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
+      <select name="stateProvinceGeoId" id="billToStateProvinceGeoId" style="width: 70%">
+        <#if billToStateProvinceGeoId?has_content>
+          <option value='${billToStateProvinceGeoId!}'>${billToStateProvinceGeo!(billToStateProvinceGeoId!)}</option>
+        <#else>
+          <option value="_NA_">${uiLabelMap.PartyNoState}</option>
+        </#if>
+      </select>
     </div>
     <#if billToTelecomNumber?has_content>
-      <div class="form-row">
-        <div class="field-label">
-          <label>${uiLabelMap.PartyPhoneNumber}*</label>
-          <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"></span>
-          <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"></span>
-          <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"></span>
-          <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
-        </div>
-        <div>
-          <input type="hidden" name="phoneContactMechId" value="${billToTelecomNumber.contactMechId?if_exists}"/>
-          <input type="text" name="countryCode" id="billToCountryCode" class="required" value="${billToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="areaCode" id="billToAreaCode" class="required" value="${billToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="contactNumber" id="billToContactNumber" class="required" value="${contactNumber?default("${billToTelecomNumber.contactNumber?if_exists}")}" size="6" maxlength="7"/>
-          - <input type="text" name="extension" value="${extension?default("${billToExtension?if_exists}")}" size="3" maxlength="3"/>
-        </div>
+      <div>
+        <label>${uiLabelMap.PartyPhoneNumber}*</label>
+        <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"></span>
+        <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"></span>
+        <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"></span>
+        <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
+        <input type="hidden" name="phoneContactMechId" value="${billToTelecomNumber.contactMechId?if_exists}" />
+        <input type="text" name="countryCode" id="billToCountryCode" class="required" value="${billToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3" />
+        - <input type="text" name="areaCode" id="billToAreaCode" class="required" value="${billToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3" />
+        - <input type="text" name="contactNumber" id="billToContactNumber" class="required" value="${contactNumber?default("${billToTelecomNumber.contactNumber?if_exists}")}" size="6" maxlength="7" />
+        - <input type="text" name="extension" value="${extension?default("${billToExtension?if_exists}")}" size="3" maxlength="3" />
       </div>
     </#if>
-    <div class="form-row">
-      <b>${uiLabelMap.EcommerceMyDefaultShippingAddress}</b>
-      <input type="checkbox" name="setShippingPurpose" value="Y" <#if setShippingPurpose?exists>checked</#if>/>
-    </div>
-    <div class="form-row">
-      <a name="submitEditBillToPostalAddress" id="submitEditBillToPostalAddress" class="buttontext" onclick="updatePartyBillToPostalAddress('submitEditBillToPostalAddress')">${uiLabelMap.CommonSubmit}</a>
-      <form action="">
-        <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}"/>
-      </form>
+    <div>
+      <label for="setShippingPurposeForBilling">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
+      <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForBilling" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> />
+    </div>
+    <div>
+      <a name="submitEditBillToPostalAddress" id="submitEditBillToPostalAddress" class="button" onclick="updatePartyBillToPostalAddress('submitEditBillToPostalAddress')">${uiLabelMap.CommonSubmit}</a>
+      <a class="popup_closebox button" href="javascript:void(0);">${uiLabelMap.CommonClose}</a>
     </div>
-  </div>
+  </fieldset>
 </form>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=808941&r1=808940&r2=808941&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl Fri Aug 28 16:26:59 2009
@@ -18,80 +18,68 @@
 -->
 
 <div id="serverError_${contactMech.contactMechId}" class="errorMessage"></div>
-<#assign postalAddress = delegator.findOne("PostalAddress", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", contactMech.contactMechId), true)>
+<#assign postalAddress = delegator.findOne("PostalAddress", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", contactMech.contactMechId), true) />
 
-<form id="editPostalAddress_${contactMech.contactMechId}" name="editPostalAddress_${contactMech.contactMechId}" method="post" action="<@o...@ofbizUrl>">
-  <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/>
-  <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
-  <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
-  <div class="screenlet-body">
-    <div class="form-row">
-      <label>${uiLabelMap.PartyAddressLine1}*</label>
-      <span>
-        <input type="text" class="left required" name="address1" id="address1_${contactMech.contactMechId}" value="${postalAddress.address1?if_exists}" style="width: 50%" size="30" maxlength="30">
+<form id="editPostalAddress_${contactMech.contactMechId}" method="post" action="<@o...@ofbizUrl>">
+  <fieldset>
+    <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}" />
+    <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
+    <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
+    <div class="screenlet-body">
+      <div>
+        <label for="address1_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine1}*</label>
+        <input type="text" class="left required" name="address1" id="address1_${contactMech.contactMechId}" value="${postalAddress.address1?if_exists}" style="width: 50%" size="30" maxlength="30" />
         <span id="advice-required-address1_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyAddressLine2}</label>
-      <span>
-        <input type="text" class="left" name="address2" value="${postalAddress.address2?if_exists}" style="width: 50%" size="30" maxlength="30">
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyCity}*</label>
-      <span>
-        <input type="text" class="left required" name="city" id="city_${contactMech.contactMechId}" value="${postalAddress.city?if_exists}" size="30" maxlength="30">
+      </div>
+      <div>
+        <label for="additionalAddress2_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine2}</label>
+        <input type="text" class="left" name="address2" id="additionalAddress2_${contactMech.contactMechId}" value="${postalAddress.address2?if_exists}" style="width: 50%" size="30" maxlength="30" />
+      </div>
+      <div>
+        <label for="city_${contactMech.contactMechId}">${uiLabelMap.PartyCity}*</label>
+        <input type="text" class="left required" name="city" id="city_${contactMech.contactMechId}" value="${postalAddress.city?if_exists}" size="30" maxlength="30" />
         <span id="advice-required-city_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyZipCode}*</label>
-      <span>
-        <input type="text" class="left required" name="postalCode" id="postalCode_${contactMech.contactMechId}" value="${postalAddress.postalCode?if_exists}" size="12" maxlength="10">
+      </div>
+      <div>
+        <label for="postalCode_${contactMech.contactMechId}">${uiLabelMap.PartyZipCode}*</label>
+        <input type="text" class="left required" name="postalCode" id="postalCode_${contactMech.contactMechId}" value="${postalAddress.postalCode?if_exists}" size="12" maxlength="10" />
         <span id="advice-required-postalCode_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyCountry}*</label>
-      <span>
+      </div>
+      <div>
+        <label for="countryGeoId_${contactMech.contactMechId}">${uiLabelMap.PartyCountry}*</label>
         <select name="countryGeoId" id="countryGeoId_${contactMech.contactMechId}" class="left required" style="width: 70%">
           <#if postalAddress.countryGeoId??>
-            <#assign geo = delegator.findOne("Geo", Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", postalAddress.countryGeoId), true)>
+            <#assign geo = delegator.findOne("Geo", Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", postalAddress.countryGeoId), true) />
             <option value="${postalAddress.countryGeoId}">${geo.geoName!(postalAddress.countryGeoId)}</option>
           </#if>
           ${screens.render("component://common/widget/CommonScreens.xml#countries")}
         </select>
         <span id="advice-required-countryGeoId_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div id="states_${contactMech.contactMechId}" class="form-row">
-      <label>${uiLabelMap.PartyState}*</label>
-      <span>
+      </div>
+      <div id="states_${contactMech.contactMechId}">
+        <label for="stateProvinceGeoId_${contactMech.contactMechId}">${uiLabelMap.PartyState}*</label>
         <select name="stateProvinceGeoId" id="stateProvinceGeoId_${contactMech.contactMechId}" style="width: 70%">
           <#if postalAddress.stateProvinceGeoId??>
-            <#assign geo = delegator.findOne("Geo", Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", postalAddress.stateProvinceGeoId), true)>
+            <#assign geo = delegator.findOne("Geo", Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", postalAddress.stateProvinceGeoId), true) />
             <option value="${postalAddress.stateProvinceGeoId}">${geo.geoName!(postalAddress.stateProvinceGeoId)}</option>
           <#else>
             <option value="_NA_">${uiLabelMap.PartyNoState}</option>
           </#if>
         </select>
         <span id="advice-required-stateProvinceGeoId_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <b>${uiLabelMap.EcommerceMyDefaultBillingAddress}</b>
-      <input type="checkbox" name="setBillingPurpose" value="Y" <#if setBillingPurpose?exists>checked</#if>/>
-    </div>
-    <div class="form-row">
-      <b>${uiLabelMap.EcommerceMyDefaultShippingAddress}</b>
-      <input type="checkbox" name="setShippingPurpose" value="Y" <#if setShippingPurpose?exists>checked</#if>/>
-    </div>
-    <div class="form-row">
-      <a name="submitEditPostalAddress_${contactMech.contactMechId}" id="submitEditPostalAddress_${contactMech.contactMechId}" class="buttontext" onclick="updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}')">${uiLabelMap.CommonSubmit}</a>
-      <form action="">
-        <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}"/>
-      </form>
+      </div>
+      <div>
+        <label for="setBillingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
+        <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForPostalAddress" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> />
+      </div>
+      <div>
+        <label for="setShippingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
+        <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForPostalAddress" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> />
+      </div>
+      <div>
+        <a name="submitEditPostalAddress_${contactMech.contactMechId}" id="submitEditPostalAddress_${contactMech.contactMechId}" class="button" onclick="updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}')">${uiLabelMap.CommonSubmit}</a>
+        <a href="javascript:void(0);" class="popup_closebox button">${uiLabelMap.CommonClose}</a>
+      </div>
     </div>
-  </div>
+  </fieldset>
 </form>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl?rev=808941&r1=808940&r2=808941&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl Fri Aug 28 16:26:59 2009
@@ -18,90 +18,72 @@
 -->
 
 <div id="shipToServerError" class="errorMessage"></div>
-<form id="editShipToPostalAddress" name="editShipToPostalAddress" method="post" action="<@o...@ofbizUrl>">
-  <div>
+<form id="editShipToPostalAddress" method="post" action="<@o...@ofbizUrl>">
+  <fieldset>
     <input type="hidden" name="setShippingPurpose" value="Y"/>
     <input type="hidden" name="contactMechId" value="${shipToContactMechId?if_exists}"/>
     <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
     <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyAddressLine1}*</label>
-      <span>
-        <input type="text" class="left required" name="address1" id="shipToAddress1" value="${shipToAddress1?if_exists}" size="30" maxlength="30">
-        <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyAddressLine2}</label>
-      <span>
-        <input type="text" class="left" name="address2" value="${shipToAddress2?if_exists}" size="30" maxlength="30">
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyCity}*</label>
-      <span>
-        <input type="text" class="left required" name="city" id="shipToCity" value="${shipToCity?if_exists}" size="30" maxlength="30">
-        <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyZipCode}*</label>
-      <span>
-        <input type="text" class="left required" name="postalCode" id="shipToPostalCode" value="${shipToPostalCode?if_exists}" size="12" maxlength="10">
-        <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div class="form-row">
-      <label>${uiLabelMap.PartyCountry}*</label>
-      <span>
-        <select name="countryGeoId" id="shipToCountryGeoId" class="left required" style="width: 70%">
-          <#if shipToCountryGeoId??>
-            <option value="${shipToCountryGeoId!}">${shipToCountryProvinceGeo!(shipToCountryGeoId!)}</option>
-          </#if>
-          ${screens.render("component://common/widget/CommonScreens.xml#countries")}
-        </select>
-        <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(required)</span>
-      </span>
-    </div>
-    <div id="shipToStates" class="form-row">
-      <label>${uiLabelMap.PartyState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
-      <span>
-        <select name="stateProvinceGeoId" id="shipToStateProvinceGeoId" style="width: 70%">
-          <#if shipToStateProvinceGeoId?has_content>
-            <option value='${shipToStateProvinceGeoId!}'>${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}</option>
-          <#else>
-            <option value="_NA_">${uiLabelMap.PartyNoState}</option>
-          </#if>
-        </select>
-      </span>
+    <div>
+      <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*</label>
+      <input type="text" class="left required" name="address1" id="shipToAddress1" value="${shipToAddress1?if_exists}" size="30" maxlength="30" />
+      <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(required)</span>
+    </div>
+    <div>
+      <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label>
+      <input type="text" class="left" name="address2" id="shipToAddress2" value="${shipToAddress2?if_exists}" size="30" maxlength="30" />
+    </div>
+    <div>
+      <label for="shipToCity">${uiLabelMap.PartyCity}*</label>
+      <input type="text" class="left required" name="city" id="shipToCity" value="${shipToCity?if_exists}" size="30" maxlength="30" />
+      <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span>
+    </div>
+    <div>
+      <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*</label>
+      <input type="text" class="left required" name="postalCode" id="shipToPostalCode" value="${shipToPostalCode?if_exists}" size="12" maxlength="10" />
+      <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span>
+    </div>
+    <div>
+      <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}*</label>
+      <select name="countryGeoId" id="shipToCountryGeoId" class="left required" style="width: 70%">
+        <#if shipToCountryGeoId??>
+          <option value="${shipToCountryGeoId!}">${shipToCountryProvinceGeo!(shipToCountryGeoId!)}</option>
+        </#if>
+        ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+      </select>
+      <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(required)</span>
+    </div>
+    <div id="shipToStates">
+      <label for="shipToStateProvinceGeoId">${uiLabelMap.PartyState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
+      <select name="stateProvinceGeoId" id="shipToStateProvinceGeoId" style="width: 70%">
+        <#if shipToStateProvinceGeoId?has_content>
+          <option value='${shipToStateProvinceGeoId!}'>${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}</option>
+        <#else>
+          <option value="_NA_">${uiLabelMap.PartyNoState}</option>
+        </#if>
+      </select>
     </div>
     <#if shipToTelecomNumber?has_content>
-      <div class="form-row">
-        <div class="field-label">
-          <label>${uiLabelMap.PartyPhoneNumber}*</label>
-          <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"></span>
-          <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"></span>
-          <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"></span>
-          <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
-        </div>
-        <div>
-          <input type="hidden" name="phoneContactMechId" value="${shipToTelecomNumber.contactMechId?if_exists}"/>
-          <input type="text" name="countryCode" id="shipToCountryCode" class="required" value="${shipToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="areaCode" id="shipToAreaCode" class="required" value="${shipToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="contactNumber" id="shipToContactNumber" class="required" value="${contactNumber?default("${shipToTelecomNumber.contactNumber?if_exists}")}" size="6" maxlength="7"/>
-          - <input type="text" name="extension" value="${extension?default("${shipToExtension?if_exists}")}" size="3" maxlength="3"/>
-        </div>
+      <div>
+        <label>${uiLabelMap.PartyPhoneNumber}*</label>
+        <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"></span>
+        <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"></span>
+        <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"></span>
+        <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
+        <input type="hidden" name="phoneContactMechId" value="${shipToTelecomNumber.contactMechId?if_exists}" />
+        <input type="text" name="countryCode" id="shipToCountryCode" class="required" value="${shipToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3" />
+        - <input type="text" name="areaCode" id="shipToAreaCode" class="required" value="${shipToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3" />
+        - <input type="text" name="contactNumber" id="shipToContactNumber" class="required" value="${contactNumber?default("${shipToTelecomNumber.contactNumber?if_exists}")}" size="6" maxlength="7" />
+        - <input type="text" name="extension" value="${extension?default("${shipToExtension?if_exists}")}" size="3" maxlength="3" />
       </div>
     </#if>
-    <div class="form-row">
-      <b>${uiLabelMap.EcommerceMyDefaultBillingAddress}</b>
-      <input type="checkbox" name="setBillingPurpose" value="Y" <#if setBillingPurpose?exists>checked</#if>/>
-    </div>
-    <div class="form-row">
-      <a name="submitEditShipToPostalAddress" id="submitEditShipToPostalAddress" class="buttontext" onclick="updatePartyShipToPostalAddress('submitEditShipToPostalAddress')">${uiLabelMap.CommonSubmit}</a>
-      <form action="">
-        <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}"/>
-      </form>
+    <div>
+      <label for="setBillingPurposeForShipping">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
+      <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if>/>
+    </div>
+    <div>
+      <a name="submitEditShipToPostalAddress" id="submitEditShipToPostalAddress" class="button" onclick="updatePartyShipToPostalAddress('submitEditShipToPostalAddress')">${uiLabelMap.CommonSubmit}</a>
+      <a class="popup_closebox button">${uiLabelMap.CommonClose}</a>
     </div>
-  </div>
+  </fieldset>
 </form>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=808941&r1=808940&r2=808941&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Fri Aug 28 16:26:59 2009
@@ -17,229 +17,237 @@
 under the License.
 -->
 
-<#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
+<#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
 <div class="screenlet">
-  <form id="refreshRequestForm" name="refreshRequestForm" method="post" action="<@o...@ofbizUrl>">
+  <form id="refreshRequestForm" method="post" action="<@o...@ofbizUrl>">
   </form>
 
-  <div class="screenlet-header"><div class="boxhead">&nbsp;${uiLabelMap.EcommerceAddressBook}</div></div>
+  <h3>${uiLabelMap.EcommerceAddressBook}</h3>
   <div class="screenlet-body">
     <#-- Add address -->
-    <div class="form-row" align="right">
-      <a class="buttontext" id="addAddress" href="javascript:void(0)">${uiLabelMap.EcommerceAddNewAddress}</a>
-    </div>
+    <a class="button" id="addAddress" href="javascript:void(0)">${uiLabelMap.EcommerceAddNewAddress}</a>
     <div id="displayCreateAddressForm" class="popup" style="display: none;">
       <div id="serverError" class="errorMessage"></div>
-      <form id="createPostalAddressForm" name="createPostalAddressForm" method="post" action="<@o...@ofbizUrl>">
-        <input type="hidden" name="roleTypeId" value="CUSTOMER">
-        <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
-        <div class="form-row">
-          ${uiLabelMap.PartyAddressLine1}*
-          <span id="advice-required-address1" style="display: none" class="errorMessage">(required)</span>
-          <div class="form-field">
-            <input type="text" class="required" name="address1" id="address1" value="" size="30" maxlength="30">
-          </div>
-        </div>
-        <div class="form-row">
-          ${uiLabelMap.PartyAddressLine2}<div class="form-field"><input type="text" name="address2" value="" size="30" maxlength="30"></div>
-        </div>
-        <div class="form-row">
-          ${uiLabelMap.PartyCity}*
-          <span id="advice-required-city" style="display: none" class="errorMessage">(required)</span>
-          <div class="form-field">
-            <input type="text" class="required" name="city" id="city" value="" size="30" maxlength="30">
-          </div>
-        </div>
-        <div class="form-row">
-          ${uiLabelMap.PartyZipCode}*
-          <span id="advice-required-postalCode" style="display: none" class="errorMessage">(required)</span>
-          <div class="form-field">
-            <input type="text" class="required" name="postalCode" id="postalCode" value="" size="30" maxlength="10">
-          </div>
-        </div>
-        <div class="form-row">
-          ${uiLabelMap.PartyCountry}*
-          <span id="advice-required-countryGeoId" style="display: none" class="errorMessage">(required)</span>
-          <div class="form-field">
-            <select name="countryGeoId" id="countryGeoId" class="required" style="width: 70%">
-              <#if countryGeoId??>
-                <option value="${countryGeoId}">${countryGeoId}</option>
-              </#if>
-              ${screens.render("component://common/widget/CommonScreens.xml#countries")}
-            </select>
-          </div>
-        </div>
-        <div id="states" class="form-row">
-          ${uiLabelMap.PartyState}*
-          <span id="advice-required-stateProvinceGeoId" style="display: none" class="errorMessage">(required)</span>
-          <div class="form-field">
-            <select name="stateProvinceGeoId" id="stateProvinceGeoId" style="width: 70%">
+      <form id="createPostalAddressForm" method="post" action="<@o...@ofbizUrl>">
+        <fieldset>
+          <input type="hidden" name="roleTypeId" value="CUSTOMER" />
+          <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
+          <div>
+            <label for="address1">${uiLabelMap.PartyAddressLine1}*
+               <span id="advice-required-address1" style="display: none" class="errorMessage">(required)</span>
+            </label>
+            <input type="text" class="required" name="address1" id="address1" value="" maxlength="30" />
+          </div>
+          <div>
+            <label for="address2">${uiLabelMap.PartyAddressLine2}</label>
+            <input type="text" name="address2" id="address2" value="" maxlength="30" />
+          </div>
+          <div>
+            <label for="city">${uiLabelMap.PartyCity}*
+              <span id="advice-required-city" style="display: none" class="errorMessage">(required)</span>
+            </label>
+            <input type="text" class="required" name="city" id="city" value="" maxlength="30" />
+          </div>
+          <div>
+            <label for="postalCode">${uiLabelMap.PartyZipCode}*
+              <span id="advice-required-postalCode" style="display: none" class="errorMessage">(required)</span>
+            </label>
+            <input type="text" class="required" name="postalCode" id="postalCode" value="" maxlength="10" />
+          </div>
+          <div>
+            <label for="countryGeoId">${uiLabelMap.PartyCountry}*
+              <span id="advice-required-countryGeoId" style="display: none" class="errorMessage">(required)</span>
+            </label>
+             <select name="countryGeoId" id="countryGeoId" class="required" style="width: 70%">
+               <#if countryGeoId??>
+                 <option value="${countryGeoId}">${countryGeoId}</option>
+               </#if>
+               ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+             </select>
+          </div>
+          <div id="states">
+            <label for="stateProvinceGeoId">${uiLabelMap.PartyState}*
+              <span id="advice-required-stateProvinceGeoId" style="display: none" class="errorMessage">(required)</span>
+            </label>  
+              <select name="stateProvinceGeoId" id="stateProvinceGeoId" style="width: 70%">
               <#if stateProvinceGeoId?has_content>
                 <option value="${stateProvinceGeoId}">${stateProvinceGeoId}</option>
               <#else>
                 <option value="_NA_">${uiLabelMap.PartyNoState}</option>
               </#if>
-            </select>
+              </select>
           </div>
-        </div>
-        <div class="form-row">
-          <b>${uiLabelMap.EcommerceMyDefaultBillingAddress}</b>
-          <input type="checkbox" name="setBillingPurpose" id="setBillingPurpose" value="Y" <#if setBillingPurpose?exists>checked</#if>/>
-        </div>
-        <div class="form-row">
-          <b>${uiLabelMap.EcommerceMyDefaultShippingAddress}</b>
-          <input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y" <#if setShippingPurpose?exists>checked</#if>/>
-        </div>
-        <div class="form-row">
-          <a href="javascript:void(0);" id="submitPostalAddressForm" class="buttontext" onclick="createPartyPostalAddress('submitPostalAddressForm')">${uiLabelMap.CommonSubmit}</a>
-          <form action="">
-            <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}"/>
-          </form>
-        </div>
+          <div>
+            <label for="setBillingPurpose">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
+            <input type="checkbox" name="setBillingPurpose" id="setBillingPurpose" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> />
+          </div>
+          <div>
+            <label for="setShippingPurpose">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
+            <input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> />
+          </div>
+          <div>
+            <a href="javascript:void(0);" id="submitPostalAddressForm" class="button" onclick="createPartyPostalAddress('submitPostalAddressForm')">${uiLabelMap.CommonSubmit}</a>
+            <a href="javascript:void(0);" class="popup_closebox button" >${uiLabelMap.CommonClose}</a>
+          </div>
+        </fieldset>
       </form>
     </div>
     <script type="text/javascript">
-      new Popup('displayCreateAddressForm','addAddress', {modal: true, position: 'center', trigger: 'click'})
+      //<![CDATA[
+        new Popup('displayCreateAddressForm','addAddress', {modal: true, position: 'center', trigger: 'click'})
+      //]]>
     </script>
   </div>
 
   <#-- Default Addresses -->
   <div class="left center">
-    <div class="screenlet-header"><div class="boxhead">&nbsp;${uiLabelMap.EcommerceDefaultAddresses}</div></div>
+    <h3>${uiLabelMap.EcommerceDefaultAddresses}</h3>
     <div class="screenlet-body">
       <#--===================================== Billing Address and Telecom number ===========================================-->
       <h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3>
+      <ul>
       <#if billToContactMechId?exists>
-        ${billToAddress1?if_exists}<br/>
-        <#if billToAddress2?has_content>${billToAddress2?if_exists}<br/></#if>
-        <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_">
-          ${billToStateProvinceGeoId}
-        </#if>
+        <li>${billToAddress1?if_exists}</li>
+        <#if billToAddress2?has_content><li>${billToAddress2?if_exists}</li></#if>
+        <li>
+          <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_">
+            ${billToStateProvinceGeoId}
+          </#if>
           ${billToCity?if_exists},
-          ${billToPostalCode?if_exists}<br/>
-          ${billToCountryGeoId?if_exists}<br/>
+          ${billToPostalCode?if_exists}
+        </li>
+        <li>${billToCountryGeoId?if_exists}</li>
         <#if billToTelecomNumber?has_content>
+        <li>
           ${billToTelecomNumber.countryCode?if_exists}-
           ${billToTelecomNumber.areaCode?if_exists}-
           ${billToTelecomNumber.contactNumber?if_exists}
-          <#if billToExtension?exists>-${billToExtension?if_exists}</#if><br/>
+          <#if billToExtension?exists>-${billToExtension?if_exists}</#if>
+        </li>
         </#if>
-        <a id="updateBillToPostalAddress" href="javascript:void(0)" class="buttontext popup_link">${uiLabelMap.CommonEdit}</a>&nbsp;
+        <li><a id="updateBillToPostalAddress" href="javascript:void(0)" class="button popup_link">${uiLabelMap.CommonEdit}</a></li>
       <#else>
-        ${uiLabelMap.PartyPostalInformationNotFound}
+        <li>${uiLabelMap.PartyPostalInformationNotFound}</li>
       </#if>
+      </ul>
       <div id="displayEditBillToPostalAddress" class="popup" style="display: none;">
         <#include "EditBillToAddress.ftl"/>
       </div>
-      <div class="form-row"><hr class="sepbar"/></div>
       <script type="text/javascript">
+        //<![CDATA[
         new Popup('displayEditBillToPostalAddress', 'updateBillToPostalAddress', {modal: true, position: 'center', trigger: 'click'})
+        //]]>
       </script>
 
     <#--===================================== Shipping Address and Telecom number ===========================================-->
       <h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3>
+      <ul>
       <#if shipToContactMechId?exists>
-        ${shipToAddress1?if_exists}<br/>
-        <#if shipToAddress2?has_content>${shipToAddress2?if_exists}<br/></#if>
+        <li>${shipToAddress1?if_exists}</li>
+        <#if shipToAddress2?has_content><li>${shipToAddress2?if_exists}</li></#if>
+        <li>
         <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_">
           ${shipToStateProvinceGeoId}
         </#if>
           ${shipToCity?if_exists},
-          ${shipToPostalCode?if_exists}<br/>
-          ${shipToCountryGeoId?if_exists}<br/>
+          ${shipToPostalCode?if_exists}
+        </li>
+        <li>${shipToCountryGeoId?if_exists}</li>
         <#if shipToTelecomNumber?has_content>
+        <li>
           ${shipToTelecomNumber.countryCode?if_exists}-
           ${shipToTelecomNumber.areaCode?if_exists}-
           ${shipToTelecomNumber.contactNumber?if_exists}
-          <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if><br/>
+          <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if>
+        </li>
         </#if>
-        <a id="updateShipToPostalAddress" href="javascript:void(0)" class="buttontext popup_link">${uiLabelMap.CommonEdit}</a>&nbsp;
+        <li><a id="updateShipToPostalAddress" href="javascript:void(0)" class="button popup_link">${uiLabelMap.CommonEdit}</a></li>
       <#else>
-        ${uiLabelMap.PartyPostalInformationNotFound}
+        <li>${uiLabelMap.PartyPostalInformationNotFound}</li>
       </#if>
+      </ul>
       <div id="displayEditShipToPostalAddress" class="popup" style="display: none;">
         <#include "EditShipToAddress.ftl"/>
       </div>
-      <div class="form-row"><hr class="sepbar"/></div>
       <script type="text/javascript">
+         //<![CDATA[
           new Popup('displayEditShipToPostalAddress','updateShipToPostalAddress', {modal: true, position: 'center', trigger: 'click'})
+          //]]>
       </script>
     </div>
   </div>
 
   <#-- Additional Addresses -->
   <div class="center right">
-    <div class="screenlet-header">
-      <div class="boxhead">&nbsp;${uiLabelMap.EcommerceAdditionalAddresses}</div>
-    </div>
+    <h3>${uiLabelMap.EcommerceAdditionalAddresses}</h3>
 
     <div class="screenlet-body">
-      <#assign postalAddressFlag = "N">
+      <#assign postalAddressFlag = "N" />
       <#list partyContactMechValueMaps as partyContactMechValueMap>
-        <#assign contactMech = partyContactMechValueMap.contactMech?if_exists>
+        <#assign contactMech = partyContactMechValueMap.contactMech?if_exists />
         <#if contactMech.contactMechTypeId?if_exists = "POSTAL_ADDRESS">
-          <#assign partyContactMech = partyContactMechValueMap.partyContactMech?if_exists>
+          <#assign partyContactMech = partyContactMechValueMap.partyContactMech?if_exists />
           <#if !(partyContactMechValueMap.partyContactMechPurposes?has_content)>
-            <#assign postalAddressFlag = "Y">
-            <#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists>
+            <#assign postalAddressFlag = "Y" />
+            <#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists />
             <div id="displayEditAddressForm_${contactMech.contactMechId}" class="popup" style="display: none;">
               <#include "EditPostalAddress.ftl"/>
             </div>
             <#if postalAddress?exists>
-              <div class="form-row">
-                <div class="form-label"></div>
+              <div>
                 <div class="form-field">
                   <div>
-                    ${postalAddress.address1}<br/>
-                    <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if>
-                    ${postalAddress.city}
-                    <#if postalAddress.stateProvinceGeoId?has_content && postalAddress.stateProvinceGeoId != "_NA_">
-                      ${postalAddress.stateProvinceGeoId}
-                    </#if>
-                    &nbsp;${postalAddress.postalCode?if_exists}
-                    <#if postalAddress.countryGeoId?has_content><br/>${postalAddress.countryGeoId}</#if>
+                    <ul>
+                      <li>${postalAddress.address1}</li>
+                      <#if postalAddress.address2?has_content><li>${postalAddress.address2}</li></#if>
+                      <li>${postalAddress.city}</li>
+                      <li>
+                      <#if postalAddress.stateProvinceGeoId?has_content && postalAddress.stateProvinceGeoId != "_NA_">
+                        ${postalAddress.stateProvinceGeoId}
+                      </#if>
+                        ${postalAddress.postalCode?if_exists}
+                      </li>
+                    <#if postalAddress.countryGeoId?has_content><li>${postalAddress.countryGeoId}</li></#if>
+                    </ul>
                     <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId?if_exists = "USA")>
-                      <#assign addr1 = postalAddress.address1?if_exists>
-                      <#if (addr1.indexOf(" ") gt 0)>
-                        <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))>
-                        <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)>
+                      <#assign addr1 = postalAddress.address1?if_exists />
+                      <#if (addr1.indexOf(" ") > 0)>
+                        <#assign addressNum = addr1.substring(0, addr1.indexOf(" ")) />
+                        <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1) />
                         <a target="_blank" href="#" class="linktext">(${uiLabelMap.CommonLookupWhitepages})</a>
                       </#if>
                     </#if>
                   </div>
                 </div>
               </div>
-              <div class="form-row">
+              <div>
                 <span>
-                  <a id="update_${contactMech.contactMechId}" href="javascript:void(0)" class="buttontext popup_link" onclick="showState('${contactMech.contactMechId}')">${uiLabelMap.CommonEdit}</a>&nbsp;
-                  <form name= "deletePostalAddress_${contactMech.contactMechId}" method= "post" action= "<@o...@ofbizUrl>">
-                    <input type= "hidden" name= "contactMechId" value= "${contactMech.contactMechId}"/>
-                    <a href='javascript:document.deletePostalAddress_${contactMech.contactMechId}.submit()' class='buttontext'>&nbsp;${uiLabelMap.CommonDelete}&nbsp;</a>
+                  <a id="update_${contactMech.contactMechId}" href="javascript:void(0)" class="button popup_link" onclick="showState('${contactMech.contactMechId}')">${uiLabelMap.CommonEdit}</a></span>
+                  <form id="deletePostalAddress_${contactMech.contactMechId}" method= "post" action= "<@o...@ofbizUrl>">
+                    <fieldset>
+                      <input type= "hidden" name= "contactMechId" value= "${contactMech.contactMechId}" />
+                      <a href="javascript:$('deletePostalAddress_${contactMech.contactMechId}').submit()" class='button'>${uiLabelMap.CommonDelete}</a>
+                    </fieldset>
                   </form> 
-                </span>
               </div>
               <script type="text/javascript">
+                //<![CDATA[
                 new Popup('displayEditAddressForm_${contactMech.contactMechId}','update_${contactMech.contactMechId}', {modal: true, position: 'center', trigger: 'click'})
+                //]]>
               </script>
             <#else>
-              <div class="form-row">
-                <div class="form-label">
-                  <h5>${uiLabelMap.PartyPostalInformationNotFound}.</h5>
-                </div>
+              <div>
+                 <label>${uiLabelMap.PartyPostalInformationNotFound}.</label>
               </div>
             </#if>
-            <div class="form-row"><hr class="sepbar"/></div>
           </#if>
         </#if>
       </#list>
       <#if postalAddressFlag == "N">
-        <div class="form-row">
-          <div class="form-label">
-            <h5>${uiLabelMap.PartyPostalInformationNotFound}.</h5>
-          </div>
+        <div>
+            <label>${uiLabelMap.PartyPostalInformationNotFound}.</label>
         </div>
       </#if>
     </div>
   </div>
-  <div class="form-row"></div>
 </div>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl?rev=808941&r1=808940&r2=808941&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl Fri Aug 28 16:26:59 2009
@@ -18,182 +18,169 @@
 -->
 
 <div class="screenlet">
-  <div class="screenlet-header">
-    <div class='boxhead'>&nbsp;${uiLabelMap.EcommerceMyAccount}</div>
-  </div>
+  <h3>${uiLabelMap.EcommerceMyAccount}</h3>
   <div class="screenlet-body">
-  <form id="newUserForm" name="newUserForm" method="post" action="<@o...@ofbizUrl>">
-    <input type="hidden" name="roleTypeId" value="CUSTOMER"/>
-    <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
-    <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
-    <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
-
-    <div class="left center">
-      <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.PartyContactInformation}</div></div>
-      <div class="form-row">
-        <div class="field-label"><label for="firstName">${uiLabelMap.PartyFirstName}* <span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label></div>
-        <div><input type="text" name="firstName" id="firstName" class="required" value="${parameters.firstName?if_exists}" size="30" maxlength="30"></div>
-      </div>
-      <div class="form-row">
-        <div class="field-label"><label for="lastName">${uiLabelMap.PartyLastName}* <span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label></div>
-        <div><input type="text" name="lastName" id="lastName" class="required" value="${parameters.lastName?if_exists}" size="30" maxlength="30"></div>
-      </div>
-      <div class="form-row">
-        <div class="field-label">
-          <label for="emailAddress">${uiLabelMap.CommonEmail}*
-            <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span>
-          </label>
-        </div>
-        <div><input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${parameters.emailAddress?if_exists}" size="30" maxlength="255"/></div>
-      </div>
-    </div>
-    <div class="center right">
-      <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.EcommerceAccountInformation}</div></div>
-      <div id="userNameAndPasswordPanel">
-        <div class="form-row">
-          <div class="field-label"><label for="userName">${uiLabelMap.CommonUsername}* <span id="advice-required-username" style="display: none" class="errorMessage">(required)</span></label></div>
-          <div><input type="text" name="username" id="username" class="required" value="${parameters.username?if_exists}" size="30" maxlength="255"></div>
-        </div>
-        <div class="form-row">
-          <div class="field-label"><label for="password">${uiLabelMap.CommonPassword}* <span id="advice-required-password" style="display: none" class="errorMessage">(required)</span></label></div>
-          <div><input type="password" name="password" id="password" class="required validate-password" value="${parameters.password?if_exists}" maxlength="16"></div>
-          <span id="advice-validate-password-password" class="errorMessage" style="display:none">${uiLabelMap["loginservices.password_may_not_equal_username"]}</span>
-        </div>
-        <div class="form-row">
-          <div class="field-label"><label for="passwordVerify">${uiLabelMap.PartyRepeatPassword}* <span id="advice-required-passwordVerify" style="display: none" class="errorMessage">(required)</span></label></div>
-          <div><input type="password" name="passwordVerify" id="passwordVerify" class="required validate-passwordVerify" value="${parameters.passwordVerify?if_exists}" maxlength="16"></div>
-          <span id="advice-validate-passwordVerify-passwordVerify" class="errorMessage" style="display:none">${uiLabelMap["loginservices.password_did_not_match_verify_password"]}</span>
-        </div>
-      </div>
-    </div>
-    <div class="form-row"></div>
-    <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span>
-    <div class="form-row"><hr class="sepbar"/></div>
-    <div class="bothclear"></div>
-
-    <div class="left center">
-      <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.OrderShippingInformation}</div></div>
-      <div class="form-row">
-        <div class="field-label"><label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(required)</span></label></div>
-        <div><input type="text" name="shipToAddress1" id="shipToAddress1" class="required" value="${parameters.shipToAddress1?if_exists}"/></div>
-      </div>
-      <div class="form-row">
-        <div class="field-label"><label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label></div>
-        <div><input type="text" name="shipToAddress2" id="shipToAddress2" value="${parameters.shipToAddress2?if_exists}"/></div>
-      </div>
-      <div class="form-row">
-        <div class="field-label"><label for="shipToCity">${uiLabelMap.CommonCity}* <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span></label></div>
-        <div><input type="text" name="shipToCity" id="shipToCity" class="required" value="${parameters.shipToCity?if_exists}"/></div>
-      </div>
-      <div class="form-row">
-        <div class="field-label"><label for="shipToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span></label></div>
-        <div><input type="text" name="shipToPostalCode" id="shipToPostalCode" class="required" value="${parameters.shipToPostalCode?if_exists}" maxlength="10"/></div>
-      </div>
-      <div class="form-row">
-        <div class="field-label"><label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label></div>
-        <div>
-          <select name="shipToCountryGeoId" id="shipToCountryGeoId">
-            <#if shipToCountryGeoId??>
-              <option value="${shipToCountryGeoId!}">${shipToCountryProvinceGeo!(shipToCountryGeoId!)}</option>
-            </#if>
-            ${screens.render("component://common/widget/CommonScreens.xml#countries")}
-          </select>
-        </div>
-      </div>
-      <div id='shipToStates' class="form-row">
-        <div class="field-label"><label for="state">${uiLabelMap.CommonState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label></div>
-        <div>
-          <select id="shipToStateProvinceGeoId" name="shipToStateProvinceGeoId">
-            <#if shipToStateProvinceGeoId?has_content>
-              <option value='${shipToStateProvinceGeoId!}'>${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}</option>
-            <#else>
-               <option value="_NA_">${uiLabelMap.PartyNoState}</option>
-            </#if>
-          </select>
-        </div>
-      </div>
-      <div class="form-row">
-        <div class="field-label">
-          <label>${uiLabelMap.PartyPhoneNumber}*</label>
-          <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"></span>
-          <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"></span>
-          <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"></span>
-          <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
-        </div>
-        <div>
-          <input type="text" name="shipToCountryCode" id="shipToCountryCode" class="required" value="${parameters.shipToCountryCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="shipToAreaCode" id="shipToAreaCode" class="required" value="${parameters.shipToAreaCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="shipToContactNumber" id="shipToContactNumber" class="required" value="${contactNumber?default("${parameters.shipToContactNumber?if_exists}")}" size="6" maxlength="7"/>
-          - <input type="text" name="shipToExtension" id="shipToExtension" value="${extension?default("${parameters.shipToExtension?if_exists}")}" size="3" maxlength="3"/>
-        </div>
-      </div>
-      <div class="form-row">
-        <div><input type="checkbox" class="checkbox" name="useShippingAddressForBilling" id="useShippingAddressForBilling" value="Y" <#if parameters.useShippingAddressForBilling?has_content && parameters.useShippingAddressForBilling?default("")=="Y">checked</#if>/>&nbsp;&nbsp;${uiLabelMap.FacilityBillingAddressSameShipping}</div>
-      </div>
-    </div>
-
-    <div class="center right">
-      <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.PageTitleBillingInformation}</div></div>
-      <div id="billingAddress">
-        <div class="form-row">
-          <div class="field-label"><label for="billToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(required)</span></label></div>
-          <div><input type="text" name="billToAddress1" id="billToAddress1" class="required" value="${parameters.billToAddress1?if_exists}"/></div>
-        </div>
-        <div class="form-row">
-          <div class="field-label"><label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label></div>
-          <div><input type="text" name="billToAddress2" id="billToAddress2" value="${parameters.billToAddress2?if_exists}"/></div>
-        </div>
-        <div class="form-row">
-          <div class="field-label"><label for="billToCity">${uiLabelMap.CommonCity}* <span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span></label></div>
-          <div><input type="text" name="billToCity" id="billToCity" class="required" value="${parameters.billToCity?if_exists}"/></div>
-        </div>
-        <div class="form-row">
-          <div class="field-label"><label for="billToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span></label></div>
-          <div><input type="text" name="billToPostalCode" id="billToPostalCode" class="required" value="${parameters.billToPostalCode?if_exists}" maxlength="10"/></div>
-        </div>
-        <div class="form-row">
-        <div class="field-label"><label for="billToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label></div>
-        <div>
-          <select name="billToCountryGeoId" id="billToCountryGeoId" class='required selectBox'>
-            <#if billToCountryGeoId??>
-              <option value='${billToCountryGeoId!}'>${billToCountryProvinceGeo!(billToCountryGeoId!)}</option>
-            </#if>
-            ${screens.render("component://common/widget/CommonScreens.xml#countries")}
-          </select>
+    <form id="newUserForm" method="post" action="<@o...@ofbizUrl>">
+      <fieldset>
+        <input type="hidden" name="roleTypeId" value="CUSTOMER" />
+        <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL" />
+        <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
+        <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
+        <div class="left center">
+          <h3>${uiLabelMap.PartyContactInformation}</h3>
+          <div>
+            <label for="firstName">${uiLabelMap.PartyFirstName}* <span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label>
+            <input type="text" name="firstName" id="firstName" class="required" value="${parameters.firstName?if_exists}" size="30" maxlength="30" />
+          </div>
+          <div>
+            <label for="lastName">${uiLabelMap.PartyLastName}* <span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label>
+            <input type="text" name="lastName" id="lastName" class="required" value="${parameters.lastName?if_exists}" size="30" maxlength="30" />
+          </div>
+          <div>
+            <label for="emailAddress">${uiLabelMap.CommonEmail}*
+              <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span>
+            </label>
+            <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${parameters.emailAddress?if_exists}" size="30" maxlength="255" />
+          </div>
         </div>
-      </div>
-      <div id='billToStates' class="form-row">
-        <div class="field-label"><label for="state">${uiLabelMap.CommonState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label></div>
-        <div>
-          <select id="billToStateProvinceGeoId" name="billToStateProvinceGeoId">
-            <#if billToStateProvinceGeoId?has_content>
-              <option value='${billToStateProvinceGeoId!}'>${billToStateProvinceGeo!(billToStateProvinceGeoId!)}</option>
-            <#else>
-              <option value="_NA_">${uiLabelMap.PartyNoState}</option>
-            </#if>
-          </select>
+      </fieldset>
+      <fieldset>
+        <div class="center right">
+          <h3>${uiLabelMap.EcommerceAccountInformation}</h3>
+          <div id="userNameAndPasswordPanel">
+            <div>
+              <label for="username">${uiLabelMap.CommonUsername}* <span id="advice-required-username" style="display: none" class="errorMessage">(required)</span></label>
+              <input type="text" name="username" id="username" class="required" value="${parameters.username?if_exists}" size="30" maxlength="255" />
+            </div>
+            <div>
+              <label for="password">${uiLabelMap.CommonPassword}* <span id="advice-required-password" style="display: none" class="errorMessage">(required)</span></label>
+              <input type="password" name="password" id="password" class="required validate-password" value="${parameters.password?if_exists}" maxlength="16" />
+              <span id="advice-validate-password-password" class="errorMessage" style="display:none">${uiLabelMap["loginservices.password_may_not_equal_username"]}</span>
+            </div>
+            <div>
+              <label for="passwordVerify">${uiLabelMap.PartyRepeatPassword}* <span id="advice-required-passwordVerify" style="display: none" class="errorMessage">(required)</span></label>
+              <input type="password" name="passwordVerify" id="passwordVerify" class="required validate-passwordVerify" value="${parameters.passwordVerify?if_exists}" maxlength="16" />
+              <span id="advice-validate-passwordVerify-passwordVerify" class="errorMessage" style="display:none">${uiLabelMap["loginservices.password_did_not_match_verify_password"]}</span>
+            </div>
+          </div>
         </div>
-      </div>
-        <div class="form-row">
-          <div class="field-label">
+        <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span>
+      </fieldset>
+      <fieldset>
+        <div class="left center">
+          <h3>${uiLabelMap.OrderShippingInformation}</h3>
+          <div>
+            <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(required)</span></label>
+            <input type="text" name="shipToAddress1" id="shipToAddress1" class="required" value="${parameters.shipToAddress1?if_exists}" />
+          </div>
+          <div>
+            <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label>
+            <input type="text" name="shipToAddress2" id="shipToAddress2" value="${parameters.shipToAddress2?if_exists}" />
+          </div>
+          <div>
+            <label for="shipToCity">${uiLabelMap.CommonCity}* <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span></label>
+            <input type="text" name="shipToCity" id="shipToCity" class="required" value="${parameters.shipToCity?if_exists}" />
+          </div>
+          <div>
+            <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span></label>
+            <input type="text" name="shipToPostalCode" id="shipToPostalCode" class="required" value="${parameters.shipToPostalCode?if_exists}" maxlength="10" />
+          </div>
+          <div>
+            <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label>
+            <div>
+              <select name="shipToCountryGeoId" id="shipToCountryGeoId">
+                <#if shipToCountryGeoId??>
+                  <option value="${shipToCountryGeoId!}">${shipToCountryProvinceGeo!(shipToCountryGeoId!)}</option>
+                </#if>
+                ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+              </select>
+            </div>
+          </div>
+          <div id='shipToStates'>
+            <label for="shipToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
+            <div>
+              <select id="shipToStateProvinceGeoId" name="shipToStateProvinceGeoId">
+                <#if shipToStateProvinceGeoId?has_content>
+                  <option value='${shipToStateProvinceGeoId!}'>${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}</option>
+                <#else>
+                  <option value="_NA_">${uiLabelMap.PartyNoState}</option>
+                </#if>
+              </select>
+            </div>
+          </div>
+          <div>
             <label>${uiLabelMap.PartyPhoneNumber}*</label>
-            <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"></span>
-            <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"></span>
-            <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"></span>
-            <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
+            <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"></span>
+            <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"></span>
+            <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"></span>
+            <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
+            <input type="text" name="shipToCountryCode" id="shipToCountryCode" class="required" value="${parameters.shipToCountryCode?if_exists}" size="3" maxlength="3" />
+            - <input type="text" name="shipToAreaCode" id="shipToAreaCode" class="required" value="${parameters.shipToAreaCode?if_exists}" size="3" maxlength="3" />
+            - <input type="text" name="shipToContactNumber" id="shipToContactNumber" class="required" value="${contactNumber?default("${parameters.shipToContactNumber?if_exists}")}" size="6" maxlength="7" />
+            - <input type="text" name="shipToExtension" id="shipToExtension" value="${extension?default("${parameters.shipToExtension?if_exists}")}" size="3" maxlength="3" />
           </div>
           <div>
-            <input type="text" name="billToCountryCode" id="billToCountryCode" class="required" value="${parameters.billToCountryCode?if_exists}" size="3" maxlength="3"/>
-            - <input type="text" name="billToAreaCode" id="billToAreaCode" class="required" value="${parameters.billToAreaCode?if_exists}" size="3" maxlength="3"/>
-            - <input type="text" name="billToContactNumber" id="billToContactNumber" class="required" value="${contactNumber?default("${parameters.billToContactNumber?if_exists}")}" size="6" maxlength="7"/>
-            - <input type="text" name="billToExtension" id="billToExtension" value="${extension?default("${parameters.billToExtension?if_exists}")}" size="3" maxlength="3"/>
+            <input type="checkbox" class="checkbox" name="useShippingAddressForBilling" id="useShippingAddressForBilling" value="Y" <#if parameters.useShippingAddressForBilling?has_content && parameters.useShippingAddressForBilling?default("")=="Y">checked="checked"</#if> />
+            <label for="useShippingAddressForBilling">${uiLabelMap.FacilityBillingAddressSameShipping}</label>
           </div>
         </div>
-      </div>
-    </div>
-
-    <div class="bothclear"></div>
-    <div class="form-row">&nbsp;&nbsp;<a id="submitNewUserForm" href="javascript:void(0);" class="buttontext">${uiLabelMap.CommonSubmit}</a></div>
-  </form>
+      </fieldset>
+      <fieldset>
+        <div class="center right">
+          <h3>${uiLabelMap.PageTitleBillingInformation}</h3>
+          <div id="billingAddress">
+            <div>
+              <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(required)</span></label>
+              <input type="text" name="billToAddress1" id="billToAddress1" class="required" value="${parameters.billToAddress1?if_exists}" />
+            </div>
+            <div>
+              <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label>
+              <input type="text" name="billToAddress2" id="billToAddress2" value="${parameters.billToAddress2?if_exists}" />
+            </div>
+            <div>
+              <label for="billToCity">${uiLabelMap.CommonCity}*<span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span></label>
+              <input type="text" name="billToCity" id="billToCity" class="required" value="${parameters.billToCity?if_exists}" />
+            </div>
+            <div>
+              <label for="billToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span></label>
+              <input type="text" name="billToPostalCode" id="billToPostalCode" class="required" value="${parameters.billToPostalCode?if_exists}" maxlength="10" />
+            </div>
+            <div>
+              <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label>
+              <select name="billToCountryGeoId" id="billToCountryGeoId" class='required selectBox'>
+              <#if billToCountryGeoId??>
+                <option value='${billToCountryGeoId!}'>${billToCountryProvinceGeo!(billToCountryGeoId!)}</option>
+              </#if>
+                ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+              </select>
+            </div>
+            <div id='billToStates'>
+              <label for="billToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
+              <div>
+                <select id="billToStateProvinceGeoId" name="billToStateProvinceGeoId">
+                <#if billToStateProvinceGeoId?has_content>
+                  <option value='${billToStateProvinceGeoId!}'>${billToStateProvinceGeo!(billToStateProvinceGeoId!)}</option>
+                <#else>
+                  <option value="_NA_">${uiLabelMap.PartyNoState}</option>
+                </#if>
+                </select>
+              </div>
+            </div>
+            <div>
+              <label>${uiLabelMap.PartyPhoneNumber}*</label>
+              <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"></span>
+              <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"></span>
+              <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"></span>
+              <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
+              <input type="text" name="billToCountryCode" id="billToCountryCode" class="required" value="${parameters.billToCountryCode?if_exists}" size="3" maxlength="3"/>
+              - <input type="text" name="billToAreaCode" id="billToAreaCode" class="required" value="${parameters.billToAreaCode?if_exists}" size="3" maxlength="3"/>
+              - <input type="text" name="billToContactNumber" id="billToContactNumber" class="required" value="${contactNumber?default("${parameters.billToContactNumber?if_exists}")}" size="6" maxlength="7"/>
+              - <input type="text" name="billToExtension" id="billToExtension" value="${extension?default("${parameters.billToExtension?if_exists}")}" size="3" maxlength="3"/>
+            </div>
+          </div>
+        </div>
+      </fieldset>
+      <div><a id="submitNewUserForm" href="javascript:void(0);" class="button">${uiLabelMap.CommonSubmit}</a></div>
+    </form>
   </div>
 </div>
\ No newline at end of file