Author: mor
Date: Tue Sep  9 23:23:29 2008
New Revision: 693712

URL: http://svn.apache.org/viewvc?rev=693712&view=rev
Log:
Misc UI enhancements. Contribution from Rishi Solanki.

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

Modified: 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl?rev=693712&r1=693711&r2=693712&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
 (original)
+++ 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
 Tue Sep  9 23:23:29 2008
@@ -79,14 +79,18 @@
     <#if billToTelecomNumber?has_content>
       <div class="form-row">
         <div class="field-label">
-          <label 
for="phoneNumber_${billToTelecomNumber.contactMechId}">${uiLabelMap.PartyPhoneNumber}*</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="countryCode_${billToTelecomNumber.contactMechId}" class="required" 
value="${billToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="areaCode" 
id="areaCode_${billToTelecomNumber.contactMechId}" class="required" 
value="${billToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="contactNumber" 
id="contactNumber_${billToTelecomNumber.contactMechId}" class="required" 
value="${contactNumber?default("${billToTelecomNumber.contactNumber?if_exists}")}"
 size="6" maxlength="7"/>
-          - <input type="text" name="extension" 
id="extension_${billToTelecomNumber.contactMechId}" 
value="${extension?default("${billToExtension?if_exists}")}" size="3" 
maxlength="3"/>
+          <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>
     </#if>

Modified: 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=693712&r1=693711&r2=693712&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
 (original)
+++ 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
 Tue Sep  9 23:23:29 2008
@@ -80,14 +80,14 @@
       </span>
     </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">
       <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}"/>

Modified: 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl?rev=693712&r1=693711&r2=693712&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
 (original)
+++ 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
 Tue Sep  9 23:23:29 2008
@@ -79,14 +79,18 @@
     <#if shipToTelecomNumber?has_content>
       <div class="form-row">
         <div class="field-label">
-          <label 
for="phoneNumber_${shipToTelecomNumber.contactMechId}">${uiLabelMap.PartyPhoneNumber}*</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="countryCode_${shipToTelecomNumber.contactMechId}" class="required" 
value="${shipToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="areaCode" 
id="areaCode_${shipToTelecomNumber.contactMechId}" class="required" 
value="${shipToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3"/>
-          - <input type="text" name="contactNumber" 
id="contactNumber_${shipToTelecomNumber.contactMechId}" class="required" 
value="${contactNumber?default("${shipToTelecomNumber.contactNumber?if_exists}")}"
 size="6" maxlength="7"/>
-          - <input type="text" name="extension" 
id="extension_${shipToTelecomNumber.contactMechId}" 
value="${extension?default("${shipToExtension?if_exists}")}" size="3" 
maxlength="3"/>
+          <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>    
     </#if>

Modified: 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=693712&r1=693711&r2=693712&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
 (original)
+++ 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
 Tue Sep  9 23:23:29 2008
@@ -35,8 +35,9 @@
         <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"><span id="advice-required-address1" 
style="display: none" class="errorMessage">(required)</span>
+            <input type="text" class="required" name="address1" id="address1" 
value="" size="30" maxlength="30">
           </div>
         </div>
         <div class="form-row">
@@ -44,44 +45,46 @@
         </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"><span id="advice-required-city" style="display: none" 
class="errorMessage">(required)</span>
+            <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"><span 
id="advice-required-postalCode" style="display: none" 
class="errorMessage">(required)</span>
+            <input type="text" class="required" name="postalCode" 
id="postalCode" value="" size="30" maxlength="10">
           </div>
         </div>
         <div 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" 
class="required" style="width: 70%">
               <option value="">${uiLabelMap.PartyNoState}</option>
               
${screens.render("component://common/widget/CommonScreens.xml#states")}
             </select>
-            <span id="advice-required-stateProvinceGeoId" style="display: 
none" class="errorMessage">(required)</span>
           </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%">
               
${screens.render("component://common/widget/CommonScreens.xml#countries")}
             </select>
-            <span id="advice-required-countryGeoId" style="display: none" 
class="errorMessage">(required)</span>
           </div>
         </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">
           <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}"/>

Modified: 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl?rev=693712&r1=693711&r2=693712&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
 (original)
+++ 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
 Tue Sep  9 23:23:29 2008
@@ -32,11 +32,11 @@
       <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 class="form-field"><input type="text" name="firstName" 
id="firstName" class="required" value="${parameters.firstName?if_exists}" 
size="30" maxlength="30"></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 class="form-field"><input type="text" name="lastName" 
id="lastName" class="required" value="${parameters.lastName?if_exists}" 
size="30" maxlength="30"></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">
@@ -44,7 +44,7 @@
             <span id="advice-required-emailAddress" style="display: none" 
class="errorMessage">(required)</span>
           </label>
         </div>
-        <div class="form-field"><input type="text" class="required 
validate-email" name="emailAddress" id="emailAddress" 
value="${parameters.emailAddress?if_exists}" size="30" maxlength="255"/></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">
@@ -52,15 +52,15 @@
       <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 class="form-field"><input type="text" name="username" 
id="username" class="required" value="${parameters.username?if_exists}" 
size="30" maxlength="255"></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 class="form-field"><input type="password" name="password" 
id="password" class="required" value="${parameters.password?if_exists}" 
maxlength="16"></div>
+          <div><input type="password" name="password" id="password" 
class="required" value="${parameters.password?if_exists}" maxlength="16"></div>
         </div>
         <div class="form-row">
           <div class="field-label"><label 
for="passwordVerify">${uiLabelMap.CommonConfirm} 
${uiLabelMap.CommonPassword}*<span id="advice-required-passwordVerify" 
style="display: none" class="errorMessage">(required)</span></label></div>
-          <div class="form-field"><input type="password" name="passwordVerify" 
id="passwordVerify" class="required" 
value="${parameters.passwordVerify?if_exists}" maxlength="16"></div>
+          <div><input type="password" name="passwordVerify" 
id="passwordVerify" class="required" 
value="${parameters.passwordVerify?if_exists}" maxlength="16"></div>
         </div>
       </div>
     </div>
@@ -73,23 +73,23 @@
       <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 class="form-field"><input type="text" name="shipToAddress1" 
id="shipToAddress1" class="required" 
value="${parameters.shipToAddress1?if_exists}"/></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 class="form-field"><input type="text" name="shipToAddress2" 
id="shipToAddress2" value="${parameters.shipToAddress2?if_exists}"/></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 class="form-field"><input type="text" name="shipToCity" 
id="shipToCity" class="required" 
value="${parameters.shipToCity?if_exists}"/></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 class="form-field"><input type="text" name="shipToPostalCode" 
id="shipToPostalCode" class="required" 
value="${parameters.shipToPostalCode?if_exists}" maxlength="10"/></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="shipToStateProvinceGeoId">${uiLabelMap.CommonState}*<span 
id="advice-required-shipToStateProvinceGeoId" style="display: none" 
class="errorMessage">(required)</span></label></div>
-        <div class="form-field">
+        <div>
           <select name="shipToStateProvinceGeoId" 
id="shipToStateProvinceGeoId" class='selectBox'>
             <#if parameters.shipToStateProvinceGeoId?exists>
               <#assign geo = delegator.findOne("Geo", 
Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", 
parameters.shipToStateProvinceGeoId), true)>
@@ -101,7 +101,7 @@
       </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 class="form-field">
+        <div>
           <select name="shipToCountryGeoId" id="shipToCountryGeoId" 
class='selectBox'>
             <#if parameters.shipToCountryGeoId?exists>
               <#assign geo = delegator.findOne("Geo", 
Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", 
parameters.shipToCountryGeoId), true)>
@@ -117,9 +117,9 @@
           <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 id="shipToPhoneRequired" style="display: none;" 
class="errorMessage">(required)</div>
-        <div class="form-field">
+        <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"/>
@@ -127,7 +127,7 @@
         </div>
       </div>
       <div class="form-row">
-        <div class="form-field"><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><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>
 
@@ -136,23 +136,23 @@
       <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 class="form-field"><input type="text" name="billToAddress1" 
id="billToAddress1" class="required" 
value="${parameters.billToAddress1?if_exists}"/></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 class="form-field"><input type="text" name="billToAddress2" 
id="billToAddress2" value="${parameters.billToAddress2?if_exists}"/></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 class="form-field"><input type="text" name="billToCity" 
id="billToCity" class="required" 
value="${parameters.billToCity?if_exists}"/></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 class="form-field"><input type="text" name="billToPostalCode" 
id="billToPostalCode" class="required" 
value="${parameters.billToPostalCode?if_exists}" maxlength="10"/></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="billToStateProvinceGeoId">${uiLabelMap.CommonState}*<span 
id="advice-required-billToStateProvinceGeoId" style="display: none" 
class="errorMessage">(required)</span></label></div>
-          <div class="form-field">
+          <div>
             <select name="billToStateProvinceGeoId" 
id="billToStateProvinceGeoId" class="selectBox required">
               <#if parameters.billToStateProvinceGeoId?exists>
                 <#assign geo = delegator.findOne("Geo", 
Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", 
parameters.billToStateProvinceGeoId), true)>
@@ -164,7 +164,7 @@
         </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 class="form-field">
+          <div>
             <select name="billToCountryGeoId" id="billToCountryGeoId" 
class="selectBox required">
               <#if parameters.billToCountryGeoId?exists>
                 <#assign geo = delegator.findOne("Geo", 
Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", 
parameters.billToCountryGeoId), true)>
@@ -180,9 +180,9 @@
             <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 id="billToPhoneRequired" style="display: none;" 
class="errorMessage">(required)</div>
-          <div class="form-field">
+          <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"/>


Reply via email to