You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2008/07/08 16:17:48 UTC
svn commit: r674839 -
/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
Author: mor
Date: Tue Jul 8 07:17:48 2008
New Revision: 674839
URL: http://svn.apache.org/viewvc?rev=674839&view=rev
Log:
UI fixes in Step 2 (Shipping) on One Page Checkout
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=674839&r1=674838&r2=674839&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Tue Jul 8 07:17:48 2008
@@ -286,7 +286,6 @@
<div class="screenlet-body">
<table id="shippingTable">
<tr><td>
- <fieldset>
<div class="form-row">
<div class="field-label">
<label for="firstName">${uiLabelMap.PartyFirstName}<span>*</span>
@@ -309,21 +308,21 @@
</div>
<div class="form-row">
<div class="field-label">
- <label for="countryCode">${uiLabelMap.PartyCountryCode}<span>*</span>
+ <label for="countryCode">${uiLabelMap.PartyCountry}<span>*</span>
<span id="advice-required-shippingCountryCode" style="display:none">(required)</span>
</label>
- <input name="countryCode" class="required" id="shippingCountryCode" value="${parameters.countryCode?if_exists}" size="3" maxlength=3>
+ <label for="areaCode">${uiLabelMap.PartyAreaCode}<span>*</span><span id="advice-required-shippingAreaCode" style="display:none">(required)</span></label>
</div>
- <div class="field-label">
- <label for="areaCode">${uiLabelMap.PartyAreaCode}<span>*</span><span id="advice-required-shippingAreaCode" style="display:none">(required)/span></label>
+ <div class="field-widget">
+ <input name="countryCode" class="required" id="shippingCountryCode" value="${parameters.countryCode?if_exists}" size="3" maxlength=3>
<input name="areaCode" class="required" id="shippingAreaCode" value="${parameters.areaCode?if_exists}" size="3" maxlength=3>
</div>
<div class="field-label">
<label for="contactNumber">${uiLabelMap.PartyContactNumber}<span>*</span><span id="advice-required-shippingContactNumber" style="display:none">(required)</span></label>
- <input name="contactNumber" class="required" id="shippingContactNumber" value="${parameters.contactNumber?if_exists}" size="7" maxlength=7>
- </div>
- <div class="field-label">
<label for="extension">${uiLabelMap.PartyExtension}</label>
+ </div>
+ <div class="field-widget">
+ <input name="contactNumber" class="required" id="shippingContactNumber" value="${parameters.contactNumber?if_exists}" size="7" maxlength=7>
<input name="extension" id="shippingExtension" value="${parameters.extension?if_exists}" size="3" maxlength=3>
</div>
</div>
@@ -337,8 +336,6 @@
<input id="emailAddress" name="emailAddress" class="required validate-email" type="text" value="${parameters.emailAddress?if_exists}"/>
</div>
</div>
- </fieldset>
- <fieldset class="right">
<div class="form-row">
<div class="field-label">
<label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}<span>*</span><span id="advice-required-shipToAddress1" class="custom-advice" style="display:none">(required)</span></label>
@@ -347,6 +344,7 @@
<input id="shipToAddress1" name="shipToAddress1" class="required" type="text" value="${parameters.shipToAddress1?if_exists}"/>
</div>
</div>
+ </td><td> </td><td>
<div class="form-row">
<div class="field-label"><label for="address2">${uiLabelMap.PartyAddressLine2}</label></div>
<div class="field-widget">
@@ -365,13 +363,13 @@
<div class="field-label">
<label for="state">${uiLabelMap.CommonState}<span>*</span></label>
</div>
- <div class="field-label" style="clear:both;">
- <select class="required" id="shipToStateProvinceGeoId" name="shipToStateProvinceGeoId">
+ <div class="field-widget">
+ <select name="shipToStateProvinceGeoId" id="shipToStateProvinceGeoId" class="required">
<#if (parameters.shipToStateProvinceGeoId)?exists>
<option>${parameters.shipToStateProvinceGeoId}</option>
<option value="${parameters.shipToStateProvinceGeoId}"</option>
<#else>
- <option value="CA">CA - California</option>
+ <option value="">${uiLabelMap.PartyNoState}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#states")}
</select>
@@ -386,9 +384,11 @@
</div>
</div>
<div class="form-row">
- <div class="form-label">${uiLabelMap.PartyCountry}<span>*</span></div>
- <div class="form-field">
- <select name="shipToCountryGeoId" id="shipToCountryGeoId" class="selectBox">
+ <div class="field-label">
+ <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}<span class="requiredLabel"> *</span></label>
+ </div>
+ <div class="field-widget">
+ <select name="shipToCountryGeoId" id="shipToCountryGeoId" class="required">
<#if (parameters.shipToCountryGeoId)?exists>
<option>${parameters.shipToCountryGeoId}</option>
<option value="${parameters.shipToCountryGeoId}">---</option>