Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditProfile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditProfile.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditProfile.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditProfile.ftl Sat Sep 17 07:17:15 2016 @@ -23,46 +23,64 @@ under the License. <fieldset class="left center"> <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL" /> <input type="hidden" name="emailContactMechId" value="${emailContactMechId!}" /> - <h3>${uiLabelMap.PartyContactInformation}</h3> - <div> - <label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="firstName" id="firstName" class="required" value="${firstName!}" maxlength="30" /> - </div> - <div> - <label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="lastName" id="lastName" class="required" value="${lastName!}" maxlength="30" /> - </div> - <div> - <label for="emailAddress">${uiLabelMap.CommonEmail}* - <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> - <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span> - </label> - <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${emailAddress!}" maxlength="255" /> - </div> + <h3>${uiLabelMap.PartyContactInformation}</h3> + <div> + <label for="firstName"> + ${uiLabelMap.PartyFirstName}* + <span id="advice-required-firstName" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="firstName" id="firstName" class="required" value="${firstName!}" maxlength="30" /> + </div> + <div> + <label for="lastName"> + ${uiLabelMap.PartyLastName}* + <span id="advice-required-lastName" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="lastName" id="lastName" class="required" value="${lastName!}" maxlength="30" /> + </div> + <div> + <label for="emailAddress">${uiLabelMap.CommonEmail}* + <span id="advice-required-emailAddress" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none"> + ${uiLabelMap.PartyEmailAddressNotFormattedCorrectly} + </span> + </label> + <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" + value="${emailAddress!}" maxlength="255" /> + </div> </fieldset> <fieldset class="center right"> - <h3>${uiLabelMap.EcommerceAccountInformation}</h3> - <div> - <label for="userLoginId">${uiLabelMap.CommonUsername}*</label> - <input type="text" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId!}" maxlength="255" <#if userLogin.userLoginId??>disabled="disabled"</#if> /> - </div> - <div> - <label for="currentPassword">${uiLabelMap.CommonCurrentPassword}*</label> - <input type="password" name="currentPassword" id="currentPassword" value="" maxlength="16" /> - </div> - <div> - <label for="newPassword">${uiLabelMap.CommonNewPassword}*</label> - <input type="password" name="newPassword" id="newPassword" value="" maxlength="16" /> - </div> - <div> - <label for="newPasswordVerify">${uiLabelMap.CommonNewPasswordVerify}*</label> - <input type="password" name="newPasswordVerify" id="newPasswordVerify" value="" maxlength="16" /> - </div> + <h3>${uiLabelMap.EcommerceAccountInformation}</h3> + <div> + <label for="userLoginId">${uiLabelMap.CommonUsername}*</label> + <input type="text" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId!}" + maxlength="255" <#if userLogin.userLoginId??>disabled="disabled"</#if> /> + </div> + <div> + <label for="currentPassword">${uiLabelMap.CommonCurrentPassword}*</label> + <input type="password" name="currentPassword" id="currentPassword" value="" maxlength="16" /> + </div> + <div> + <label for="newPassword">${uiLabelMap.CommonNewPassword}*</label> + <input type="password" name="newPassword" id="newPassword" value="" maxlength="16" /> + </div> + <div> + <label for="newPasswordVerify">${uiLabelMap.CommonNewPasswordVerify}*</label> + <input type="password" name="newPasswordVerify" id="newPasswordVerify" value="" maxlength="16" /> + </div> </fieldset> <div> <input type="submit" id="submitEditUserForm" class="button" vlaue="${uiLabelMap.CommonSubmit}"> - <a id="cancelEditUserForm" href="<@ofbizUrl>viewprofile</@ofbizUrl>" class="button">${uiLabelMap.CommonCancel}</a> + <a id="cancelEditUserForm" href="<@ofbizUrl>viewprofile</@ofbizUrl>" class="button"> + ${uiLabelMap.CommonCancel} + </a> </div> </form> </div> \ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditShipToAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditShipToAddress.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditShipToAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditShipToAddress.ftl Sat Sep 17 07:17:15 2016 @@ -20,28 +20,36 @@ under the License. <div id="shipToServerError" class="errorMessage"></div> <form id="editShipToPostalAddress" method="post" action=""> <fieldset> - <input type="hidden" name="setShippingPurpose" value="Y" /> - <input type="hidden" name="contactMechId" value="${shipToContactMechId!}" /> - <#assign productStoreId = Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> - <input type="hidden" name="productStoreId" value="${productStoreId!}" /> + <input type="hidden" name="setShippingPurpose" value="Y"/> + <input type="hidden" name="contactMechId" value="${shipToContactMechId!}"/> + <#assign productStoreId = Static["org.apache.ofbiz.product.store.ProductStoreWorker"] + .getProductStoreId(request) /> + <input type="hidden" name="productStoreId" value="${productStoreId!}"/> <div> <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*</label> - <input type="text" class="required" name="address1" id="shipToAddress1" value="${shipToAddress1!}" maxlength="30" /> - <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> + <input type="text" class="required" name="address1" id="shipToAddress1" value="${shipToAddress1!}" + maxlength="30"/> + <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> </div> <div> <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label> - <input type="text" name="address2" id="shipToAddress2" value="${shipToAddress2!}" maxlength="30" /> + <input type="text" name="address2" id="shipToAddress2" value="${shipToAddress2!}" maxlength="30"/> </div> <div> <label for="shipToCity">${uiLabelMap.PartyCity}*</label> - <input type="text" class="required" name="city" id="shipToCity" value="${shipToCity!}" maxlength="30" /> - <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> + <input type="text" class="required" name="city" id="shipToCity" value="${shipToCity!}" maxlength="30"/> + <span id="advice-required-shipToCity" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> </div> <div> <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*</label> - <input type="text" class="required" name="postalCode" id="shipToPostalCode" value="${shipToPostalCode!}" maxlength="10" /> - <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> + <input type="text" class="required" name="postalCode" id="shipToPostalCode" value="${shipToPostalCode!}" + maxlength="10"/> + <span id="advice-required-shipToPostalCode" style="display: none" + class="errorMessage">(${uiLabelMap.CommonRequired})</span> </div> <div> <label for="shipToCountryGeoId">${uiLabelMap.CommonCountry}*</label> @@ -51,13 +59,22 @@ under the License. </#if> ${screens.render("component://common/widget/CommonScreens.xml#countries")} </select> - <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> + <span id="advice-required-shipToCountryGeoId" style="display: none" + class="errorMessage">(${uiLabelMap.CommonRequired}) + </span> </div> <div id="shipToStates"> - <label for="shipToStateProvinceGeoId">${uiLabelMap.PartyState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> + <label for="shipToStateProvinceGeoId"> + ${uiLabelMap.PartyState}* + <span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> <select name="stateProvinceGeoId" id="shipToStateProvinceGeoId"> <#if shipToStateProvinceGeoId?has_content> - <option value='${shipToStateProvinceGeoId!}'>${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}</option> + <option value='${shipToStateProvinceGeoId!}'> + ${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)} + </option> <#else> <option value="_NA_">${uiLabelMap.PartyNoState}</option> </#if> @@ -70,22 +87,29 @@ under the License. <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">(${uiLabelMap.CommonRequired})</span> - <input type="hidden" name="phoneContactMechId" value="${shipToTelecomNumber.contactMechId!}" /> - <input type="text" name="countryCode" id="shipToCountryCode" class="required" value="${shipToTelecomNumber.countryCode!}" size="3" maxlength="3" /> - - <input type="text" name="areaCode" id="shipToAreaCode" class="required" value="${shipToTelecomNumber.areaCode!}" size="3" maxlength="3" /> - - <input type="text" name="contactNumber" id="shipToContactNumber" class="required" value="${contactNumber?default("${shipToTelecomNumber.contactNumber!}")}" size="6" maxlength="7" /> - - <input type="text" name="extension" value="${extension?default("${shipToExtension!}")}" size="3" maxlength="3" /> + <input type="hidden" name="phoneContactMechId" value="${shipToTelecomNumber.contactMechId!}"/> + <input type="text" name="countryCode" id="shipToCountryCode" class="required" + value="${shipToTelecomNumber.countryCode!}" size="3" maxlength="3"/> + - <input type="text" name="areaCode" id="shipToAreaCode" class="required" + value="${shipToTelecomNumber.areaCode!}" size="3" maxlength="3"/> + - <input type="text" name="contactNumber" id="shipToContactNumber" class="required" + value="${contactNumber?default("${shipToTelecomNumber.contactNumber!}")}" size="6" maxlength="7"/> + - <input type="text" name="extension" value="${extension?default("${shipToExtension!}")}" size="3" + maxlength="3"/> </div> </#if> <div class="inline"> <label for="setBillingPurposeForShipping">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label> - <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y" <#if setBillingPurpose??>checked="checked"</#if> /> + <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y" + <#if setBillingPurpose??>checked="checked"</#if>/> </div> <#-- <div> - <a name="submitEditShipToPostalAddress" id="submitEditShipToPostalAddress" class="button" onclick="updatePartyShipToPostalAddress('submitEditShipToPostalAddress')">${uiLabelMap.CommonSubmit}</a> + <a name="submitEditShipToPostalAddress" id="submitEditShipToPostalAddress" class="button" + onclick="updatePartyShipToPostalAddress('submitEditShipToPostalAddress')"> + ${uiLabelMap.CommonSubmit}</a> <a class="popup_closebox button">${uiLabelMap.CommonClose}</a> </div> --> </fieldset> -</form> \ No newline at end of file +</form> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ManageAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ManageAddress.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ManageAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ManageAddress.ftl Sat Sep 17 07:17:15 2016 @@ -17,11 +17,11 @@ specific language governing permissions under the License. --> -<#assign productStoreId = Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> +<#assign productStoreId = Static["org.apache.ofbiz.product.store.ProductStoreWorker"] + .getProductStoreId(request) /> <div class="screenlet clearfix"> <form id="refreshRequestForm" method="post" action="<@ofbizUrl>manageAddress</@ofbizUrl>"> </form> - <h3>${uiLabelMap.EcommerceAddressBook}</h3> <div class="screenlet-body"> <#-- Add address --> @@ -30,82 +30,95 @@ under the License. <div id="serverError" class="errorMessage"></div> <form id="createPostalAddressForm" method="post" action=""> <fieldset> - <input type="hidden" name="roleTypeId" value="CUSTOMER" /> - <input type="hidden" name="productStoreId" value="${productStoreId!}" /> + <input type="hidden" name="roleTypeId" value="CUSTOMER"/> + <input type="hidden" name="productStoreId" value="${productStoreId!}"/> <div> <label for="address1">${uiLabelMap.PartyAddressLine1}* - <span id="advice-required-address1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> + <span id="advice-required-address1" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> </label> - <input type="text" class="required" name="address1" id="address1" value="" maxlength="30" /> + <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" /> + <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">(${uiLabelMap.CommonRequired})</span> + <span id="advice-required-city" style="display: none" + class="errorMessage">(${uiLabelMap.CommonRequired})</span> </label> - <input type="text" class="required" name="city" id="city" value="" maxlength="30" /> + <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">(${uiLabelMap.CommonRequired})</span> + <span id="advice-required-postalCode" style="display: none" + class="errorMessage">(${uiLabelMap.CommonRequired})</span> </label> - <input type="text" class="required" name="postalCode" id="postalCode" value="" maxlength="10" /> + <input type="text" class="required" name="postalCode" id="postalCode" value="" maxlength="10"/> </div> <div> <label for="countryGeoId">${uiLabelMap.CommonCountry}* - <span id="advice-required-countryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> + <span id="advice-required-countryGeoId" style="display: none" + class="errorMessage">(${uiLabelMap.CommonRequired}) + </span> </label> - <select name="countryGeoId" id="countryGeoId" class="required"> - <#if countryGeoId??> - <option value="${countryGeoId}">${countryGeoId}</option> - </#if> - ${screens.render("component://common/widget/CommonScreens.xml#countries")} - </select> + <select name="countryGeoId" id="countryGeoId" class="required"> + <#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">(${uiLabelMap.CommonRequired})</span> + <span id="advice-required-stateProvinceGeoId" style="display: none" + class="errorMessage">(${uiLabelMap.CommonRequired}) + </span> </label> - <select name="stateProvinceGeoId" id="stateProvinceGeoId"> + <select name="stateProvinceGeoId" id="stateProvinceGeoId"> <#if stateProvinceGeoId?has_content> <option value="${stateProvinceGeoId}">${stateProvinceGeoId}</option> <#else> <option value="_NA_">${uiLabelMap.PartyNoState}</option> </#if> - </select> + </select> </div> <div class="inline"> <label for="setBillingPurpose">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label> - <input type="checkbox" name="setBillingPurpose" id="setBillingPurpose" value="Y" <#if setBillingPurpose??>checked="checked"</#if> /> + <input type="checkbox" name="setBillingPurpose" id="setBillingPurpose" value="Y" + <#if setBillingPurpose??>checked="checked"</#if>/> </div> <div class="inline"> <label for="setShippingPurpose">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label> - <input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y" <#if setShippingPurpose??>checked="checked"</#if> /> + <input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y" + <#if setShippingPurpose??>checked="checked"</#if>/> </div> </fieldset> </form> </div> <script type="text/javascript"> - //<![CDATA[ - jQuery("#displayCreateAddressForm").dialog({autoOpen: false, modal: true, + //<![CDATA[ + jQuery("#displayCreateAddressForm").dialog({ + autoOpen: false, modal: true, buttons: { - '${uiLabelMap.CommonSubmit}': function() { - var createAddressForm = jQuery("#displayCreateAddressForm"); - if (jQuery("#createPostalAddressForm").valid()) { - jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm); - createPartyPostalAddress(); - } - }, - '${uiLabelMap.CommonClose}': function() { - jQuery(this).dialog('close'); + '${uiLabelMap.CommonSubmit}': function () { + var createAddressForm = jQuery("#displayCreateAddressForm"); + if (jQuery("#createPostalAddressForm").valid()) { + jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm); + createPartyPostalAddress(); + } + }, + '${uiLabelMap.CommonClose}': function () { + jQuery(this).dialog('close'); } } - }); - jQuery("#addAddress").click(function(){jQuery("#displayCreateAddressForm").dialog("open")}); - //]]> + }); + jQuery("#addAddress").click(function () { + jQuery("#displayCreateAddressForm").dialog("open") + }); + //]]> </script> </div> @@ -113,104 +126,122 @@ under the License. <div class="left center"> <h3>${uiLabelMap.EcommerceDefaultAddresses}</h3> <div class="screenlet-body"> - <#--===================================== Billing Address and Telecom number ===========================================--> + <#--===================================== Billing Address and Telecom number ====================================--> <h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3> <ul> - <#if billToContactMechId??> - <li>${billToAddress1!}</li> - <#if billToAddress2?has_content><li>${billToAddress2!}</li></#if> - <li> - <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_"> - ${billToStateProvinceGeoId} + <#if billToContactMechId??> + <li>${billToAddress1!}</li> + <#if billToAddress2?has_content> + <li>${billToAddress2!}</li> + </#if> + <li> + <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_"> + ${billToStateProvinceGeoId} + </#if> + ${billToCity!}, + ${billToPostalCode!} + </li> + <li>${billToCountryGeoId!}</li> + <#if billToTelecomNumber?has_content> + <li> + ${billToTelecomNumber.countryCode!}- + ${billToTelecomNumber.areaCode!}- + ${billToTelecomNumber.contactNumber!} + <#if billToExtension??>-${billToExtension!}</#if> + </li> </#if> - ${billToCity!}, - ${billToPostalCode!} - </li> - <li>${billToCountryGeoId!}</li> - <#if billToTelecomNumber?has_content> - <li> - ${billToTelecomNumber.countryCode!}- - ${billToTelecomNumber.areaCode!}- - ${billToTelecomNumber.contactNumber!} - <#if billToExtension??>-${billToExtension!}</#if> - </li> + <li> + <a id="updateBillToPostalAddress" href="javascript:void(0)" + class="button popup_link">${uiLabelMap.CommonEdit} + </a> + </li> + <#else> + <li>${uiLabelMap.PartyPostalInformationNotFound}</li> </#if> - <li><a id="updateBillToPostalAddress" href="javascript:void(0)" class="button popup_link">${uiLabelMap.CommonEdit}</a></li> - <#else> - <li>${uiLabelMap.PartyPostalInformationNotFound}</li> - </#if> </ul> <div id="displayEditBillToPostalAddress" style="display: none;"> <#include "EditBillToAddress.ftl" /> </div> <script type="text/javascript"> - //<![CDATA[ - jQuery("#displayEditBillToPostalAddress").dialog({autoOpen: false, modal: true, - buttons: { - '${uiLabelMap.CommonSubmit}': function() { - var createAddressForm = jQuery("#displayEditBillToPostalAddress"); - if (jQuery("#editBillToPostalAddress").valid()) { - jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm); - updatePartyBillToPostalAddress(); - } - - }, - '${uiLabelMap.CommonClose}': function() { - jQuery(this).dialog('close'); + //<![CDATA[ + jQuery("#displayEditBillToPostalAddress").dialog({ + autoOpen: false, modal: true, + buttons: { + '${uiLabelMap.CommonSubmit}': function () { + var createAddressForm = jQuery("#displayEditBillToPostalAddress"); + if (jQuery("#editBillToPostalAddress").valid()) { + jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm); + updatePartyBillToPostalAddress(); + } + + }, + '${uiLabelMap.CommonClose}': function () { + jQuery(this).dialog('close'); + } } - } - }); - jQuery("#updateBillToPostalAddress").click(function(){jQuery("#displayEditBillToPostalAddress").dialog("open")}); - //]]> + }); + jQuery("#updateBillToPostalAddress").click(function () { + jQuery("#displayEditBillToPostalAddress").dialog("open") + }); + //]]> </script> - <#--===================================== Shipping Address and Telecom number ===========================================--> + <#--===================================== Shipping Address and Telecom number ===================================--> <h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3> <ul> - <#if shipToContactMechId??> - <li>${shipToAddress1!}</li> - <#if shipToAddress2?has_content><li>${shipToAddress2!}</li></#if> - <li> - <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_"> - ${shipToStateProvinceGeoId} - </#if> - ${shipToCity!}, - ${shipToPostalCode!} - </li> - <li>${shipToCountryGeoId!}</li> - <#if shipToTelecomNumber?has_content> - <li> - ${shipToTelecomNumber.countryCode!}- - ${shipToTelecomNumber.areaCode!}- - ${shipToTelecomNumber.contactNumber!} - <#if shipToExtension??>-${shipToExtension!}</#if> - </li> + <#if shipToContactMechId??> + <li>${shipToAddress1!}</li> + <#if shipToAddress2?has_content> + <li>${shipToAddress2!}</li> + </#if> + <li> + <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_"> + ${shipToStateProvinceGeoId} + </#if> + ${shipToCity!}, + ${shipToPostalCode!} + </li> + <li>${shipToCountryGeoId!}</li> + <#if shipToTelecomNumber?has_content> + <li> + ${shipToTelecomNumber.countryCode!}- + ${shipToTelecomNumber.areaCode!}- + ${shipToTelecomNumber.contactNumber!} + <#if shipToExtension??>-${shipToExtension!}</#if> + </li> + </#if> + <li> + <a id="updateShipToPostalAddress" href="javascript:void(0)" + class="button popup_link">${uiLabelMap.CommonEdit} + </a> + </li> + <#else> + <li>${uiLabelMap.PartyPostalInformationNotFound}</li> </#if> - <li><a id="updateShipToPostalAddress" href="javascript:void(0)" class="button popup_link">${uiLabelMap.CommonEdit}</a></li> - <#else> - <li>${uiLabelMap.PartyPostalInformationNotFound}</li> - </#if> </ul> <div id="displayEditShipToPostalAddress" style="display: none;"> <#include "EditShipToAddress.ftl" /> </div> <script type="text/javascript"> - //<![CDATA[ - jQuery("#displayEditShipToPostalAddress").dialog({autoOpen: false, modal: true, - buttons: { - '${uiLabelMap.CommonSubmit}': function() { - var createAddressForm = jQuery("#displayEditShipToPostalAddress"); - if (jQuery("#editShipToPostalAddress").valid()) { - jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm); - updatePartyShipToPostalAddress('submitEditShipToPostalAddress'); - } - }, - '${uiLabelMap.CommonClose}': function() { - jQuery(this).dialog('close'); - } - } - }); - jQuery("#updateShipToPostalAddress").click(function(){jQuery("#displayEditShipToPostalAddress").dialog("open")}); + //<![CDATA[ + jQuery("#displayEditShipToPostalAddress").dialog({ + autoOpen: false, modal: true, + buttons: { + '${uiLabelMap.CommonSubmit}': function () { + var createAddressForm = jQuery("#displayEditShipToPostalAddress"); + if (jQuery("#editShipToPostalAddress").valid()) { + jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm); + updatePartyShipToPostalAddress('submitEditShipToPostalAddress'); + } + }, + '${uiLabelMap.CommonClose}': function () { + jQuery(this).dialog('close'); + } + } + }); + jQuery("#updateShipToPostalAddress").click(function () { + jQuery("#displayEditShipToPostalAddress").dialog("open") + }); //]]> </script> </div> @@ -233,59 +264,69 @@ under the License. <#include "EditPostalAddress.ftl" /> </div> <#if postalAddress??> - <div class="form-field"> - <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!} - </li> - <#if postalAddress.countryGeoId?has_content><li>${postalAddress.countryGeoId}</li></#if> - </ul> - <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId! = "USA")> - <#assign addr1 = postalAddress.address1! /> - <#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> + <div class="form-field"> + <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> - </div> + ${postalAddress.postalCode!} + </li> + <#if postalAddress.countryGeoId?has_content> + <li>${postalAddress.countryGeoId}</li> + </#if> + </ul> + <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId! = "USA")> + <#assign addr1 = postalAddress.address1! /> + <#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> <span> - <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= "<@ofbizUrl>deletePostalAddress</@ofbizUrl>"> - <fieldset> - <input type= "hidden" name= "contactMechId" value= "${contactMech.contactMechId}" /> - </fieldset> - </form> + <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="<@ofbizUrl>deletePostalAddress</@ofbizUrl>"> + <fieldset> + <input type="hidden" name="contactMechId" value="${contactMech.contactMechId}"/> + </fieldset> + </form> </div> <script type="text/javascript"> - //<![CDATA[ - jQuery("#displayEditAddressForm_${contactMech.contactMechId}").dialog({autoOpen: false, modal: true, - buttons: { - '${uiLabelMap.CommonSubmit}': function() { - var createAddressForm = jQuery("#displayEditAddressForm_${contactMech.contactMechId}"); - if (jQuery("#editPostalAddress_${contactMech.contactMechId}").valid()) { - jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm); - updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}'); - } - }, - '${uiLabelMap.CommonClose}': function() { - jQuery(this).dialog('close'); - } - } - }); - jQuery("#update_${contactMech.contactMechId}").click(function(){jQuery("#displayEditAddressForm_${contactMech.contactMechId}").dialog("open")}); - //]]> + //<![CDATA[ + jQuery("#displayEditAddressForm_${contactMech.contactMechId}").dialog({ + autoOpen: false, modal: true, + buttons: { + '${uiLabelMap.CommonSubmit}': function () { + var createAddressForm = jQuery("#displayEditAddressForm_${contactMech.contactMechId}"); + if (jQuery("#editPostalAddress_${contactMech.contactMechId}").valid()) { + jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm); + updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}'); + } + }, + '${uiLabelMap.CommonClose}': function () { + jQuery(this).dialog('close'); + } + } + }); + jQuery("#update_${contactMech.contactMechId}").click(function () { + jQuery("#displayEditAddressForm_${contactMech.contactMechId}").dialog("open") + }); + //]]> </script> <#else> <div> - <label>${uiLabelMap.PartyPostalInformationNotFound}.</label> + <label>${uiLabelMap.PartyPostalInformationNotFound}.</label> </div> </#if> </#if> @@ -293,9 +334,9 @@ under the License. </#list> <#if postalAddressFlag == "N"> <div> - <label>${uiLabelMap.PartyPostalInformationNotFound}.</label> + <label>${uiLabelMap.PartyPostalInformationNotFound}.</label> </div> </#if> </div> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/NewCustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/NewCustomer.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/NewCustomer.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/NewCustomer.ftl Sat Sep 17 07:17:15 2016 @@ -23,152 +23,243 @@ under the License. <form id="newUserForm" method="post" action="<@ofbizUrl>createCustomerProfile</@ofbizUrl>"> <fieldset class="left center"> <legend>${uiLabelMap.PartyContactInformation}</legend> - <input type="hidden" name="roleTypeId" value="CUSTOMER" /> - <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL" /> - <#assign productStoreId = Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> - <input type="hidden" name="productStoreId" value="${productStoreId!}" /> - <div> - <label for="firstName">${uiLabelMap.PartyFirstName}* <span id="advice-required-firstName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="firstName" id="firstName" class="required" value="${parameters.firstName!}" maxlength="30" /> - </div> - <div> - <label for="lastName">${uiLabelMap.PartyLastName}* <span id="advice-required-lastName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="lastName" id="lastName" class="required" value="${parameters.lastName!}" maxlength="30" /> - </div> - <div> - <label for="emailAddress">${uiLabelMap.CommonEmail}* - <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> - </label> - <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${parameters.emailAddress!}" maxlength="255" /> - </div> - <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span> + <input type="hidden" name="roleTypeId" value="CUSTOMER"/> + <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL"/> + <#assign productStoreId = + Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> + <input type="hidden" name="productStoreId" value="${productStoreId!}"/> + <div> + <label for="firstName">${uiLabelMap.PartyFirstName}* + <span id="advice-required-firstName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> + </label> + <input type="text" name="firstName" id="firstName" class="required" value="${parameters.firstName!}" + maxlength="30"/> + </div> + <div> + <label for="lastName">${uiLabelMap.PartyLastName}* + <span id="advice-required-lastName" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="lastName" id="lastName" class="required" value="${parameters.lastName!}" + maxlength="30"/> + </div> + <div> + <label for="emailAddress">${uiLabelMap.CommonEmail}* + <span id="advice-required-emailAddress" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" + value="${parameters.emailAddress!}" maxlength="255"/> + </div> + <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none"> + ${uiLabelMap.PartyEmailAddressNotFormattedCorrectly} + </span> </fieldset> <fieldset class="center right" id="userNameAndPasswordPanel"> - <legend>${uiLabelMap.EcommerceAccountInformation}</legend> - <div> - <label for="username">${uiLabelMap.CommonUsername}* <span id="advice-required-username" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="username" id="username" class="required" value="${parameters.username!}" maxlength="255" /> - </div> - <div> - <label for="password">${uiLabelMap.CommonPassword}* <span id="advice-required-password" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="password" name="password" id="password" class="required validate-password" value="${parameters.password!}" 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">(${uiLabelMap.CommonRequired})</span></label> - <input type="password" name="passwordVerify" id="passwordVerify" class="required validate-passwordVerify" value="${parameters.passwordVerify!}" maxlength="16" /> - <span id="advice-validate-passwordVerify-passwordVerify" class="errorMessage" style="display:none">${uiLabelMap["loginservices.password_did_not_match_verify_password"]}</span> - </div> + <legend>${uiLabelMap.EcommerceAccountInformation}</legend> + <div> + <label for="username">${uiLabelMap.CommonUsername}* + <span id="advice-required-username" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="username" id="username" class="required" value="${parameters.username!}" + maxlength="255"/> + </div> + <div> + <label for="password">${uiLabelMap.CommonPassword}* + <span id="advice-required-password" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="password" name="password" id="password" class="required validate-password" + value="${parameters.password!}" 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"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="password" name="passwordVerify" id="passwordVerify" class="required validate-passwordVerify" + value="${parameters.passwordVerify!}" maxlength="16"/> + <span id="advice-validate-passwordVerify-passwordVerify" class="errorMessage" style="display:none"> + ${uiLabelMap["loginservices.password_did_not_match_verify_password"]} + </span> + </div> </fieldset> <fieldset class="left center"> - <legend>${uiLabelMap.OrderShippingInformation}</legend> - <div> - <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="shipToAddress1" id="shipToAddress1" class="required" value="${parameters.shipToAddress1!}" /> - </div> - <div> - <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label> - <input type="text" name="shipToAddress2" id="shipToAddress2" value="${parameters.shipToAddress2!}" /> - </div> - <div> - <label for="shipToCity">${uiLabelMap.CommonCity}* <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="shipToCity" id="shipToCity" class="required" value="${parameters.shipToCity!}" /> - </div> - <div> - <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="shipToPostalCode" id="shipToPostalCode" class="required" value="${parameters.shipToPostalCode!}" maxlength="10" /> - </div> - <div> - <label for="shipToCountryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</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">(${uiLabelMap.CommonRequired})</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-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">(${uiLabelMap.CommonRequired})</span> - <input type="text" name="shipToCountryCode" id="shipToCountryCode" value="${parameters.shipToCountryCode!}" size="3" maxlength="3" /> - - <input type="text" name="shipToAreaCode" id="shipToAreaCode" value="${parameters.shipToAreaCode!}" size="3" maxlength="3" /> - - <input type="text" name="shipToContactNumber" id="shipToContactNumber" value="${contactNumber?default("${parameters.shipToContactNumber!}")}" size="6" maxlength="7" /> - - <input type="text" name="shipToExtension" id="shipToExtension" value="${extension?default("${parameters.shipToExtension!}")}" size="3" maxlength="3" /> + <legend>${uiLabelMap.OrderShippingInformation}</legend> + <div> + <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}* + <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="shipToAddress1" id="shipToAddress1" class="required" + value="${parameters.shipToAddress1!}"/> + </div> + <div> + <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label> + <input type="text" name="shipToAddress2" id="shipToAddress2" value="${parameters.shipToAddress2!}"/> + </div> + <div> + <label for="shipToCity">${uiLabelMap.CommonCity}* + <span id="advice-required-shipToCity" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="shipToCity" id="shipToCity" class="required" value="${parameters.shipToCity!}"/> + </div> + <div> + <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}* + <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="shipToPostalCode" id="shipToPostalCode" class="required" + value="${parameters.shipToPostalCode!}" maxlength="10"/> + </div> + <div> + <label for="shipToCountryGeoId">${uiLabelMap.CommonCountry}* + <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </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 class="inline"> - <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 id='shipToStates'> + <label for="shipToStateProvinceGeoId">${uiLabelMap.CommonState}* + <span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </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-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">(${uiLabelMap.CommonRequired})</span> + <input type="text" name="shipToCountryCode" id="shipToCountryCode" value="${parameters.shipToCountryCode!}" + size="3" maxlength="3"/> + - <input type="text" name="shipToAreaCode" id="shipToAreaCode" value="${parameters.shipToAreaCode!}" size="3" + maxlength="3"/> + - <input type="text" name="shipToContactNumber" id="shipToContactNumber" + value="${contactNumber?default("${parameters.shipToContactNumber!}")}" size="6" maxlength="7"/> + - <input type="text" name="shipToExtension" id="shipToExtension" + value="${extension?default("${parameters.shipToExtension!}")}" size="3" maxlength="3"/> + </div> + <div class="inline"> + <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> </fieldset> <fieldset class="center right" id="billingAddress"> - <legend>${uiLabelMap.PageTitleBillingInformation}</legend> - <div> - <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="billToAddress1" id="billToAddress1" class="required" value="${parameters.billToAddress1!}" /> - </div> - <div> - <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label> - <input type="text" name="billToAddress2" id="billToAddress2" value="${parameters.billToAddress2!}" /> - </div> - <div> - <label for="billToCity">${uiLabelMap.CommonCity}*<span id="advice-required-billToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="billToCity" id="billToCity" class="required" value="${parameters.billToCity!}" /> - </div> - <div> - <label for="billToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="billToPostalCode" id="billToPostalCode" class="required" value="${parameters.billToPostalCode!}" maxlength="10" /> - </div> - <div> - <label for="billToCountryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</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">(${uiLabelMap.CommonRequired})</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">(${uiLabelMap.CommonRequired})</span> - <input type="text" name="billToCountryCode" id="billToCountryCode" value="${parameters.billToCountryCode!}" size="3" maxlength="3"/> - - <input type="text" name="billToAreaCode" id="billToAreaCode" value="${parameters.billToAreaCode!}" size="3" maxlength="3"/> - - <input type="text" name="billToContactNumber" id="billToContactNumber" value="${contactNumber?default("${parameters.billToContactNumber!}")}" size="6" maxlength="7"/> - - <input type="text" name="billToExtension" id="billToExtension" value="${extension?default("${parameters.billToExtension!}")}" size="3" maxlength="3"/> - </div> + <legend>${uiLabelMap.PageTitleBillingInformation}</legend> + <div> + <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}* + <span id="advice-required-billToAddress1" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="billToAddress1" id="billToAddress1" class="required" + value="${parameters.billToAddress1!}"/> + </div> + <div> + <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label> + <input type="text" name="billToAddress2" id="billToAddress2" value="${parameters.billToAddress2!}"/> + </div> + <div> + <label for="billToCity">${uiLabelMap.CommonCity}* + <span id="advice-required-billToCity" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="billToCity" id="billToCity" class="required" value="${parameters.billToCity!}"/> + </div> + <div> + <label for="billToPostalCode">${uiLabelMap.PartyZipCode}* + <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </span> + </label> + <input type="text" name="billToPostalCode" id="billToPostalCode" class="required" + value="${parameters.billToPostalCode!}" maxlength="10"/> + </div> + <div> + <label for="billToCountryGeoId">${uiLabelMap.CommonCountry}* + <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage"> + (${uiLabelMap.CommonRequired}) + </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"> + (${uiLabelMap.CommonRequired}) + </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">(${uiLabelMap.CommonRequired})</span> + <input type="text" name="billToCountryCode" id="billToCountryCode" value="${parameters.billToCountryCode!}" + size="3" maxlength="3"/> + - <input type="text" name="billToAreaCode" id="billToAreaCode" value="${parameters.billToAreaCode!}" size="3" + maxlength="3"/> + - <input type="text" name="billToContactNumber" id="billToContactNumber" + value="${contactNumber?default("${parameters.billToContactNumber!}")}" size="6" maxlength="7"/> + - <input type="text" name="billToExtension" id="billToExtension" + value="${extension?default("${parameters.billToExtension!}")}" size="3" maxlength="3"/> + </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 +</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ViewProfile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ViewProfile.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ViewProfile.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ViewProfile.ftl Sat Sep 17 07:17:15 2016 @@ -39,65 +39,65 @@ under the License. <div class="left center"> <h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3> <ul> - <#if shipToContactMechId??> - <li>${shipToAddress1!}</li> - <#if shipToAddress2?has_content><li>${shipToAddress2!}</li></#if> - <li> - <ul> + <#if shipToContactMechId??> + <li>${shipToAddress1!}</li> + <#if shipToAddress2?has_content><li>${shipToAddress2!}</li></#if> <li> - <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_"> - ${shipToStateProvinceGeoId} - </#if> - ${shipToCity!}, - ${shipToPostalCode!} + <ul> + <li> + <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_"> + ${shipToStateProvinceGeoId} + </#if> + ${shipToCity!}, + ${shipToPostalCode!} + </li> + <li>${shipToCountryGeoId!}</li> + </ul> </li> - <li>${shipToCountryGeoId!}</li> - </ul> - </li> - <#if shipToTelecomNumber?has_content> - <li> - ${shipToTelecomNumber.countryCode!}- - ${shipToTelecomNumber.areaCode!}- - ${shipToTelecomNumber.contactNumber!} - <#if shipToExtension??>-${shipToExtension!}</#if> - </li> + <#if shipToTelecomNumber?has_content> + <li> + ${shipToTelecomNumber.countryCode!}- + ${shipToTelecomNumber.areaCode!}- + ${shipToTelecomNumber.contactNumber!} + <#if shipToExtension??>-${shipToExtension!}</#if> + </li> + </#if> + <#else> + <li>${uiLabelMap.PartyPostalInformationNotFound}</li> </#if> - <#else> - <li>${uiLabelMap.PartyPostalInformationNotFound}</li> - </#if> </ul> </div> <div class="right center"> <h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3> <ul> - <#if billToContactMechId??> - <li>${billToAddress1!}</li> - <#if billToAddress2?has_content><li>${billToAddress2!}</li></#if> - <li> - <ul> + <#if billToContactMechId??> + <li>${billToAddress1!}</li> + <#if billToAddress2?has_content><li>${billToAddress2!}</li></#if> + <li> + <ul> + <li> + <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_"> + ${billToStateProvinceGeoId} + </#if> + ${billToCity!}, + ${billToPostalCode!} + </li> + <li>${billToCountryGeoId!}</li> + </ul> + </li> + <#if billToTelecomNumber?has_content> <li> - <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_"> - ${billToStateProvinceGeoId} - </#if> - ${billToCity!}, - ${billToPostalCode!} + ${billToTelecomNumber.countryCode!}- + ${billToTelecomNumber.areaCode!}- + ${billToTelecomNumber.contactNumber!} + <#if billToExtension??>-${billToExtension!}</#if> </li> - <li>${billToCountryGeoId!}</li> - </ul> - </li> - <#if billToTelecomNumber?has_content> - <li> - ${billToTelecomNumber.countryCode!}- - ${billToTelecomNumber.areaCode!}- - ${billToTelecomNumber.contactNumber!} - <#if billToExtension??>-${billToExtension!}</#if> - </li> + </#if> + <#else> + <li>${uiLabelMap.PartyPostalInformationNotFound}</li> </#if> - <#else> - <li>${uiLabelMap.PartyPostalInformationNotFound}</li> - </#if> </ul> </div> </div> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/data/Content.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/data/Content.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/data/Content.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/data/Content.ftl Sat Sep 17 07:17:15 2016 @@ -19,23 +19,28 @@ under the License. --> <entity-engine-xml> -<DataSource dataSourceId="ECM" dataSourceTypeId="CONTENT_CREATION" description="Ecommerce Content"/> -<#recurse doc> + <DataSource dataSourceId="ECM" dataSourceTypeId="CONTENT_CREATION" description="Ecommerce Content"/> + <#recurse doc> </entity-engine-xml> <#macro contents> -<#recurse .node> + <#recurse .node> </#macro> <#macro content> - <#assign contentId="ECMC" + .node.@id[0]/> - <DataResource dataResourceId="${contentId}" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" dataSourceId="ECM" mimeTypeId="text/xml"/> - <ElectronicText dataResourceId="${contentId}"> -<textData><![CDATA[ -${.node.content_text} -]]></textData> - </ElectronicText> - <Content contentId="${contentId}" contentTypeId="DOCUMENT" dataResourceId="${contentId}" contentName="${.node.@name[0]}" description="${.node.content_desc?html}" mimeTypeId="text/html" templateDataResourceId="TPL_XML_MB"/> + <#assign contentId="ECMC" + .node.@id[0]/> + <DataResource dataResourceId="${contentId}" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" + dataSourceId="ECM" mimeTypeId="text/xml"/> + <ElectronicText dataResourceId="${contentId}"> + <textData> + <![CDATA[ + ${.node.content_text} + ]]> + </textData> + </ElectronicText> + <Content contentId="${contentId}" contentTypeId="DOCUMENT" dataResourceId="${contentId}" + contentName="${.node.@name[0]}" description="${.node.content_desc?html}" mimeTypeId="text/html" + templateDataResourceId="TPL_XML_MB"/> </#macro> <#macro @element> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/data/Topic.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/data/Topic.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/data/Topic.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/data/Topic.ftl Sat Sep 17 07:17:15 2016 @@ -19,23 +19,25 @@ under the License. --> <entity-engine-xml> -<#recurse doc> + <#recurse doc> </entity-engine-xml> <#macro topics> -<#recurse .node> + <#recurse .node> </#macro> <#macro topic> - <#assign contentId="ECMT" + .node.@id[0]/> - <Content contentId="${contentId}" contentTypeId="WEB_SITE_PUB_PT" contentName="${.node.topic_heading}" description="${.node.topic_desc?html}" ownerContentId=""/> - <#assign internalName=.node.@name[0]/> - <#assign internalNameParts=internalName?split(".")/> - <#assign firstPart=internalNameParts[0] /> - <#assign nowStamp=Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()/> - <#if firstPart == "WIDGETS"> - <ContentAssoc contentId="CNTWIDGETS" contentIdTo="${contentId}" contentAssocTypeId="SUB_CONTENT" fromDate="${nowStamp?string("yyyy-MM-dd HH:mm:ss")}"/> - </#if> + <#assign contentId="ECMT" + .node.@id[0]/> + <Content contentId="${contentId}" contentTypeId="WEB_SITE_PUB_PT" contentName="${.node.topic_heading}" + description="${.node.topic_desc?html}" ownerContentId=""/> + <#assign internalName=.node.@name[0]/> + <#assign internalNameParts=internalName?split(".")/> + <#assign firstPart=internalNameParts[0] /> + <#assign nowStamp=Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()/> + <#if firstPart == "WIDGETS"> + <ContentAssoc contentId="CNTWIDGETS" contentIdTo="${contentId}" contentAssocTypeId="SUB_CONTENT" + fromDate="${nowStamp?string("yyyy-MM-dd HH:mm:ss")}"/> + </#if> </#macro> <#macro @element> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/data/Tree.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/data/Tree.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/data/Tree.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/data/Tree.ftl Sat Sep 17 07:17:15 2016 @@ -19,27 +19,28 @@ under the License. --> <entity-engine-xml> -<#recurse doc> + <#recurse doc> </entity-engine-xml> <#macro topic_tree> -<#recurse .node> + <#recurse .node> </#macro> <#macro topic> - <#assign contentId="ECMT" + .node.@id[0]/> - <#recurse .node> + <#assign contentId="ECMT" + .node.@id[0]/> + <#recurse .node> </#macro> <#macro child> - <#assign contentIdTo="ECMT" + .node.@id[0]/> - <#assign assocType="SUB_CONTENT"/> - <#if .node.@type = "content"> - <#assign contentIdTo="ECMC" + .node.@id[0]/> - <#assign assocType="PUBLISH_LINK"/> - </#if> - <#assign nowStamp=Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()/> - <ContentAssoc contentIdTo="${contentIdTo}" contentId="${contentId}" contentAssocTypeId="${assocType}" fromDate="${nowStamp?string("yyyy-MM-dd HH:mm:ss")}"/> + <#assign contentIdTo="ECMT" + .node.@id[0]/> + <#assign assocType="SUB_CONTENT"/> + <#if .node.@type = "content"> + <#assign contentIdTo="ECMC" + .node.@id[0]/> + <#assign assocType="PUBLISH_LINK"/> + </#if> + <#assign nowStamp=Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()/> + <ContentAssoc contentIdTo="${contentIdTo}" contentId="${contentId}" contentAssocTypeId="${assocType}" + fromDate="${nowStamp?string("yyyy-MM-dd HH:mm:ss")}"/> </#macro> <#macro @element> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListEmailTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListEmailTemplate.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListEmailTemplate.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListEmailTemplate.ftl Sat Sep 17 07:17:15 2016 @@ -17,22 +17,22 @@ specific language governing permissions under the License. --> <html xmlns="http://www.w3.org/1999/xhtml";> - <body> - <div> - ${content} - </div> - <#assign verifyUrl = baseEcommerceSecureUrl + "updateContactListPartyNoUserLogin" /> - <form method="post" action="${verifyUrl}"> - <fieldset> - <label>E-mail: ${emailAddress}</label> - <input type="hidden" name="contactListId" value="${contactListId}" /> - <input type="hidden" name="partyId" value="${partyId}" /> - <input type="hidden" name="preferredContactMechId" value="${preferredContactMechId!}" /> - <input type="hidden" name="fromDate" value="${fromDate}" /> - <input type="hidden" name="statusId" value="CLPT_UNSUBS_PENDING" /> - <input type="hidden" name="optInVerifyCode" value="${optInVerifyCode!}" /> - <input type="submit" name="submitButton" value="Click here to unsubscribe your newsletter subscription." /> - </fieldset> - </form> - </body> + <body> + <div> + ${content} + </div> + <#assign verifyUrl = baseEcommerceSecureUrl + "updateContactListPartyNoUserLogin" /> + <form method="post" action="${verifyUrl}"> + <fieldset> + <label>E-mail: ${emailAddress}</label> + <input type="hidden" name="contactListId" value="${contactListId}"/> + <input type="hidden" name="partyId" value="${partyId}"/> + <input type="hidden" name="preferredContactMechId" value="${preferredContactMechId!}"/> + <input type="hidden" name="fromDate" value="${fromDate}"/> + <input type="hidden" name="statusId" value="CLPT_UNSUBS_PENDING"/> + <input type="hidden" name="optInVerifyCode" value="${optInVerifyCode!}"/> + <input type="submit" name="submitButton" value="Click here to unsubscribe your newsletter subscription."/> + </fieldset> + </form> + </body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListSubscribeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListSubscribeEmail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListSubscribeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListSubscribeEmail.ftl Sat Sep 17 07:17:15 2016 @@ -17,15 +17,14 @@ specific language governing permissions under the License. --> <html xmlns="http://www.w3.org/1999/xhtml";> - <body> - <p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> - <p>Successfully subscribed from ${contactList.contactListName} contact list.</p> +<body> + <p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> + <p>Successfully subscribed from ${contactList.contactListName} contact list.</p> - <#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!> - <#if (contactListParty.preferredContactMechId)??> - <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId> - </#if> - <a href="${verifyUrl}">If this was by mistake, click here to unsubscribe your subscription again.</a> - - </body> + <#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!> + <#if (contactListParty.preferredContactMechId)??> + <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId> + </#if> + <a href="${verifyUrl}">If this was by mistake, click here to unsubscribe your subscription again.</a> +</body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeEmail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeEmail.ftl Sat Sep 17 07:17:15 2016 @@ -27,7 +27,5 @@ under the License. </#if> <a href="${verifyUrl}">If this was by mistake, click here subscribe again.</a--> - - </body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl Sat Sep 17 07:17:15 2016 @@ -16,26 +16,26 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml";> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>${title!}</title> - </head> - <body> - - <#-- custom logo or text can be inserted here --> - <h1>${title!}</h1> - <#if note??><p>${note}</p></#if> - - <p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> - <p>We have received a request for unsubscription to the ${contactList.contactListName} contact list.</p> - <p>To complete your unsubscription click the on the following link:</p> - - <#assign verifyUrl = baseEcommerceSecureUrl+'contactListOptOut?contactListId='+contactListParty.contactListId+'&communicationEventId='+communicationEventId!+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBSCRIBED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode> - <#if (contactListParty.preferredContactMechId)??> - <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId> - </#if> - <a href="${verifyUrl}">Please click here to verify your unsubscription.</a> - </body> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title>${title!}</title> +</head> +<body> + <#-- custom logo or text can be inserted here --> + <h1>${title!}</h1> + <#if note??><p>${note}</p></#if> + + <p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> + <p>We have received a request for unsubscription to the ${contactList.contactListName} contact list.</p> + <p>To complete your unsubscription click the on the following link:</p> + + <#assign verifyUrl = baseEcommerceSecureUrl+'contactListOptOut?contactListId='+contactListParty.contactListId+'&communicationEventId='+communicationEventId!+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBSCRIBED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode> + <#if (contactListParty.preferredContactMechId)??> + <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId> + </#if> + <a href="${verifyUrl}">Please click here to verify your unsubscription.</a> +</body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl Sat Sep 17 07:17:15 2016 @@ -16,27 +16,26 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml";> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>${title!}</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title>${title!}</title> </head> <body> + <#-- custom logo or text can be inserted here --> + <h1>${title!}</h1> + <#if note??><p>${note}</p></#if> -<#-- custom logo or text can be inserted here --> -<h1>${title!}</h1> -<#if note??><p>${note}</p></#if> + <p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> + <p>We have received a request for subscription to the ${contactList.contactListName} contact list.</p> + <p>To complete your subscription click the on the following link:</p> -<p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> -<p>We have received a request for subscription to the ${contactList.contactListName} contact list.</p> -<p>To complete your subscription click the on the following link:</p> - -<#assign verifyUrl = baseEcommerceSecureUrl+'/'+'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_ACCEPTED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!> -<#if (contactListParty.preferredContactMechId)??> + <#assign verifyUrl = baseEcommerceSecureUrl+'/'+'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_ACCEPTED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!> + <#if (contactListParty.preferredContactMechId)??> <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId> -</#if> -<a href="${verifyUrl}">Please click here to verify your subscription.</a> - + </#if> + <a href="${verifyUrl}">Please click here to verify your subscription.</a> </body> </html> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactUsEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactUsEmail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactUsEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactUsEmail.ftl Sat Sep 17 07:17:15 2016 @@ -18,11 +18,11 @@ under the License. --> <html xmlns="http://www.w3.org/1999/xhtml";> - <head></head> - <body> - <p>The information filled by the person on contact us page is as follows:</p> - <p>${uiLabelMap.CommonName}: ${parameters.firstName!} ${parameters.lastName!}</p> - <p>${uiLabelMap.CommonEmail}: ${parameters.email!}</p> - <p>${uiLabelMap.CommonMessage}: ${parameters.message!}</p> - </body> +<head></head> +<body> + <p>The information filled by the person on contact us page is as follows:</p> + <p>${uiLabelMap.CommonName}: ${parameters.firstName!} ${parameters.lastName!}</p> + <p>${uiLabelMap.CommonEmail}: ${parameters.email!}</p> + <p>${uiLabelMap.CommonMessage}: ${parameters.message!}</p> +</body> </html> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/EmailPayRetry.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/EmailPayRetry.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/email/EmailPayRetry.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/email/EmailPayRetry.ftl Sat Sep 17 07:17:15 2016 @@ -17,13 +17,14 @@ specific language governing permissions under the License. --> -<br /> +<br/> <#if orderHeader.statusId == "ORDER_REJECTED"> - ${uiLabelMap.OrderEmailProblemWithYourPaymentMethod} ${orderHeader.orderId}.<br /> - ${uiLabelMap.OrderEmailProblemCancelledNotProcessed}<br /> + ${uiLabelMap.OrderEmailProblemWithYourPaymentMethod} ${orderHeader.orderId}.<br/> + ${uiLabelMap.OrderEmailProblemCancelledNotProcessed}<br/> <#elseif orderHeader.statusId == "ORDER_APPROVED"> - ${uiLabelMap.OrderEmailPaymentOK} ${orderHeader.orderId} ${uiLabelMap.OrderEmailAccepted} + ${uiLabelMap.OrderEmailPaymentOK} ${orderHeader.orderId} ${uiLabelMap.OrderEmailAccepted} <#else> - ${uiLabelMap.OrderEmailSorry} ${orderHeader.orderId}.<br /> + ${uiLabelMap.OrderEmailSorry} ${orderHeader.orderId}.<br/> </#if> - <br />${uiLabelMap.OrderEmailCustomerService} (em...@email.com)<br /> <#-- Customer service email (not a variable why?) must be adapted - JLR 1/6/5 --> +<br/>${uiLabelMap.OrderEmailCustomerService} (em...@email.com) +<br/> <#-- Customer service email (not a variable why?) must be adapted - JLR 1/6/5 -->
