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/06/09 03:22:06 UTC
svn commit: r782859 - in
/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order:
OnePageCheckoutProcess.ftl anonymousCheckoutLinks.ftl custsettings.ftl
optionsettings.ftl paymentoptions.ftl shipsettings.ftl
Author: apatel
Date: Tue Jun 9 01:22:06 2009
New Revision: 782859
URL: http://svn.apache.org/viewvc?rev=782859&view=rev
Log:
simplified html markup of some more files.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=782859&r1=782858&r2=782859&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Tue Jun 9 01:22:06 2009
@@ -211,7 +211,6 @@
<div id="shippingSummaryPanel" style="display: none;">
<div class="buttons"><a href="javascript:void(0);" id="openShippingPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></div>
<div id="shippingCompleted">
- <h3 id="openShippingAndPersonlDetail">${uiLabelMap.FacilityShipping} ${uiLabelMap.EcommerceSummary}</h3>
<ul>
<li>
<h4>${uiLabelMap.OrderShipTo}</h4>
@@ -255,20 +254,20 @@
</#if>
</fieldset>
<div id="shippingFormServerError" class="errorMessage"></div>
- <fieldset id="shipToName">
- <div>
+ <div>
+ <span>
<label for="firstName">${uiLabelMap.PartyFirstName}*
<span id="advice-required-firstName" style="display: none" class="errorMessage"> (required)</span>
</label>
<input id="firstName" name="firstName" class="required" type="text" value="${firstName?if_exists}"/>
- </div>
- <div>
+ </span>
+ <span>
<label for="lastName">${uiLabelMap.PartyLastName}*
<span id="advice-required-lastName" style="display:none" class="errorMessage"> (required)</span>
</label>
<input id="lastName" name="lastName" class="required" type="text" value="${lastName?if_exists}"/>
- </div>
- </fieldset>
+ </span>
+ </div>
<div>
<#if shipToTelecomNumber?has_content>
<span>
@@ -394,19 +393,14 @@
<#-- ========================================================================================================================== -->
<div id="shippingOptionPanel" class="screenlet">
- <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 3: ${uiLabelMap.PageTitleShippingOptions}</div></div>
+ <h3>${uiLabelMap.EcommerceStep} 3: ${uiLabelMap.PageTitleShippingOptions}</h3>
<div id="shippingOptionSummaryPanel" class="screenlet-body" style="display: none;">
- <div class="buttons"><span><a href="javascript:void(0);" id="openShippingOptionPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></span></div>
+ <div class="buttons"><a href="javascript:void(0);" id="openShippingOptionPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></div>
<div class="completed" id="shippingOptionCompleted">
- <div id="openShippingOption"><h3>${uiLabelMap.FacilityShipping} ${uiLabelMap.ContentSurveyOption} ${uiLabelMap.EcommerceSummary}</h3></div>
- <table cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td valign="top">${uiLabelMap.CommonMethod}: </td>
- <td valign="top"><div id="selectedShipmentOption"></div></td>
- </tr>
- </tbody>
- </table>
+ <ul>
+ <li>${uiLabelMap.CommonMethod}</li>
+ <li id="selectedShipmentOption"></li>
+ </ul>
</div>
</div>
@@ -416,58 +410,48 @@
<fieldset>
<div id="shippingOptionFormServerError" class="errorMessage"></div>
<div>
- <span>
<label for="shipMethod">${uiLabelMap.OrderSelectShippingMethod}*
<span id="advice-required-shipping_method" class="custom-advice" style="display:none"> (required)</span>
</label>
<select id="shipMethod" name="shipMethod" class="required">
<option value=""></option>
</select>
- </span>
</div>
</fieldset>
</form>
<div class="buttons">
- <span><a href="javascript:void(0);" id="saveShippingMethod">${uiLabelMap.EcommerceContinueToStep} 4</a></span>
- <span><a style="display:none" href="javascript:void(0);" id="processingBilling">${uiLabelMap.EcommercePleaseWait}....</a></span>
+ <a href="javascript:void(0);" id="saveShippingMethod">${uiLabelMap.EcommerceContinueToStep} 4</a>
+ <a style="display:none" href="javascript:void(0);" id="processingBilling">${uiLabelMap.EcommercePleaseWait}....</a>
</div>
</div>
</div>
<#-- ========================================================================================================================== -->
<div id="billingPanel" class="screenlet">
- <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 4: ${uiLabelMap.AccountingBilling}</div></div>
+ <h3>${uiLabelMap.EcommerceStep} 4: ${uiLabelMap.AccountingBilling}</h3>
<div id="billingSummaryPanel" class="screenlet-body" style="display: none;">
- <div class="buttons"><span><a href="javascript:void(0);" id="openBillingPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></span></div>
+ <div class="buttons"><a href="javascript:void(0);" id="openBillingPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></div>
<div class="completed" id="billingCompleted">
- <div id="openBillingAndPersonlDetail"><h3>${uiLabelMap.AccountingBilling} ${uiLabelMap.CommonAnd} ${uiLabelMap.AccountingPayment} ${uiLabelMap.EcommerceSummary}</h3></div>
- <table width="35%">
- <tbody>
- <tr>
- <td valign="top">${uiLabelMap.OrderBillUpTo}:</td>
- <td valign="top">
- <div>
- <div id="completedBillToAttn"></div>
- <div id="completedBillToPhoneNumber"></div>
- <div id="completedCCNumber"></div>
- <div id="completedExpiryDate"></div>
- </div>
- </td>
- <td valign="top">${uiLabelMap.EcommerceLocation}:</td>
- <td valign="top">
- <div>
- <div id="completedBillToAddress1"></div>
- <div id="completedBillToAddress2"></div>
- <div id="completedBillToGeo"></div>
- </div>
- </td>
- </tr>
- <tr>
- <td valign="top">${uiLabelMap.AccountingPaymentMethodId}:</td>
- <td valign="top"><div><div id="paymentMethod"></div></div></td>
- </tr>
- </tbody>
- </table>
+ <ul>
+ <li>
+ <h4>${uiLabelMap.OrderBillUpTo}</h4>
+ <ul>
+ <li id="completedBillToAttn"></li>
+ <li id="completedBillToPhoneNumber"></li>
+ <li id="paymentMethod"></li>
+ <li id="completedCCNumber"></li>
+ <li id="completedExpiryDate"></li>
+ </ul>
+ </li>
+ <li>
+ <h4>${uiLabelMap.EcommerceLocation}</h4>
+ <ul>
+ <li id="completedBillToAddress1"></li>
+ <li id="completedBillToAddress2"></li>
+ <li id="completedBillToGeo"></li>
+ </ul>
+ </li>
+ </ul>
</div>
</div>
@@ -558,7 +542,6 @@
</#if>
</div>
<div>
- <span>
<label for="cardType">${uiLabelMap.AccountingCardType}*<span id="advice-required-cardType" style="display: none;" class="errorMessage"> (required)</span></label>
<select name="cardType" id="cardType">
<#if cardType?has_content>
@@ -566,7 +549,6 @@
</#if>
${screens.render("component://common/widget/CommonScreens.xml#cctypes")}
</select>
- </span>
</div>
<div>
<span>
@@ -607,43 +589,32 @@
</fieldset>
<fieldset class="col">
<div>
- <span>
<input class="checkbox" id="useShippingAddressForBilling" name="useShippingAddressForBilling" type="checkbox" value="Y" <#if useShippingAddressForBilling?has_content && useShippingAddressForBilling?default("")=="Y">checked</#if> />${uiLabelMap.FacilityBillingAddressSameShipping}
- </span>
</div>
<div id="billingAddress" <#if useShippingAddressForBilling?has_content && useShippingAddressForBilling?default("")=="Y">style="display:none"</#if>>
<div>
- <span>
<label for="billToAddress1">${uiLabelMap.PartyAddressLine1}*
<span id="advice-required-billToAddress1" style="display:none" class="errorMessage"> (required)</span>
</label>
<input id="billToAddress1" name="billToAddress1" class="required" size="30" type="text" value="${billToAddress1?if_exists}"/>
- </span>
</div>
<div>
- <span>
<label for="billToAddress2" style="margin-top: 9px;">${uiLabelMap.PartyAddressLine2}</label>
<input id="billToAddress2" name="billToAddress2" type="text" value="${billToAddress2?if_exists}" size="30"/>
- </span>
</div>
<div>
- <span>
<label for="billToCity">${uiLabelMap.CommonCity}*
<span id="advice-required-billToCity" style="display:none" class="errorMessage"> (required)</span>
</label>
<input id="billToCity" name="billToCity" class="required" type="text" value="${billToCity?if_exists}"/>
- </span>
</div>
<div>
- <span>
<label for="billToPostalCode">${uiLabelMap.PartyZipCode}*
<span id="advice-required-billToPostalCode" style="display:none" class="errorMessage"> (required)</span>
</label>
<input id="billToPostalCode" name="billToPostalCode" class="required" type="text" value="${billToPostalCode?if_exists}" size="12" maxlength="10"/>
- </span>
</div>
<div>
- <span>
<label for="billToCountryGeoId">${uiLabelMap.PartyCountry}*
<span id="advice-required-billToCountryGeoId" style="display:none" class="errorMessage"> (required)</span>
</label>
@@ -653,10 +624,8 @@
</#if>
${screens.render("component://common/widget/CommonScreens.xml#countries")}
</select>
- </span>
</div>
- <div id="billToStates">
- <span>
+ <div>
<label for="billToStateProvinceGeoId">${uiLabelMap.CommonState}*
<span id="advice-required-billToStateProvinceGeoId" style="display:none" class="errorMessage"> (required)</span>
</label>
@@ -667,7 +636,6 @@
<option value="_NA_">${uiLabelMap.PartyNoState}</option>
</#if>
</select>
- </span>
</div>
</div>
</fieldset>
@@ -681,15 +649,13 @@
<#-- ========================================================================================================================== -->
<div class="screenlet">
- <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 5: ${uiLabelMap.OrderSubmitOrder}</div></div>
+ <h3>${uiLabelMap.EcommerceStep} 5: ${uiLabelMap.OrderSubmitOrder}</h3>
<div id="orderSubmitPanel" style="display: none;">
<form id="orderSubmitForm" action="<@o...@ofbizUrl>" method="post">
- <fieldset>
<div class="buttons">
<input type="button" id="processOrderButton" name="processOrderButton" value="${uiLabelMap.OrderSubmitOrder}" />
<input type="button" style="display: none;" id="processingOrderButton" name="processingOrderButton" value="${uiLabelMap.OrderSubmittingOrder}" />
</div>
- </fieldset>
</form>
</div>
</div>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl?rev=782859&r1=782858&r2=782859&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl Tue Jun 9 01:22:06 2009
@@ -21,30 +21,30 @@
form.submit();
}
</script>
-<div>
- <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Personal Info</a>
+<div class="buttons">
+ <a href="<@o...@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Personal Info</a>
<#if (enableShippingAddress)?exists>
- <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Shipping Address</a>
+ <a href="<@o...@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Shipping Address</a>
<#else>
<span class="buttontextdisabled">Shipping Address</span>
</#if>
<#if (enableShipmentMethod)?exists>
- <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Shipping Options</a>
+ <a href="<@o...@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Shipping Options</a>
<#else>
<span class="buttontextdisabled">Shipping Options</span>
</#if>
<#if (enablePaymentOptions)?exists>
- <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Payment Options</a>
+ <a href="<@o...@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Payment Options</a>
<#else>
<span class="buttontextdisabled">Payment Options</span>
</#if>
<#if (enablePaymentInformation)?exists>
- <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Payment Information</a>
+ <a href="<@o...@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Payment Information</a>
<#else>
<span class="buttontextdisabled">Payment Information</span>
</#if>
<#if (enableReviewOrder)?exists>
- <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Review Order</a>
+ <a href="<@o...@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Review Order</a>
<#else>
<span class="buttontextdisabled">Review Order</span>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl?rev=782859&r1=782858&r2=782859&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl Tue Jun 9 01:22:06 2009
@@ -17,128 +17,110 @@
under the License.
-->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.PartyBasicInformation}</div>
+<h3>${uiLabelMap.EcommerceYourNamePhoneAndEmail}</h3>
+<form id="editCustomerNamePhoneAndEmail" name="${parameters.formNameValue}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/>
+ <fieldset>
+ <div>
+ <span>
+ <label for="personalTitle">${uiLabelMap.CommonTitle}</label>
+ <select name="personalTitle">
+ <#if requestParameters.personalTitle?has_content >
+ <option>${parameters.personalTitle}</option>
+ <option value="${parameters.personalTitle}"> -- </option>
+ <#else>
+ <option value="">${uiLabelMap.CommonSelectOne}</option>
+ </#if>
+ <option>${uiLabelMap.CommonTitleMr}</option>
+ <option>${uiLabelMap.CommonTitleMrs}</option>
+ <option>${uiLabelMap.CommonTitleMs}</option>
+ <option>${uiLabelMap.CommonTitleDr}</option>
+ </select>
+ </span>
+ <span>
+ <lable for="firstName">${uiLabelMap.PartyFirstName}</label>
+ <input type="text" name="firstName" value="${parameters.firstName?if_exists}"> *
+ </span>
+ <span>
+ <lable for="middleName">${uiLabelMap.PartyMiddleInitial}</label>
+ <input type="text" name="middleName" value="${parameters.middleName?if_exists}">
+ </span>
+ <span>
+ <lable for="lastName">${uiLabelMap.PartyLastName}</label>
+ <input type="text" name="lastName" value="${parameters.lastName?if_exists}"> *
+ </span>
+ <span>
+ <lable for="suffix">${uiLabelMap.PartySuffix}</label>
+ <input type="text" class='inputBox' name="suffix" value="${parameters.suffix?if_exists}">
+ </span>
</div>
- <div class="screenlet-body">
- <form name="${parameters.formNameValue}" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/>
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonTitle}</div></td>
- <td width="5"> </td>
- <td width="74%">
- <input type="text" class="inputBox" name="personalTitle" value="${parameters.personalTitle?if_exists}" size="10" maxlength="30"/>
- </td>
- </tr>
- <tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyFirstName}</div></td>
- <td width="5"> </td>
- <td width="74%">
- <input type="text" class="inputBox" name="firstName" value="${parameters.firstName?if_exists}" size="30" maxlength="30"/>
- *</td>
- </tr>
- <tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyMiddleInitial}</div></td>
- <td width="5"> </td>
- <td width="74%">
- <input type="text" class="inputBox" name="middleName" value="${parameters.middleName?if_exists}" size="4" maxlength="4"/>
- </td>
- </tr>
- <tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyLastName} </div></td>
- <td width="5"> </td>
- <td width="74%">
- <input type="text" class="inputBox" name="lastName" value="${parameters.lastName?if_exists}" size="30" maxlength="30"/>
- *</td>
- </tr>
- <tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartySuffix}</div></td>
- <td width="5"> </td>
- <td width="74%">
- <input type="text" class="inputBox" name="suffix" value="${parameters.suffix?if_exists}" size="10" maxlength="30"/>
- </td>
- </tr>
- <tr>
- <td colspan="3"> </td>
- </tr>
- <tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyHomePhone}</div></td>
- <td width="5"> </td>
- <td width="74%">
- <input type="hidden" name="homePhoneContactMechId" value="${parameters.homePhoneContactMechId?if_exists}"/>
- <input type="text" class="inputBox" name="homeCountryCode" value="${parameters.homeCountryCode?if_exists}" size="4" maxlength="10"/>
- - <input type="text" class="inputBox" name="homeAreaCode" value="${parameters.homeAreaCode?if_exists}" size="4" maxlength="10"/>
- - <input type="text" class="inputBox" name="homeContactNumber" value="${parameters.homeContactNumber?if_exists}" size="15" maxlength="15"/>
- - <input type="text" class='inputBox' name="homeExt" value="${parameters.homeExt?if_exists}" size="6" maxlength="10"/> *
- </td>
- </tr>
- <tr>
- <td width="26%" align="right" valign="top"><div class="tabletext"></div></td>
- <td width="5"> </td>
- <td width="74%"><div class="tabletext">[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
- </tr>
- <tr>
- <td width="26%" align="right"><div class="tabletext">(${uiLabelMap.PartyAllowSolicitation}?)</div></td>
- <td width="5"> </td>
- <td width="74%">
- <select name="homeSol" class="selectBox">
- <#if (((parameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
- <#if (((parameters.homeSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
- <option></option>
- <option value="Y">${uiLabelMap.CommonY}</option>
- <option value="N">${uiLabelMap.CommonN}</option>
- </select>
- </td>
- </tr>
- <tr>
- <td colspan="3"> </td>
- </tr>
- <tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyBusinessPhone}</div></td>
- <td width="5"> </td>
- <td width="74%">
- <input type="hidden" name="workPhoneContactMechId" value="${parameters.workPhoneContactMechId?if_exists}"/>
- <input type="text" class="inputBox" name="workCountryCode" value="${parameters.workCountryCode?if_exists}" size="4" maxlength="10"/>
- - <input type="text" class="inputBox" name="workAreaCode" value="${parameters.workAreaCode?if_exists}" size="4" maxlength="10"/>
- - <input type="text" class="inputBox" name="workContactNumber" value="${parameters.workContactNumber?if_exists}" size="15" maxlength="15"/>
- - <input type="text" class='inputBox' name="workExt" value="${parameters.workExt?if_exists}" size="6" maxlength="10"/>
- </td>
- </tr>
- <tr>
- <td width="26%" align="right" valign="top"><div class="tabletext"></div></td>
- <td width="5"> </td>
- <td width="74%"><div class="tabletext">[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
- </tr>
- <tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyEmailAddress}</div></td>
- <td width="5"> </td>
- <td width="74%">
- <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/>
- <input type="text" class="inputBox" name="emailAddress" value="${parameters.emailAddress?if_exists}" size="60" maxlength="255"/> *
- </td>
- </tr>
- <tr>
- <td width="26%" align="right"><div class="tabletext">(${uiLabelMap.PartyAllowSolicitation}?)</div></td>
- <td width="5"> </td>
- <td width="74%">
- <select name="emailSol" class="selectBox">
- <#if (((parameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
- <#if (((parameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
- <option></option>
- <option value="Y">${uiLabelMap.CommonY}</option>
- <option value="N">${uiLabelMap.CommonN}</option>
- </select>
- </td>
- </tr>
- <tr>
- <td colspan="3"> </td>
- </tr>
- <tr>
- <td colspan="3" align="center"><input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/></td>
- </tr>
- </table>
- </form>
- </div>
-</div>
+ </fieldset>
+
+ <table summary="Tabular form for entering multiple telecom numbers for different purposes. Each row allows user to enter telecom number for a purpose">
+ <caption>${uiLabelMap.PartyPhoneNumbers}</caption>
+ <tr>
+ <th></th>
+ <th scope="col">${uiLabelMap.PartyCountry}</th>
+ <th scope="col">${uiLabelMap.PartyAreaCode}</th>
+ <th scope="col">${uiLabelMap.PartyContactNumber}</th>
+ <th scope="col">${uiLabelMap.PartyExtension}</th>
+ <th scope="col">${uiLabelMap.PartyAllowSolicitation}</th>
+ </tr>
+ <tr>
+ <th scope="row">${uiLabelMap.PartyHomePhone}</th>
+ <input type="hidden" name="homePhoneContactMechId" value="${parameters.homePhoneContactMechId?if_exists}"/>
+ <td><input type="text" name="homeCountryCode" value="${parameters.homeCountryCode?if_exists}"></td>
+ <td><input type="text" name="homeAreaCode" value="${parameters.homeAreaCode?if_exists}"></td>
+ <td><input type="text" name="homeContactNumber" value="${parameters.homeContactNumber?if_exists}"></td>
+ <td><input type="text" name="homeExt" value="${parameters.homeExt?if_exists}"></td>
+ <td>
+ <select name="homeSol">
+ <#if (((parameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
+ <#if (((parameters.homeSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+ <option></option>
+ <option value="Y">${uiLabelMap.CommonY}</option>
+ <option value="N">${uiLabelMap.CommonN}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <th scope="row">${uiLabelMap.PartyBusinessPhone}</th>
+ <input type="hidden" name="workPhoneContactMechId" value="${parameters.workPhoneContactMechId?if_exists}"/>
+ <td><input type="text" name="workCountryCode" value="${parameters.workCountryCode?if_exists}"></td>
+ <td><input type="text" name="workAreaCode" value="${parameters.workAreaCode?if_exists}"></td>
+ <td><input type="text" name="workContactNumber" value="${parameters.workContactNumber?if_exists}"></td>
+ <td><input type="text" name="workExt" value="${parameters.workExt?if_exists}"></td>
+ <td>
+ <select name="workSol">
+ <#if (((parameters.workSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
+ <#if (((parameters.workSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+ <option></option>
+ <option value="Y">${uiLabelMap.CommonY}</option>
+ <option value="N">${uiLabelMap.CommonN}</option>
+ </select>
+ </td>
+ </tr>
+</table>
+ <fieldset>
+ <div>
+ <span>
+ <label for="emailAddress">${uiLabelMap.PartyEmailAddress}</label>
+ <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/>
+ <input type="text" class="inputBox" name="emailAddress" value="${parameters.emailAddress?if_exists}"/> *
+ </span>
+ <span>
+ <label for="emailSol">${uiLabelMap.PartyAllowSolicitation}</label>
+ <select name="emailSol" class="selectBox">
+ <#if (((parameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
+ <#if (((parameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+ <option></option>
+ <option value="Y">${uiLabelMap.CommonY}</option>
+ <option value="N">${uiLabelMap.CommonN}</option>
+ </select>
+ </span>
+ </div>
+ </fieldset>
+ <div class="buttons">
+ <input type="submit" value="${uiLabelMap.CommonContinue}"/>
+ </div>
+</form>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl?rev=782859&r1=782858&r2=782859&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl Tue Jun 9 01:22:06 2009
@@ -17,109 +17,69 @@
under the License.
-->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.OrderShippingInformation}</div>
- </div>
- <div class="screenlet-body">
- <form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
- <input type="hidden" name="finalizeMode" value="options"/>
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <#list carrierShipmentMethodList as carrierShipmentMethod>
- <tr>
- <td width="1%" valign="top" >
- <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
- <input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
- </td>
- <td valign="top">
- <div class="tabletext">
- <#if shoppingCart.getShippingContactMechId()?exists>
- <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
- </#if>
- <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} </#if>${carrierShipmentMethod.description?if_exists}
- <#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if>
- </div>
- </td>
- </tr>
- </#list>
- <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0>
- <tr>
- <td width="1%" valign="top">
- <input type="radio" name="shipping_method" value="Default" checked="checked"/>
- </td>
- <td valign="top">
- <div class="tabletext">${uiLabelMap.OrderUseDefault}.</div>
- </td>
- </tr>
- </#if>
- <tr><td colspan="2"><hr/></td></tr>
- <tr>
- <td colspan="2">
- <h2>${uiLabelMap.OrderShipAllAtOnce}?</h2>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <input type="radio" <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if> name="may_split" value="false"/>
- </td>
- <td valign="top">
- <div class="tabletext">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if> type="radio" name="may_split" value="true"/>
- </td>
- <td valign="top">
- <div class="tabletext">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
- </td>
- </tr>
- <tr><td colspan="2"><hr/></td></tr>
- <tr>
- <td colspan="2">
- <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <textarea class="textAreaBox" cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea>
- </td>
- </tr>
- <tr><td colspan="2"><hr/></td></tr>
- <tr>
- <td colspan="2">
- <h2>${uiLabelMap.OrderPoNumber}</h2>
- <input type="text" class="inputBox" name="correspondingPoId" size="15" value="${shoppingCart.getPoNumber()?if_exists}"/>
- </td>
- </tr>
- <#if productStore.showCheckoutGiftOptions?if_exists != "N">
- <tr><td colspan="2"><hr/></td></tr>
- <tr>
- <td colspan="2">
- <div>
- <h2>${uiLabelMap.OrderIsThisGift}</h2>
- <input type="radio" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"/><span class="tabletext">${uiLabelMap.CommonYes}</span>
- <input type="radio" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"/><span class="tabletext">${uiLabelMap.CommonNo}</span>
- </div>
- </td>
- </tr>
- <tr><td colspan="2"><hr/></td></tr>
- <tr>
- <td colspan="2"><h2>${uiLabelMap.OrderGiftMessage}</h2>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <textarea class="textAreaBox" cols="30" rows="3" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea>
- </td>
- </tr>
+ <h3>${uiLabelMap.OrderShippingInformation}</h3>
+ <form id="shipOptionsAndShippingInstructions" method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
+ <fieldset><legend>${uiLabelMap.OrderShippingInformation}</legend>
+ <input type="hidden" name="finalizeMode" value="options"/>
+ <ul>
+ <#list carrierShipmentMethodList as carrierShipmentMethod>
+ <li>
+ <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
+ <input type="radio" id="shipping_method_${shippingMethod}" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
+ <lable for="shipping_method_${shippingMethod}">
+ <#if shoppingCart.getShippingContactMechId()?exists>
+ <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
</#if>
- <tr>
- <td align="center" colspan="2">
- <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/>
- </td>
- </tr>
- </table>
- </form>
+ <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} </#if>${carrierShipmentMethod.description?if_exists}
+ <#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if>
+ </#if>
+ </label>
+ </li>
+ </#list>
+ <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0>
+ <div>
+ <input type="radio" name="shipping_method" value="Default" checked="checked"/>
+ <label for="shipping_method">${uiLabelMap.OrderUseDefault}.</label>
+ </div>
+ </#if>
+ </fieldset>
+ <fieldset><legend>${uiLabelMap.OrderShipAllAtOnce}?</legend>
+ <div>
+ <input type="radio" id="maySplit_N" <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if> name="may_split" value="false"/>
+ <label for="maySplit_N">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</label>
+ </div>
+ <div>
+ <input type="radio" id="maySplit_Y" <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if> name="may_split" value="true"/>
+ <label for="maySplit_Y">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</label>
+ </div>
+ </fieldset>
+ <fieldset>
+ <div>
+ <label for="shipping_instructions">${uiLabelMap.OrderSpecialInstructions}</label>
+ <textarea cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea>
+ </div>
+ <div>
+ <label for="correspondingPoId">${uiLabelMap.OrderPoNumber}</label>
+ <input type="text" name="correspondingPoId" value="${shoppingCart.getPoNumber()?if_exists}"/>
+ </div>
+ </fieldset>
+ <#if productStore.showCheckoutGiftOptions?if_exists != "N">
+ <fieldset><legend>${uiLabelMap.OrderIsThisGift}</legend>
+ <div>
+ <input type="radio" id="is_gift_Y" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"/>
+ <label for="is_gift_Y">${uiLabelMap.CommonYes}</label>
+ </div>
+ <div>
+ <input type="radio" id="is_gift_N" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"/>
+ <label far="is_gift_N">${uiLabelMap.CommonNo}</label>
+ </div>
+ <div>
+ <lable for="gift_message">${uiLabelMap.OrderGiftMessage}</label>
+ <textarea class="textAreaBox" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea>
+ </div>
+ </fieldset>
+ </#if>
+ <div class="buttons">
+ <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/>
</div>
-</div>
+ </form>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl?rev=782859&r1=782858&r2=782859&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl Tue Jun 9 01:22:06 2009
@@ -18,48 +18,36 @@
-->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class='boxhead'> ${uiLabelMap.AccountingPaymentInformation}</div>
- </div>
- <div class="screenlet-body">
-
- <#-- initial screen show a list of options -->
- <form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
- <tr>
- <td width="5%" nowrap="nowrap"><input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?exists && addGiftCard == "Y">checked</#if>/></td>
- <td width="95%" nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td>
- </tr>
- <tr><td colspan="2"><hr/></td></tr>
- </#if>
- <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
- <tr>
- <td width="5%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_OFFLINE">checked</#if>/></td>
- <td width="95%" nowrap="nowrap"><div class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
- </tr>
- <tr><td colspan="2"><hr/></td></tr>
- </#if>
- <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
- <tr>
- <td width="5%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "CREDIT_CARD">checked</#if>/></td>
- <td width="95%" nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
- </tr>
- <tr><td colspan="2"><hr/></td></tr>
- </#if>
- <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
- <tr>
- <td width="5%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EFT_ACCOUNT">checked</#if>/></td>
- <td width="95%" nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
- </tr>
- </#if>
- <tr>
- <td align="center" colspan="2">
- <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/>
- </td>
- </tr>
- </table>
- </form>
- </div>
-</div>
+ <h3>${uiLabelMap.AccountingPaymentInformation}</h3>
+ <#-- initial screen show a list of options -->
+ <form id="editPaymentOptions" method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
+ <fieldset>
+ <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
+ <div>
+ <input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?exists && addGiftCard == "Y">checked</#if>/>
+ <label for="addGiftCard">${uiLabelMap.AccountingCheckGiftCard}</label>
+ </div>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
+ <div>
+ <input type="radio" id="paymentMethodTypeId_EXT_OFFLINE" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_OFFLINE">checked</#if>/>
+ <label for="paymentMethodTypeId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
+ </div>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
+ <div>
+ <input type="radio" id="paymentMethodTypeId_CREDIT_CARD" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "CREDIT_CARD">checked</#if>/>
+ <label for="paymentMethodTypeId_CREDIT_CARD">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</label>
+ </div>
+ </#if>
+ <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
+ <div>
+ <input type="radio" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EFT_ACCOUNT">checked</#if>/>
+ <label for="paymentMethodTypeId_EFT_ACCOUNT" class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</label>
+ </div>
+ </#if>
+ <div class="buttons">
+ <input type="submit" value="${uiLabelMap.CommonContinue}"/>
+ </div>
+ </fieldset>
+ </form>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl?rev=782859&r1=782858&r2=782859&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl Tue Jun 9 01:22:06 2009
@@ -16,27 +16,56 @@
specific language governing permissions and limitations
under the License.
-->
-
-<div class="screenlet">
- <div class="screenlet-header">
- <div class='boxhead'> ${uiLabelMap.OrderShippingInformation}</div>
- </div>
- <div class="screenlet-body">
- <form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
- <input type="hidden" name="contactMechId" value="${parameters.shippingContactMechId?if_exists}"/>
- <input type="hidden" name="partyId" value="${cart.getPartyId()?default("_NA_")}"/>
-
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.OrderShippingAddress}</div></td>
- <td width="5"> </td>
- <td width="74%"> </td>
- </tr>
- ${screens.render("component://ecommerce/widget/OrderScreens.xml#genericaddress")}
- <tr>
- <td colspan="3" align="center"><input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/></td>
- </tr>
- </table>
- </form>
- </div>
-</div>
+<#assign cart = sessionAttributes.shoppingCart?if_exists>
+ <h3>${uiLabelMap.OrderShippingInformation}</h3>
+ <div id="shippingFormServerError" class="errorMessage"></div>
+ <form id="editShippingContact" method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
+ <fieldset><legend>${uiLabelMap.OrderShippingInformation}</legend>
+ <input type="hidden" name="shippingContactMechId" value="${parameters.shippingContactMechId?if_exists}"/>
+ <input type="hidden" name="partyId" value="${cart.getPartyId()?default("_NA_")}"/>
+ <div>
+ <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*</label>
+ <input id="shipToAddress1" name="shipToAddress1" class="required" type="text" value="${shipToAddress1?if_exists}"/>
+ <span id="advice-required-shipToAddress1" class="custom-advice errorMessage" style="display:none"> (required)</span>
+ </div>
+ <div>
+ <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label>
+ <input id="shipToAddress2" name="shipToAddress2" type="text" value="${shipToAddress2?if_exists}"/>
+ </div>
+ <div>
+ <label for="shipToCity">${uiLabelMap.CommonCity}*</label>
+ <input id="shipToCity" name="shipToCity" class="required" type="text" value="${shipToCity?if_exists}"/>
+ <span id="advice-required-shipToCity" class="custom-advice errorMessage" style="display:none"> (required)</span>
+ </div>
+ <div>
+ <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*</label>
+ <input id="shipToPostalCode" name="shipToPostalCode" class="required" type="text" value="${shipToPostalCode?if_exists}" size="12" maxlength="10"/>
+ <span id="advice-required-shipToPostalCode" class="custom-advice errorMessage" style="display:none"> (required)</span>
+ </div>
+ <div>
+ <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}*</label>
+ <select name="shipToCountryGeoId" id="shipToCountryGeoId">
+ <#if shipToCountryGeoId??>
+ <option value="${shipToCountryGeoId!}">${shipToCountryProvinceGeo!(shipToCountryGeoId!)}</option>
+ </#if>
+ ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+ </select>
+ <span id="advice-required-shipToCountryGeo" style="display:none" class="errorMessage"> (required)</span>
+ </div>
+ <div>
+ <label for="state">${uiLabelMap.CommonState}*</label>
+ <select id="shipToStateProvinceGeoId" name="shipToStateProvinceGeoId">
+ <#if shipToStateProvinceGeoId?has_content>
+ <option value='${shipToStateProvinceGeoId!}'>${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}</option>
+ <#else>
+ <option value="_NA_">${uiLabelMap.PartyNoState}</option>
+ </#if>
+ ${screens.render("component://common/widget/CommonScreens.xml#states")}
+ </select>
+ <span id="advice-required-shipToStateProvinceGeoId" style="display:none" class="errorMessage">(required)</span>
+ </div>
+ <div class="buttons">
+ <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/>
+ </div>
+ </fieldset>
+ </form>