Re: svn commit: r688081 [1/2] - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/script/org/ofbiz/eco
Locked
Re: svn commit: r688081 [1/2] - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/script/org/ofbiz/eco
 
|
Marco,
Could we get an explanation from the contributors why there is a need for all of the <span> elements? There seems to be a lot of unnecessary markup in these ftl files. Usually, you only need a <span> if you want to change a style inline, but maybe I'm missing something here. Also, the inputBox CSS class doesn't exist anymore. -Adrian [hidden email] wrote: > Author: mor > Date: Fri Aug 22 06:40:31 2008 > New Revision: 688081 > > URL: http://svn.apache.org/viewvc?rev=688081&view=rev > Log: > Adding completely new screens for customer and profile pages which are more compliant to industry standards. > To use these screens comment existing newcustomer and viewprofile screen and uncomment the new ones which has same names. > > Entity Change: A new field is added to check default billing address in PartyProfileDefaults. > As this new stuff becomes matured and community accept this as default then we can remove older stuff. > > Thanks to Sumit Pandit, Rishi Solanki, Brajesh Patel and Santosh Malviya for there valuable contribution. > > Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=688081&view=auto > ============================================================================== > --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (added) > +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl Fri Aug 22 06:40:31 2008 > @@ -0,0 +1,148 @@ > +<#-- > +Licensed to the Apache Software Foundation (ASF) under one > +or more contributor license agreements. See the NOTICE file > +distributed with this work for additional information > +regarding copyright ownership. The ASF licenses this file > +to you under the Apache License, Version 2.0 (the > +"License"); you may not use this file except in compliance > +with the License. You may obtain a copy of the License at > + > +http://www.apache.org/licenses/LICENSE-2.0 > + > +Unless required by applicable law or agreed to in writing, > +software distributed under the License is distributed on an > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > +KIND, either express or implied. See the License for the > +specific language governing permissions and limitations > +under the License. > +--> > + > +<div id="serverError_${contactMech.contactMechId}" class="errorMessage"></div> > +<#assign postalAddress = delegator.findOne("PostalAddress", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", contactMech.contactMechId), true)> > + > +<form id="editPostalAddress_${contactMech.contactMechId}" name="editPostalAddress_${contactMech.contactMechId}" method="post" action="<@ofbizUrl></@ofbizUrl>"> > + <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/> > + <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/> > + <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> > + <#assign showSetShippingPurpose = "Y"> > + <#assign showSetBillingPurpose = "Y"> > + <#assign telecomNumber = ""> > + <#list partyContactMechValueMap.partyContactMechPurposes?if_exists as partyContactMechPurpose> > + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> > + <#if contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION"> > + <#assign showSetShippingPurpose = "N"> > + <#assign pcmps = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", "PHONE_SHIPPING")))> > + <#if pcmps?has_content> > + <#assign pcmp = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> > + <#assign telecomNumber = pcmp.getRelatedOne("TelecomNumber")/> > + </#if> > + </#if> > + <#if contactMechPurposeType.contactMechPurposeTypeId == "BILLING_LOCATION"> > + <#assign showSetBillingPurpose = "N"> > + <#assign pcmps = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", "PHONE_BILLING")))> > + <#if pcmps?has_content> > + <#assign pcmp = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> > + <#assign telecomNumber = pcmp.getRelatedOne("TelecomNumber")/> > + </#if> > + </#if> > + </#list> > + <div class="screenlet-body"> > + <div class="form-row"> > + <span>${uiLabelMap.PartyAddressLine1}*</span> > + <span> > + <input type="text" class="left inputBox required" name="address1" id="address1_${contactMech.contactMechId}" value="${postalAddress.address1?if_exists}" style="width: 50%" size="30" maxlength="30"> > + <span id="advice-required-address1_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span> > + </span> > + </div> > + <div class="form-row"> > + <span>${uiLabelMap.PartyAddressLine2}</span> > + <span> > + <input type="text" class="left inputBox" name="address2" value="${postalAddress.address2?if_exists}" style="width: 50%" size="30" maxlength="30"> > + </span> > + </div> > + <div class="form-row"> > + <span>${uiLabelMap.PartyCity}*</span> > + <span> > + <input type="text" class="left inputBox required" name="city" id="city_${contactMech.contactMechId}" value="${postalAddress.city?if_exists}" size="30" maxlength="30"> > + <span id="advice-required-city_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span> > + </span> > + </div> > + <div class="form-row"> > + <span>${uiLabelMap.PartyZipCode}*</span> > + <span> > + <input type="text" class="left inputBox required" name="postalCode" id="postalCode_${contactMech.contactMechId}" value="${postalAddress.postalCode?if_exists}" size="12" maxlength="10"> > + <span id="advice-required-postalCode_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span> > + </span> > + </div> > + <div class="form-row"> > + <span>${uiLabelMap.PartyCountry}*</span> > + <span> > + <select name="countryGeoId" id="countryGeoId_${contactMech.contactMechId}" class="left selectBox required" style="width: 70%"> > + <#if postalAddress.countryGeoId?exists> > + <option value='${postalAddress.countryGeoId}'>${selectedCountryName?default(postalAddress.countryGeoId)}</option> > + </#if> > + ${screens.render("component://common/widget/CommonScreens.xml#countries")} > + </select> > + <span id="advice-required-countryGeoId_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span> > + </span> > + </div> > + <div class="form-row"> > + <span>${uiLabelMap.PartyState}*</span> > + <span> > + <select name="stateProvinceGeoId" id="stateProvinceGeoId_${contactMech.contactMechId}" class="left selectBox required" style="width: 70%"> > + <#if postalAddress.stateProvinceGeoId?exists> > + <option value='${postalAddress.stateProvinceGeoId}'>${selectedStateName?default(postalAddress.stateProvinceGeoId)}</option> > + </#if> > + <option value="">${uiLabelMap.PartyNoState}</option> > + ${screens.render("component://common/widget/CommonScreens.xml#states")} > + </select> > + <span id="advice-required-stateProvinceGeoId_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span> > + </span> > + </div> > + > + <#if telecomNumber?has_content> > + <#assign pcm = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(telecomNumber.getRelated("PartyContactMech"))/> > + <div class="form-row"> > + <h3>${uiLabelMap.PartyPhoneNumber}</h3> > + <div class="field-label"> > + <label for="countryCode_${telecomNumber.contactMechId}">${uiLabelMap.PartyCountry}<span>*</span> > + <span id="advice-required-countryCode_${telecomNumber.contactMechId}" style="display:none" class="errorMessage">(required)</span> > + </label> > + <label for="areaCode_${telecomNumber.contactMechId}">${uiLabelMap.PartyAreaCode}<span>*</span><span id="advice-required-areaCode_${telecomNumber.contactMechId}" style="display:none" class="errorMessage">(required)</span></label> > + <label for="contactNumber_${telecomNumber.contactMechId}">${uiLabelMap.PartyContactNumber}<span>*</span><span id="advice-required-contactNumber_${telecomNumber.contactMechId}" style="display:none" class="errorMessage">(required)</span></label> > + <label for="extension_${telecomNumber.contactMechId}">${uiLabelMap.PartyExtension}</label> > + </div> > + <div class="field-widget"> > + <input type="hidden" name="phoneContactMechId" value="${telecomNumber.contactMechId?if_exists}"/> > + <input type="text" name="countryCode" id="countryCode_${telecomNumber.contactMechId}" class="inputBox required" value="${telecomNumber.countryCode?if_exists}" size="3" maxlength="3"/> > + - <input type="text" name="areaCode" id="areaCode_${telecomNumber.contactMechId}" class="inputBox required" value="${telecomNumber.areaCode?if_exists}" size="3" maxlength="3"/> > + - <input type="text" name="contactNumber" id="contactNumber_${telecomNumber.contactMechId}" class="inputBox required" value="${contactNumber?default("${telecomNumber.contactNumber?if_exists}")}" size="6" maxlength="7"/> > + - <input type="text" name="extension" id="extension_${telecomNumber.contactMechId}" class="inputBox" value="${extension?default("${pcm.extension?if_exists}")}" size="3" maxlength="3"/> > + </div> > + </div> > + </#if> > + <#if showSetShippingPurpose == "Y"> > + <div class="form-row"> > + <b>${uiLabelMap.EcommerceMyDefaultShippingAddress}</b> > + <input type="checkbox" name="setShippingPurpose" value="Y" <#if setShippingPurpose?exists>checked</#if>/> > + </div> > + <#else> > + <input type="hidden" name="setShippingPurpose" value="Y"/> > + </#if> > + <#if showSetBillingPurpose == "Y"> > + <div class="form-row"> > + <b>${uiLabelMap.EcommerceMyDefaultBillingAddress}</b> > + <input type="checkbox" name="setBillingPurpose" value="Y" <#if setBillingPurpose?exists>checked</#if>/> > + </div> > + <#else> > + <input type="hidden" name="setBillingPurpose" value="Y"/> > + </#if> > + > + <div class="form-row"> > + <a name="submitEditPostalAddress_${contactMech.contactMechId}" id="submitEditPostalAddress_${contactMech.contactMechId}" class="buttontext" onclick="updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}')">${uiLabelMap.CommonSave}</a> > + <form action=""> > + <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}"/> > + </form> > + </div> > + </div> > +</form> > \ No newline at end of file > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl > ------------------------------------------------------------------------------ > svn:keywords = Date Rev Author URL Id > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl?rev=688081&view=auto > ============================================================================== > --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl (added) > +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl Fri Aug 22 06:40:31 2008 > @@ -0,0 +1,71 @@ > +<#-- > +Licensed to the Apache Software Foundation (ASF) under one > +or more contributor license agreements. See the NOTICE file > +distributed with this work for additional information > +regarding copyright ownership. The ASF licenses this file > +to you under the Apache License, Version 2.0 (the > +"License"); you may not use this file except in compliance > +with the License. You may obtain a copy of the License at > + > +http://www.apache.org/licenses/LICENSE-2.0 > + > +Unless required by applicable law or agreed to in writing, > +software distributed under the License is distributed on an > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > +KIND, either express or implied. See the License for the > +specific language governing permissions and limitations > +under the License. > +--> > + > +<div id="form-container" class="screenlet"> > + <div class="screenlet-header"> > + <div class='boxhead'> ${uiLabelMap.CommonEdit} ${uiLabelMap.CommonProfile}</div> > + </div> > + <div class="screenlet-body"> > + <form id="editUserForm" name="editUserForm" method="post" action="<@ofbizUrl>updateCustomerProfile</@ofbizUrl>"> > + <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL"/> > + <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/> > + > + <div class="left center"> > + <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.PartyContactInformation}</div></div> > + <div class="screenlet-body"> > + <div class="form-row"> > + <div class="field-label"><label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="firstName" id="firstName" class="inputBox required" value="${parameters.firstName?if_exists}" size="30" maxlength="30"></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="lastName" id="lastName" class="inputBox required" value="${parameters.lastName?if_exists}" size="30" maxlength="30"></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="emailAddress">${uiLabelMap.PartyEmailAddress}*<span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" class="inputBox required" name="emailAddress" id="emailAddress" value="${parameters.emailAddress?if_exists}" size="30" maxlength="255"/></div> > + </div> > + </div> > + </div> > + > + <div class="center right"> > + <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.AccountInformation}</div></div> > + <div class="screenlet-body"> > + <div class="form-row"> > + <div class="field-label"><label for="userName">${uiLabelMap.CommonUsername}*</label></div> > + <div class="field-widget"><input type="text" name="userLoginId" id="userLoginId" class="inputBox" value="${userLogin.userLoginId?if_exists}" size="30" maxlength="255" <#if userLogin.userLoginId?exists>disabled</#if>></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="currentPassword">${uiLabelMap.CommonCurrentPassword}*</label></div> > + <div class="field-widget"><input type="password" name="currentPassword" id="currentPassword" class="inputBox" value="${parameters.currentPassword?if_exists}" size="30" maxlength="16"></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="newPassword">${uiLabelMap.CommonNewPassword}*</label></div> > + <div class="field-widget"><input type="password" name="newPassword" id="newPassword" class="inputBox" value="${parameters.newPassword?if_exists}" size="30" maxlength="16"></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="newPasswordVerify">${uiLabelMap.CommonNewPasswordVerify}*</label></div> > + <div class="field-widget"><input type="password" name="newPasswordVerify" id="newPasswordVerify" class="inputBox" value="${parameters.passwordVerify?if_exists}" size="30" maxlength="16"></div> > + </div> > + </div> > + </div> > + <div class="form-row"> <a id="submitEditUserForm" href="javascript:void(0);" class="buttontext">${uiLabelMap.CommonSave}</a></div> > + </form> > + </div> > +</div> > \ No newline at end of file > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl > ------------------------------------------------------------------------------ > svn:keywords = "Date Rev Author URL Id" > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=688081&view=auto > ============================================================================== > --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (added) > +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Fri Aug 22 06:40:31 2008 > @@ -0,0 +1,284 @@ > +<#-- > +Licensed to the Apache Software Foundation (ASF) under one > +or more contributor license agreements. See the NOTICE file > +distributed with this work for additional information > +regarding copyright ownership. The ASF licenses this file > +to you under the Apache License, Version 2.0 (the > +"License"); you may not use this file except in compliance > +with the License. You may obtain a copy of the License at > + > +http://www.apache.org/licenses/LICENSE-2.0 > + > +Unless required by applicable law or agreed to in writing, > +software distributed under the License is distributed on an > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > +KIND, either express or implied. See the License for the > +specific language governing permissions and limitations > +under the License. > +--> > + > +<#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/> > +<div class="screenlet"> > + <form id="refreshRequestForm" name="refreshRequestForm" method="post" action="<@ofbizUrl>manageAddress</@ofbizUrl>"> > + </form> > + > + <#-- Add address --> > + <div class="screenlet-header"><div class="boxhead"> ${uiLabelMap.CommonAdd} ${uiLabelMap.CommonNew} ${uiLabelMap.CommonAddresses}</div> > + </div> > + <div class="screenlet-body"> > + <a class="buttontext" id="addAddress" href="javascript:void(0)">${uiLabelMap.CommonAdd} ${uiLabelMap.OrderAddress}</a> > + <div id="displayCreateAddressForm" class="popup" style="display: none;"> > + <div id="serverError" class="errorMessage"></div> > + <form id="createPostalAddressForm" name="createPostalAddressForm" method="post" action="<@ofbizUrl></@ofbizUrl>"> > + <input type="hidden" name="roleTypeId" value="CUSTOMER"> > + <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> > + <div class="form-row"> > + ${uiLabelMap.PartyAddressLine1}* > + <div class="form-field"> > + <input type="text" class="inputBox required" name="address1" id="address1" value="" size="30" maxlength="30"><span id="advice-required-address1" style="display: none" class="errorMessage">(required)</span> > + </div> > + </div> > + <div class="form-row"> > + ${uiLabelMap.PartyAddressLine2}<div class="form-field"><input type="text" class="inputBox" name="address2" value="" size="30" maxlength="30"></div> > + </div> > + <div class="form-row"> > + ${uiLabelMap.PartyCity}* > + <div class="form-field"> > + <input type="text" class="inputBox required" name="city" id="city" value="" size="30" maxlength="30"><span id="advice-required-city" style="display: none" class="errorMessage">(required)</span> > + </div> > + </div> > + <div class="form-row"> > + ${uiLabelMap.PartyZipCode}* > + <div class="form-field"> > + <input type="text" class="inputBox required" name="postalCode" id="postalCode" value="" size="12" maxlength="10"><span id="advice-required-postalCode" style="display: none" class="errorMessage">(required)</span> > + </div> > + </div> > + <div class="form-row"> > + ${uiLabelMap.PartyCountry}* > + <div class="form-field"> > + <select name="countryGeoId" id="countryGeoId" class="selectBox required" style="width: 70%"> > + ${screens.render("component://common/widget/CommonScreens.xml#countries")} > + </select> > + <span id="advice-required-countryGeoId" style="display: none" class="errorMessage">(required)</span> > + </div> > + </div> > + <div class="form-row"> > + ${uiLabelMap.PartyState}* > + <div class="form-field"> > + <select name="stateProvinceGeoId" id="stateProvinceGeoId" class="selectBox required" style="width: 70%"> > + <option value="">${uiLabelMap.PartyNoState}</option> > + ${screens.render("component://common/widget/CommonScreens.xml#states")} > + </select> > + <span id="advice-required-stateProvinceGeoId" style="display: none" class="errorMessage">(required)</span> > + </div> > + </div> > + <div class="form-row"> > + <b>${uiLabelMap.EcommerceMyDefaultShippingAddress}</b> > + <input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y" <#if setShippingPurpose?exists>checked</#if>/> > + </div> > + <div class="form-row"> > + <b>${uiLabelMap.EcommerceMyDefaultBillingAddress}</b> > + <input type="checkbox" name="setBillingPurpose" id="setBillingPurpose" value="Y" <#if setBillingPurpose?exists>checked</#if>/> > + </div> > + <div class="form-row"> > + <a href="javascript:void(0);" id="submitPostalAddressForm" class="buttontext" onclick="createPartyPostalAddress('submitPostalAddressForm')">${uiLabelMap.CommonSave}</a> > + <form action=""> > + <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}"/> > + </form> > + </div> > + </form> > + </div> > + <script type="text/javascript"> > + new Popup('displayCreateAddressForm','addAddress', {modal: true, position: 'center', trigger: 'click'}) > + </script> > + </div> > + <br/> > + <div class="screenlet-header"><div class="boxhead"> ${uiLabelMap.EcommerceAddressBook}</div></div> > + <div class="screenlet-body"></div> > + > + <#-- Manage Addresses --> > + <div class="left center"> > + <div class="screenlet-header"><div class="boxhead"> ${uiLabelMap.EcommerceDefault} ${uiLabelMap.CommonAddresses}</div></div> > + <div class="screenlet-body"> > + <#assign postalAddressFlag = "N"> > + <#list partyContactMechValueMaps as partyContactMechValueMap> > + <#assign contactMech = partyContactMechValueMap.contactMech?if_exists> > + <#if contactMech.contactMechTypeId?if_exists = "POSTAL_ADDRESS"> > + <#assign partyContactMech = partyContactMechValueMap.partyContactMech?if_exists> > + <#if partyContactMechValueMap.partyContactMechPurposes?has_content> > + <#assign postalAddressFlag = "Y"> > + <div id="displayEditAddressForm_${contactMech.contactMechId}" class="popup" style="display: none;"> > + <#include "EditPostalAddress.ftl"/> > + </div> > + <div class="form-row"> > + <div class="form-field"> > + <#if showSetShippingPurpose == "N"> > + <h3>${uiLabelMap.EcommercePrimary} ${uiLabelMap.OrderShippingAddress}</h3> > + <span class="buttontextdisabled">${uiLabelMap.EcommerceIsDefault}</span> > + <#else> > + <h3>${uiLabelMap.EcommercePrimary} ${uiLabelMap.PartyBillingAddress}</h3> > + <span class="buttontextdisabled">${uiLabelMap.EcommerceIsDefault}</span> > + </#if> > + </div> > + </div> > + > + <#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists> > + <#if postalAddress?exists> > + <div class="form-row"> > + <div class="form-label"></div> > + <div class="form-field"> > + <div> > + ${postalAddress.address1}<br/> > + <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if> > + ${postalAddress.city} > + <#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> > + ${postalAddress.postalCode?if_exists} > + <#if postalAddress.countryGeoId?has_content><br/>${postalAddress.countryGeoId}</#if> > + <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId?if_exists = "USA")> > + <#assign addr1 = postalAddress.address1?if_exists> > + <#if (addr1.indexOf(" ") gt 0)> > + <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> > + <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> > + <a target="_blank" href="${uiLabelMap.EcommerceLookupWhitepagesLink}" class="linktext">(${uiLabelMap.EcommerceLookupWhitepages})</a> > + </#if> > + </#if> > + </div> > + </div> > + </div> > + <div class="form-row"></div> > + <span> > + <#if showSetShippingPurpose == "N"> > + <div class="form-row"> > + <#assign pcmps = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", "PHONE_SHIPPING")))> > + <#if pcmps?has_content> > + <#assign pcmp = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> > + <#assign telecomNumber = pcmp.getRelatedOne("TelecomNumber")/> > + </#if> > + > + <#if telecomNumber?has_content> > + <#assign pcm = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(telecomNumber.getRelated("PartyContactMech"))/> > + <h3>${uiLabelMap.PartyPhoneNumber}</h3> > + ${telecomNumber.countryCode?if_exists}- > + ${telecomNumber.areaCode?if_exists}- > + ${telecomNumber.contactNumber?if_exists}- > + ${pcm.extension?if_exists} > + </#if> > + </div><br/> > + <a id="update_${contactMech.contactMechId}" href="javascript:void(0)" class="buttontext popup_link">${uiLabelMap.CommonEdit} ${uiLabelMap.OrderShippingAddress}</a> > + <#else> > + <div class="form-row"> > + <#assign pcmps = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", "PHONE_BILLING")))> > + <#if pcmps?has_content> > + <#assign pcmp = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> > + <#assign telecomNumber = pcmp.getRelatedOne("TelecomNumber")/> > + </#if> > + > + <#if telecomNumber?has_content> > + <#assign pcm = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(telecomNumber.getRelated("PartyContactMech"))/> > + <h3>${uiLabelMap.PartyPhoneNumber}</h3> > + ${telecomNumber.countryCode?if_exists}- > + ${telecomNumber.areaCode?if_exists}- > + ${telecomNumber.contactNumber?if_exists}- > + ${pcm.extension?if_exists} > + </#if> > + </div><br/> > + <a id="update_${contactMech.contactMechId}" href="javascript:void(0)" class="buttontext popup_link">${uiLabelMap.CommonEdit} ${uiLabelMap.PartyBillingAddress}</a> > + </#if> > + > + <div class="form-row"></div> > + <a href="<@ofbizUrl>deletePostalAddress?contactMechId=${contactMech.contactMechId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> > + </span> > + <script type="text/javascript"> > + new Popup('displayEditAddressForm_${contactMech.contactMechId}','update_${contactMech.contactMechId}', {modal: true, position: 'center', trigger: 'click'}) > + </script> > + <#else> > + <div class="form-row"> > + <div class="form-label"> > + <h5>${uiLabelMap.PartyPostalInformationNotFound}.</h5> > + </div> > + </div> > + </#if> > + <div class="form-row"><hr class="sepbar"/></div> > + </#if> > + </#if> > + </#list> > + <#if postalAddressFlag == "N"> > + <div class="form-row"> > + <div class="form-label"> > + <h5>${uiLabelMap.PartyPostalInformationNotFound}.</h5> > + </div> > + </div> > + </#if> > + </div> > + </div> > + > + <div class="center right"> > + <div class="screenlet-header"> > + <div class="boxhead"> ${uiLabelMap.EcommerceAdditional} ${uiLabelMap.CommonAddresses}</div> > + </div> > + > + <div class="screenlet-body"> > + <#assign postalAddressFlag = "N"> > + <#list partyContactMechValueMaps as partyContactMechValueMap> > + <#assign contactMech = partyContactMechValueMap.contactMech?if_exists> > + <#if contactMech.contactMechTypeId?if_exists = "POSTAL_ADDRESS"> > + <#assign partyContactMech = partyContactMechValueMap.partyContactMech?if_exists> > + <#if !(partyContactMechValueMap.partyContactMechPurposes?has_content)> > + <#assign postalAddressFlag = "Y"> > + <div id="displayEditAddressForm_${contactMech.contactMechId}" class="popup" style="display: none;"> > + <#include "EditPostalAddress.ftl"/> > + </div> > + <#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists> > + <#if postalAddress?exists> > + <div class="form-row"> > + <div class="form-label"></div> > + <div class="form-field"> > + <div> > + ${postalAddress.address1}<br/> > + <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if> > + ${postalAddress.city} > + <#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> > + ${postalAddress.postalCode?if_exists} > + <#if postalAddress.countryGeoId?has_content><br/>${postalAddress.countryGeoId}</#if> > + <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId?if_exists = "USA")> > + <#assign addr1 = postalAddress.address1?if_exists> > + <#if (addr1.indexOf(" ") gt 0)> > + <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> > + <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> > + <a target="_blank" href="#" class="linktext">(${uiLabelMap.EcommerceLookupWhitepages})</a> > + </#if> > + </#if> > + </div> > + </div> > + </div> > + <div class="form-row"> > + <span> > + <a id="update_${contactMech.contactMechId}" href="javascript:void(0)" class="buttontext popup_link">${uiLabelMap.CommonEdit}</a> > + <a href="<@ofbizUrl>deletePostalAddress?contactMechId=${contactMech.contactMechId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> > + </span> > + </div> > + <script type="text/javascript"> > + new Popup('displayEditAddressForm_${contactMech.contactMechId}','update_${contactMech.contactMechId}', {modal: true, position: 'center', trigger: 'click'}) > + </script> > + <#else> > + <div class="form-row"> > + <div class="form-label"> > + <h5>${uiLabelMap.PartyPostalInformationNotFound}.</h5> > + </div> > + </div> > + </#if> > + <div class="form-row"><hr class="sepbar"/></div> > + </#if> > + </#if> > + </#list> > + <#if postalAddressFlag == "N"> > + <div class="form-row"> > + <div class="form-label"> > + <h5>${uiLabelMap.PartyPostalInformationNotFound}.</h5> > + </div> > + </div> > + </#if> > + </div> > + </div> > + <div class="form-row"></div> > +</div> > \ No newline at end of file > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl > ------------------------------------------------------------------------------ > svn:keywords = "Date Rev Author URL Id" > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl?rev=688081&view=auto > ============================================================================== > --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl (added) > +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl Fri Aug 22 06:40:31 2008 > @@ -0,0 +1,182 @@ > +<#-- > +Licensed to the Apache Software Foundation (ASF) under one > +or more contributor license agreements. See the NOTICE file > +distributed with this work for additional information > +regarding copyright ownership. The ASF licenses this file > +to you under the Apache License, Version 2.0 (the > +"License"); you may not use this file except in compliance > +with the License. You may obtain a copy of the License at > + > +http://www.apache.org/licenses/LICENSE-2.0 > + > +Unless required by applicable law or agreed to in writing, > +software distributed under the License is distributed on an > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > +KIND, either express or implied. See the License for the > +specific language governing permissions and limitations > +under the License. > +--> > + > +<div id="form-container"> > + <form id="newUserForm" name="newUserForm" method="post" action="<@ofbizUrl>createCustomerProfile</@ofbizUrl>"> > + <input type="hidden" name="roleTypeId" value="CUSTOMER"/> > + <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL"/> > + <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/> > + <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> > + > + <div><h1>${uiLabelMap.PartyRequestNewAccount}</h1></div> > + > + <div class="left center"> > + <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.PartyContactInformation}</div></div> > + <div class="form-row"> > + <div class="field-label"><label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="firstName" id="firstName" class="inputBox required" value="${parameters.firstName?if_exists}" size="30" maxlength="30"></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="lastName" id="lastName" class="inputBox required" value="${parameters.lastName?if_exists}" size="30" maxlength="30"></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="emailAddress">${uiLabelMap.PartyEmailAddress}*<span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" class="inputBox required" name="emailAddress" id="emailAddress" value="${parameters.emailAddress?if_exists}" size="30" maxlength="255"/></div> > + </div> > + </div> > + > + <div class="center right"> > + <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.AccountInformation}</div></div> > + <div id="userNameAndPasswordPanel"> > + <div class="form-row"> > + <div class="field-label"><label for="userName">${uiLabelMap.CommonUsername}*<span id="advice-required-username" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="username" id="username" class="inputBox required" value="${parameters.username?if_exists}" size="30" maxlength="255"></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="password">${uiLabelMap.CommonPassword}*<span id="advice-required-password" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="password" name="password" id="password" class="inputBox required" value="${parameters.password?if_exists}" maxlength="16"></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="passwordVerify">${uiLabelMap.CommonConfirm} ${uiLabelMap.CommonPassword}*<span id="advice-required-passwordVerify" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="password" name="passwordVerify" id="passwordVerify" class="inputBox required" value="${parameters.passwordVerify?if_exists}" maxlength="16"></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="currentPassword">${uiLabelMap.FormFieldTitle_passwordHint}</label></div> > + <div class="field-widget"><input type="text" name="passwordHint" id="passwordHintId" class="inputBox" value="${parameters.passwordHint?if_exists}" maxlength="16"></div> > + </div> > + </div> > + </div> > + > + <div class="form-row"><hr class="sepbar"/></div> > + <div class="bothclear"></div> > + > + <div class="left center"> > + <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.OrderShippingInformation}</div></div> > + <div class="form-row"> > + <div class="field-label"><label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*<span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="shipToAddress1" id="shipToAddress1" class="inputBox required" value="${parameters.shipToAddress1?if_exists}"/></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label></div> > + <div class="field-widget"><input type="text" name="shipToAddress2" id="shipToAddress2" class="inputBox" value="${parameters.shipToAddress2?if_exists}"/></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="shipToCity">${uiLabelMap.CommonCity}*<span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="shipToCity" id="shipToCity" class="inputBox required" value="${parameters.shipToCity?if_exists}"/></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="shipToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"> > + <select name="shipToStateProvinceGeoId" id="shipToStateProvinceGeoId" class='selectBox'> > + <#if parameters.shipToStateProvinceGeoId?exists><option>${parameters.shipToStateProvinceGeoId?if_exists}</option></#if> > + ${screens.render("component://common/widget/CommonScreens.xml#states")} > + </select> > + </div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*<span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="shipToPostalCode" id="shipToPostalCode" class="inputBox required" value="${parameters.shipToPostalCode?if_exists}"/></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}*<span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"> > + <select name="shipToCountryGeoId" id="shipToCountryGeoId" class='selectBox'> > + <#if parameters.shipToCountryGeoId?exists><option>${parameters.shipToCountryGeoId?if_exists}</option></#if> > + ${screens.render("component://common/widget/CommonScreens.xml#countries")} > + </select> > + </div> > + </div> > + <div class="form-row"> > + <div class="field-label"> > + <label for="shipToCountryCode">${uiLabelMap.PartyCountry}<span>*</span><span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage">(required)</span></label> > + <label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}<span>*</span><span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage">(required)</span></label> > + <label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}<span>*</span><span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage">(required)</span></label> > + <label for="shipToExtension">${uiLabelMap.PartyExtension}</label> > + </div> > + <div class="field-widget"> > + <input type="text" name="shipToCountryCode" id="shipToCountryCode" class="inputBox required" value="${parameters.countryCode?if_exists}" size="3" maxlength="3"/> > + - <input type="text" name="shipToAreaCode" id="shipToAreaCode" class="inputBox required" value="${parameters.areaCode?if_exists}" size="3" maxlength="3"/> > + - <input type="text" name="shipToContactNumber" id="shipToContactNumber" class="inputBox required" value="${contactNumber?default("${parameters.contactNumber?if_exists}")}" size="6" maxlength="7"/> > + - <input type="text" name="shipToExtension" id="shipToExtension" class="inputBox" value="${extension?default("${parameters.extension?if_exists}")}" size="3" maxlength="3"/> > + </div> > + </div> > + <div class="form-row"> > + <div class="field-widget"><input type="checkbox" class="checkbox" name="useShippingAddressForBilling" id="useShippingAddressForBilling" value="Y" <#if parameters.useShippingAddressForBilling?has_content && parameters.useShippingAddressForBilling?default("")=="Y">checked</#if>/> ${uiLabelMap.FacilityBillingAddressSameShipping}</div> > + </div> > + </div> > + > + <div class="center right"> > + <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.PageTitleBillingInformation}</div></div> > + <div id="billingAddress"> > + <div class="form-row"> > + <div class="field-label"><label for="billToAddress1">${uiLabelMap.PartyAddressLine1}*<span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="billToAddress1" id="billToAddress1" class="inputBox required" value="${parameters.billToAddress1?if_exists}"/></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label></div> > + <div class="field-widget"><input type="text" name="billToAddress2" id="billToAddress2" class="inputBox" value="${parameters.billToAddress2?if_exists}"/></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="billToCity">${uiLabelMap.CommonCity}*<span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="billToCity" id="billToCity" class="inputBox required" value="${parameters.billToCity?if_exists}"/></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="billToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"> > + <select name="billToStateProvinceGeoId" id="billToStateProvinceGeoId" class="selectBox required"> > + <#if parameters.billToStateProvinceGeoId?exists><option>${parameters.billToStateProvinceGeoId?if_exists}</option></#if> > + ${screens.render("component://common/widget/CommonScreens.xml#states")} > + </select> > + </div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="billToPostalCode">${uiLabelMap.PartyZipCode}*<span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"><input type="text" name="billToPostalCode" id="billToPostalCode" class="inputBox required" value="${parameters.billToPostalCode?if_exists}"/></div> > + </div> > + <div class="form-row"> > + <div class="field-label"><label for="billToCountryGeoId">${uiLabelMap.PartyCountry}*<span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label></div> > + <div class="field-widget"> > + <select name="billToCountryGeoId" id="billToCountryGeoId" class="selectBox required"> > + <#if parameters.billToCountryGeoId?exists><option>${parameters.billToCountryGeoId?if_exists}</option></#if> > + ${screens.render("component://common/widget/CommonScreens.xml#countries")} > + </select> > + </div> > + </div> > + <div class="form-row"> > + <div class="field-label"> > + <label for="billToCountryCode">${uiLabelMap.PartyCountry}<span>*</span><span id="advice-required-billToCountryCode" style="display:none" class="errorMessage">(required)</span></label> > + <label for="billToAreaCode">${uiLabelMap.PartyAreaCode}<span>*</span><span id="advice-required-billToAreaCode" style="display:none" class="errorMessage">(required)</span></label> > + <label for="billToContactNumber">${uiLabelMap.PartyContactNumber}<span>*</span><span id="advice-required-billToContactNumber" style="display:none" class="errorMessage">(required)</span></label> > + <label for="billToExtension">${uiLabelMap.PartyExtension}</label> > + </div> > + <div class="field-widget"> > + <input type="text" name="billToCountryCode" id="billToCountryCode" class="inputBox required" value="${parameters.countryCode?if_exists}" size="3" maxlength="3"/> > + - <input type="text" name="billToAreaCode" id="billToAreaCode" class="inputBox required" value="${parameters.areaCode?if_exists}" size="3" maxlength="3"/> > + - <input type="text" name="billToContactNumber" id="billToContactNumber" class="inputBox required" value="${contactNumber?default("${parameters.contactNumber?if_exists}")}" size="6" maxlength="7"/> > + - <input type="text" name="billToExtension" id="billToExtension" class="inputBox" value="${extension?default("${parameters.extension?if_exists}")}" size="3" maxlength="3"/> > + </div> > + </div> > + </div> > + </div> > + > + <div class="bothclear"></div> > + <div class="form-row"> <a id="submitNewUserForm" href="javascript:void(0);" class="buttontext">${uiLabelMap.CommonSave}</a></div> > + </form> > +</div> > \ No newline at end of file > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl > ------------------------------------------------------------------------------ > svn:keywords = "Date Rev Author URL Id" > > Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl?rev=688081&view=auto > ============================================================================== > --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl (added) > +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Fri Aug 22 06:40:31 2008 > @@ -0,0 +1,108 @@ > +<#-- > +Licensed to the Apache Software Foundation (ASF) under one > +or more contributor license agreements. See the NOTICE file > +distributed with this work for additional information > +regarding copyright ownership. The ASF licenses this file > +to you under the Apache License, Version 2.0 (the > +"License"); you may not use this file except in compliance > +with the License. You may obtain a copy of the License at > + > +http://www.apache.org/licenses/LICENSE-2.0 > + > +Unless required by applicable law or agreed to in writing, > +software distributed under the License is distributed on an > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > +KIND, either express or implied. See the License for the > +specific language governing permissions and limitations > +under the License. > +--> > + > +<div class="screenlet"> > + <div class="screenlet-header"> > + <div class="boxhead"> ${uiLabelMap.EcommerceMyAccount}</div> > + </div> > + <div class="screenlet-body"> > + <div align="right"><a class="buttontext" href="<@ofbizUrl>editProfile</@ofbizUrl>">${uiLabelMap.CommonEdit} ${uiLabelMap.CommonProfile}</a> </div><br/> > + <div class="screenlet-header"><div class="boxhead"> ${uiLabelMap.PartyContactInformation}</div></div> > + <div class="screenlet-body"> > + <div class="tabletext"><h3>${uiLabelMap.PartyName}</h3></div> > + <div class="form-row">${parameters.firstName?if_exists} ${parameters.lastName?if_exists}</div> > + > + <#assign emailContactMech = delegator.findOne("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", parameters.emailContactMechId), true)> > + <#assign emailContactMechType = emailContactMech.getRelatedOneCache("ContactMechType")> > + > + <div class="tabletext"><h3>${emailContactMechType.description?if_exists}</h3></div> > + <div class="form-row"> > + <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${parameters.emailContactMechId}"> > + <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${parameters.emailAddress}"> > + <div class="form-field" id="emailAddress">${parameters.emailAddress}</div> > + <a href="mailto:${parameters.emailAddress}" class="linktext">(${uiLabelMap.PartySendEmail})</a> > + </div> > + <div class="form-row"><div id="serverError_${parameters.emailContactMechId}" class="errorMessage"></div></div> > + </div> > + > + <#-- Manage Addresses --> > + <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.EcommerceAddressBook}</div></div> > + <div class="screenlet-body"> > + <div align="right"><a class="buttontext" href="<@ofbizUrl>manageAddress</@ofbizUrl>">${uiLabelMap.EcommerceManage} ${uiLabelMap.CommonAddresses}</a> </div> > + <div class="left center"> > + <div class="screenlet-body"> > + <h3>${uiLabelMap.OrderShippingAddress}</h3> > + <#if parameters.shipToContactMechId?exists> > + ${parameters.shipToAddress1?if_exists}<br/> > + ${parameters.shipToAddress2?if_exists}<br/> > + ${parameters.shipToCity?if_exists}, > + ${parameters.shipToStateProvinceGeoId?if_exists} > + ${parameters.shipToPostalCode?if_exists}<br/> > + ${parameters.shipToCountryGeoId?if_exists}<br/> > + <#assign pcmps = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", "PHONE_SHIPPING")))> > + <#if pcmps?has_content> > + <#assign pcmp = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> > + <#assign telecomNumber = pcmp.getRelatedOne("TelecomNumber")/> > + </#if> > + <#if telecomNumber?has_content> > + <#assign pcm = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(telecomNumber.getRelated("PartyContactMech"))/> > + <h3>${uiLabelMap.PartyPhoneNumber}</h3> > + ${telecomNumber.countryCode?if_exists}- > + ${telecomNumber.areaCode?if_exists}- > + ${telecomNumber.contactNumber?if_exists}- > + ${pcm.extension?if_exists} > + </#if> > + <#else> > + ${uiLabelMap.OrderShippingAddress} ${uiLabelMap.EcommerceNotExists} > + </#if> > + </div> > + </div> > + > + <div class="center right"> > + <div class="screenlet-body"> > + <h3>${uiLabelMap.PartyBillingAddress}</h3> > + <#if parameters.billToContactMechId?exists> > + ${parameters.billToAddress1?if_exists}<br/> > + ${parameters.billToAddress2?if_exists}<br/> > + ${parameters.billToCity?if_exists}, > + ${parameters.billToStateProvinceGeoId?if_exists} > + ${parameters.billToPostalCode?if_exists}<br/> > + ${parameters.billToCountryGeoId?if_exists}<br/> > + <#assign pcmps = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", "PHONE_BILLING")))> > + <#if pcmps?has_content> > + <#assign pcmp = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> > + <#assign telecomNumber = pcmp.getRelatedOne("TelecomNumber")/> > + </#if> > + <#if telecomNumber?has_content> > + <#assign pcm = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(telecomNumber.getRelated("PartyContactMech"))/> > + <h3>${uiLabelMap.PartyPhoneNumber}</h3> > + ${telecomNumber.countryCode?if_exists}- > + ${telecomNumber.areaCode?if_exists}- > + ${telecomNumber.contactNumber?if_exists}- > + ${pcm.extension?if_exists} > + </#if> > + <#else> > + ${uiLabelMap.PartyBillingAddress} ${uiLabelMap.EcommerceNotExists} > + </#if> > + </div> > + </div> > + </div> > + <div class="form-row"></div> > + </div> > +</div> > \ No newline at end of file |
Re: svn commit: r688081 [1/2] - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/script/org/ofbiz/eco
|
|
Thanks Adrian for review.
I hope all issues are now addressed and fixed in rev 688305. - Vikas On Aug 22, 2008, at 9:07 PM, Adrian Crum wrote: > Marco, > > Could we get an explanation from the contributors why there is a > need for all of the <span> elements? There seems to be a lot of > unnecessary markup in these ftl files. Usually, you only need a > <span> if you want to change a style inline, but maybe I'm missing > something here. > > Also, the inputBox CSS class doesn't exist anymore. > > -Adrian > > [hidden email] wrote: >> Author: mor >> Date: Fri Aug 22 06:40:31 2008 >> New Revision: 688081 >> URL: http://svn.apache.org/viewvc?rev=688081&view=rev >> Log: >> Adding completely new screens for customer and profile pages which >> are more compliant to industry standards. >> To use these screens comment existing newcustomer and viewprofile >> screen and uncomment the new ones which has same names. >> Entity Change: A new field is added to check default billing >> address in PartyProfileDefaults. >> As this new stuff becomes matured and community accept this as >> default then we can remove older stuff. >> Thanks to Sumit Pandit, Rishi Solanki, Brajesh Patel and Santosh >> Malviya for there valuable contribution. >> Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/EditPostalAddress.ftl >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=688081&view=auto >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/EditPostalAddress.ftl (added) >> +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/EditPostalAddress.ftl Fri Aug 22 06:40:31 2008 >> @@ -0,0 +1,148 @@ >> +<#-- >> +Licensed to the Apache Software Foundation (ASF) under one >> +or more contributor license agreements. See the NOTICE file >> +distributed with this work for additional information >> +regarding copyright ownership. The ASF licenses this file >> +to you under the Apache License, Version 2.0 (the >> +"License"); you may not use this file except in compliance >> +with the License. You may obtain a copy of the License at >> + >> +http://www.apache.org/licenses/LICENSE-2.0 >> + >> +Unless required by applicable law or agreed to in writing, >> +software distributed under the License is distributed on an >> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY >> +KIND, either express or implied. See the License for the >> +specific language governing permissions and limitations >> +under the License. >> +--> >> + >> +<div id="serverError_${contactMech.contactMechId}" >> class="errorMessage"></div> >> +<#assign postalAddress = delegator.findOne("PostalAddress", >> Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", >> contactMech.contactMechId), true)> >> + >> +<form id="editPostalAddress_${contactMech.contactMechId}" >> name="editPostalAddress_${contactMech.contactMechId}" method="post" >> action="<@ofbizUrl></@ofbizUrl>"> >> + <input type="hidden" name="contactMechId" value="$ >> {postalAddress.contactMechId?if_exists}"/> >> + <#assign productStoreId = >> Static >> ["org >> .ofbiz >> .product.store.ProductStoreWorker"].getProductStoreId(request)/> >> + <input type="hidden" name="productStoreId" value="$ >> {productStoreId?if_exists}"/> >> + <#assign showSetShippingPurpose = "Y"> >> + <#assign showSetBillingPurpose = "Y"> >> + <#assign telecomNumber = ""> >> + <#list partyContactMechValueMap.partyContactMechPurposes? >> if_exists as partyContactMechPurpose> + <#assign >> contactMechPurposeType = >> partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> >> + <#if contactMechPurposeType.contactMechPurposeTypeId == >> "SHIPPING_LOCATION"> >> + <#assign showSetShippingPurpose = "N"> >> + <#assign pcmps = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", >> Static >> ["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", >> "PHONE_SHIPPING")))> >> + <#if pcmps?has_content> >> + <#assign pcmp = >> Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> >> + <#assign telecomNumber = >> pcmp.getRelatedOne("TelecomNumber")/> >> + </#if> >> + </#if> >> + <#if contactMechPurposeType.contactMechPurposeTypeId == >> "BILLING_LOCATION"> >> + <#assign showSetBillingPurpose = "N"> >> + <#assign pcmps = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", >> Static >> ["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", >> "PHONE_BILLING")))> >> + <#if pcmps?has_content> >> + <#assign pcmp = >> Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> >> + <#assign telecomNumber = >> pcmp.getRelatedOne("TelecomNumber")/> >> + </#if> >> + </#if> >> + </#list> >> + <div class="screenlet-body"> >> + <div class="form-row"> >> + <span>${uiLabelMap.PartyAddressLine1}*</span> >> + <span> >> + <input type="text" class="left inputBox required" >> name="address1" id="address1_${contactMech.contactMechId}" value="$ >> {postalAddress.address1?if_exists}" style="width: 50%" size="30" >> maxlength="30"> >> + <span id="advice-required-address1_$ >> {contactMech.contactMechId}" style="display: none" >> class="errorMessage">(required)</span> >> + </span> >> + </div> >> + <div class="form-row"> >> + <span>${uiLabelMap.PartyAddressLine2}</span> >> + <span> >> + <input type="text" class="left inputBox" name="address2" >> value="${postalAddress.address2?if_exists}" style="width: 50%" >> size="30" maxlength="30"> + </span> >> + </div> >> + <div class="form-row"> >> + <span>${uiLabelMap.PartyCity}*</span> >> + <span> >> + <input type="text" class="left inputBox required" >> name="city" id="city_${contactMech.contactMechId}" value="$ >> {postalAddress.city?if_exists}" size="30" maxlength="30"> >> + <span id="advice-required-city_$ >> {contactMech.contactMechId}" style="display: none" >> class="errorMessage">(required)</span> >> + </span> >> + </div> >> + <div class="form-row"> >> + <span>${uiLabelMap.PartyZipCode}*</span> >> + <span> >> + <input type="text" class="left inputBox required" >> name="postalCode" id="postalCode_${contactMech.contactMechId}" >> value="${postalAddress.postalCode?if_exists}" size="12" >> maxlength="10"> >> + <span id="advice-required-postalCode_$ >> {contactMech.contactMechId}" style="display: none" >> class="errorMessage">(required)</span> >> + </span> >> + </div> >> + <div class="form-row"> >> + <span>${uiLabelMap.PartyCountry}*</span> >> + <span> >> + <select name="countryGeoId" id="countryGeoId_$ >> {contactMech.contactMechId}" class="left selectBox required" >> style="width: 70%"> >> + <#if postalAddress.countryGeoId?exists> >> + <option value='${postalAddress.countryGeoId}'>$ >> {selectedCountryName?default(postalAddress.countryGeoId)}</option> >> + </#if> >> + ${screens.render("component://common/widget/ >> CommonScreens.xml#countries")} >> + </select> >> + <span id="advice-required-countryGeoId_$ >> {contactMech.contactMechId}" style="display: none" >> class="errorMessage">(required)</span> >> + </span> >> + </div> >> + <div class="form-row"> >> + <span>${uiLabelMap.PartyState}*</span> >> + <span> >> + <select name="stateProvinceGeoId" id="stateProvinceGeoId_$ >> {contactMech.contactMechId}" class="left selectBox required" >> style="width: 70%"> >> + <#if postalAddress.stateProvinceGeoId?exists> >> + <option value='${postalAddress.stateProvinceGeoId}'>$ >> {selectedStateName?default(postalAddress.stateProvinceGeoId)}</ >> option> >> + </#if> >> + <option value="">${uiLabelMap.PartyNoState}</option> >> + ${screens.render("component://common/widget/ >> CommonScreens.xml#states")} >> + </select> >> + <span id="advice-required-stateProvinceGeoId_$ >> {contactMech.contactMechId}" style="display: none" >> class="errorMessage">(required)</span> >> + </span> >> + </div> >> + >> + <#if telecomNumber?has_content> >> + <#assign pcm = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].getFirst(telecomNumber.getRelated("PartyContactMech"))/> >> + <div class="form-row"> >> + <h3>${uiLabelMap.PartyPhoneNumber}</h3> >> + <div class="field-label"> >> + <label for="countryCode_${telecomNumber.contactMechId}">$ >> {uiLabelMap.PartyCountry}<span>*</span> >> + <span id="advice-required-countryCode_$ >> {telecomNumber.contactMechId}" style="display:none" >> class="errorMessage">(required)</span> >> + </label> >> + <label for="areaCode_${telecomNumber.contactMechId}">$ >> {uiLabelMap.PartyAreaCode}<span>*</span><span id="advice-required- >> areaCode_${telecomNumber.contactMechId}" style="display:none" >> class="errorMessage">(required)</span></label> >> + <label for="contactNumber_$ >> {telecomNumber.contactMechId}">$ >> {uiLabelMap.PartyContactNumber}<span>*</span><span id="advice- >> required-contactNumber_${telecomNumber.contactMechId}" >> style="display:none" class="errorMessage">(required)</span></label> >> + <label for="extension_${telecomNumber.contactMechId}">$ >> {uiLabelMap.PartyExtension}</label> >> + </div> >> + <div class="field-widget"> >> + <input type="hidden" name="phoneContactMechId" value="$ >> {telecomNumber.contactMechId?if_exists}"/> >> + <input type="text" name="countryCode" id="countryCode_$ >> {telecomNumber.contactMechId}" class="inputBox required" value="$ >> {telecomNumber.countryCode?if_exists}" size="3" maxlength="3"/> >> + - <input type="text" name="areaCode" id="areaCode_$ >> {telecomNumber.contactMechId}" class="inputBox required" value="$ >> {telecomNumber.areaCode?if_exists}" size="3" maxlength="3"/> >> + - <input type="text" name="contactNumber" >> id="contactNumber_${telecomNumber.contactMechId}" class="inputBox >> required" value="${contactNumber?default("$ >> {telecomNumber.contactNumber?if_exists}")}" size="6" maxlength="7"/> >> + - <input type="text" name="extension" id="extension_$ >> {telecomNumber.contactMechId}" class="inputBox" value="${extension? >> default("${pcm.extension?if_exists}")}" size="3" maxlength="3"/> >> + </div> >> + </div> + </#if> >> + <#if showSetShippingPurpose == "Y"> >> + <div class="form-row"> >> + <b>${uiLabelMap.EcommerceMyDefaultShippingAddress}</b> >> + <input type="checkbox" name="setShippingPurpose" value="Y" >> <#if setShippingPurpose?exists>checked</#if>/> >> + </div> >> + <#else> >> + <input type="hidden" name="setShippingPurpose" value="Y"/> >> + </#if> >> + <#if showSetBillingPurpose == "Y"> >> + <div class="form-row"> >> + <b>${uiLabelMap.EcommerceMyDefaultBillingAddress}</b> >> + <input type="checkbox" name="setBillingPurpose" value="Y" >> <#if setBillingPurpose?exists>checked</#if>/> >> + </div> >> + <#else> >> + <input type="hidden" name="setBillingPurpose" value="Y"/> >> + </#if> >> + >> + <div class="form-row"> >> + <a name="submitEditPostalAddress_$ >> {contactMech.contactMechId}" id="submitEditPostalAddress_$ >> {contactMech.contactMechId}" class="buttontext" >> onclick="updatePartyPostalAddress('submitEditPostalAddress_$ >> {contactMech.contactMechId}')">${uiLabelMap.CommonSave}</a> >> + <form action=""> >> + <input class="popup_closebox buttontext" type="button" >> value="${uiLabelMap.CommonClose}"/> >> + </form> >> + </div> >> + </div> >> +</form> >> \ No newline at end of file >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/EditPostalAddress.ftl >> ------------------------------------------------------------------------------ >> svn:eol-style = native >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/EditPostalAddress.ftl >> ------------------------------------------------------------------------------ >> svn:keywords = Date Rev Author URL Id >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/EditPostalAddress.ftl >> ------------------------------------------------------------------------------ >> svn:mime-type = text/plain >> Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/EditProfile.ftl >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl?rev=688081&view=auto >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/EditProfile.ftl (added) >> +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/EditProfile.ftl Fri Aug 22 06:40:31 2008 >> @@ -0,0 +1,71 @@ >> +<#-- >> +Licensed to the Apache Software Foundation (ASF) under one >> +or more contributor license agreements. See the NOTICE file >> +distributed with this work for additional information >> +regarding copyright ownership. The ASF licenses this file >> +to you under the Apache License, Version 2.0 (the >> +"License"); you may not use this file except in compliance >> +with the License. You may obtain a copy of the License at >> + >> +http://www.apache.org/licenses/LICENSE-2.0 >> + >> +Unless required by applicable law or agreed to in writing, >> +software distributed under the License is distributed on an >> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY >> +KIND, either express or implied. See the License for the >> +specific language governing permissions and limitations >> +under the License. >> +--> >> + >> +<div id="form-container" class="screenlet"> >> + <div class="screenlet-header"> >> + <div class='boxhead'> ${uiLabelMap.CommonEdit} $ >> {uiLabelMap.CommonProfile}</div> >> + </div> >> + <div class="screenlet-body"> >> + <form id="editUserForm" name="editUserForm" method="post" >> action="<@ofbizUrl>updateCustomerProfile</@ofbizUrl>"> >> + <input type="hidden" name="emailContactMechPurposeTypeId" >> value="PRIMARY_EMAIL"/> >> + <input type="hidden" name="emailContactMechId" value="$ >> {parameters.emailContactMechId?if_exists}"/> >> + >> + <div class="left center"> >> + <div class="screenlet-header"><div class='boxhead'> $ >> {uiLabelMap.PartyContactInformation}</div></div> >> + <div class="screenlet-body"> >> + <div class="form-row"> >> + <div class="field-label"><label for="firstName">$ >> {uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" >> style="display: none" class="errorMessage">(required)</span></ >> label></div> >> + <div class="field-widget"><input type="text" >> name="firstName" id="firstName" class="inputBox required" value="$ >> {parameters.firstName?if_exists}" size="30" maxlength="30"></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="lastName">$ >> {uiLabelMap.PartyLastName}*<span id="advice-required-lastName" >> style="display: none" class="errorMessage">(required)</span></ >> label></div> >> + <div class="field-widget"><input type="text" >> name="lastName" id="lastName" class="inputBox required" value="$ >> {parameters.lastName?if_exists}" size="30" maxlength="30"></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="emailAddress">$ >> {uiLabelMap.PartyEmailAddress}*<span id="advice-required- >> emailAddress" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"><input type="text" >> class="inputBox required" name="emailAddress" id="emailAddress" >> value="${parameters.emailAddress?if_exists}" size="30" >> maxlength="255"/></div> >> + </div> >> + </div> >> + </div> >> + >> + <div class="center right"> >> + <div class="screenlet-header"><div class='boxhead'> $ >> {uiLabelMap.AccountInformation}</div></div> >> + <div class="screenlet-body"> >> + <div class="form-row"> >> + <div class="field-label"><label for="userName">$ >> {uiLabelMap.CommonUsername}*</label></div> >> + <div class="field-widget"><input type="text" >> name="userLoginId" id="userLoginId" class="inputBox" value="$ >> {userLogin.userLoginId?if_exists}" size="30" maxlength="255" <#if >> userLogin.userLoginId?exists>disabled</#if>></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="currentPassword">$ >> {uiLabelMap.CommonCurrentPassword}*</label></div> >> + <div class="field-widget"><input type="password" >> name="currentPassword" id="currentPassword" class="inputBox" >> value="${parameters.currentPassword?if_exists}" size="30" >> maxlength="16"></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="newPassword">$ >> {uiLabelMap.CommonNewPassword}*</label></div> >> + <div class="field-widget"><input type="password" >> name="newPassword" id="newPassword" class="inputBox" value="$ >> {parameters.newPassword?if_exists}" size="30" maxlength="16"></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label >> for="newPasswordVerify">${uiLabelMap.CommonNewPasswordVerify}*</ >> label></div> >> + <div class="field-widget"><input type="password" >> name="newPasswordVerify" id="newPasswordVerify" class="inputBox" >> value="${parameters.passwordVerify?if_exists}" size="30" >> maxlength="16"></div> >> + </div> >> + </div> >> + </div> >> + <div class="form-row"> <a id="submitEditUserForm" >> href="javascript:void(0);" class="buttontext">$ >> {uiLabelMap.CommonSave}</a></div> >> + </form> >> + </div> >> +</div> >> \ No newline at end of file >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/EditProfile.ftl >> ------------------------------------------------------------------------------ >> svn:eol-style = native >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/EditProfile.ftl >> ------------------------------------------------------------------------------ >> svn:keywords = "Date Rev Author URL Id" >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/EditProfile.ftl >> ------------------------------------------------------------------------------ >> svn:mime-type = text/plain >> Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/ManageAddress.ftl >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=688081&view=auto >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/ManageAddress.ftl (added) >> +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/ManageAddress.ftl Fri Aug 22 06:40:31 2008 >> @@ -0,0 +1,284 @@ >> +<#-- >> +Licensed to the Apache Software Foundation (ASF) under one >> +or more contributor license agreements. See the NOTICE file >> +distributed with this work for additional information >> +regarding copyright ownership. The ASF licenses this file >> +to you under the Apache License, Version 2.0 (the >> +"License"); you may not use this file except in compliance >> +with the License. You may obtain a copy of the License at >> + >> +http://www.apache.org/licenses/LICENSE-2.0 >> + >> +Unless required by applicable law or agreed to in writing, >> +software distributed under the License is distributed on an >> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY >> +KIND, either express or implied. See the License for the >> +specific language governing permissions and limitations >> +under the License. >> +--> >> + >> +<#assign productStoreId = >> Static >> ["org >> .ofbiz >> .product.store.ProductStoreWorker"].getProductStoreId(request)/> >> +<div class="screenlet"> >> + <form id="refreshRequestForm" name="refreshRequestForm" >> method="post" action="<@ofbizUrl>manageAddress</@ofbizUrl>"> >> + </form> >> + >> + <#-- Add address --> >> + <div class="screenlet-header"><div class="boxhead"> $ >> {uiLabelMap.CommonAdd} ${uiLabelMap.CommonNew} $ >> {uiLabelMap.CommonAddresses}</div> >> + </div> >> + <div class="screenlet-body"> >> + <a class="buttontext" id="addAddress" >> href="javascript:void(0)">${uiLabelMap.CommonAdd} $ >> {uiLabelMap.OrderAddress}</a> >> + <div id="displayCreateAddressForm" class="popup" >> style="display: none;"> >> + <div id="serverError" class="errorMessage"></div> >> + <form id="createPostalAddressForm" >> name="createPostalAddressForm" method="post" action="<@ofbizUrl></ >> @ofbizUrl>"> >> + <input type="hidden" name="roleTypeId" value="CUSTOMER"> >> + <input type="hidden" name="productStoreId" value="$ >> {productStoreId?if_exists}"/> >> + <div class="form-row"> >> + ${uiLabelMap.PartyAddressLine1}* >> + <div class="form-field"> >> + <input type="text" class="inputBox required" >> name="address1" id="address1" value="" size="30" >> maxlength="30"><span id="advice-required-address1" style="display: >> none" class="errorMessage">(required)</span> >> + </div> >> + </div> >> + <div class="form-row"> >> + ${uiLabelMap.PartyAddressLine2}<div class="form- >> field"><input type="text" class="inputBox" name="address2" value="" >> size="30" maxlength="30"></div> >> + </div> >> + <div class="form-row"> >> + ${uiLabelMap.PartyCity}* >> + <div class="form-field"> >> + <input type="text" class="inputBox required" >> name="city" id="city" value="" size="30" maxlength="30"><span >> id="advice-required-city" style="display: none" >> class="errorMessage">(required)</span> >> + </div> >> + </div> >> + <div class="form-row"> >> + ${uiLabelMap.PartyZipCode}* >> + <div class="form-field"> >> + <input type="text" class="inputBox required" >> name="postalCode" id="postalCode" value="" size="12" >> maxlength="10"><span id="advice-required-postalCode" >> style="display: none" class="errorMessage">(required)</span> >> + </div> >> + </div> >> + <div class="form-row"> >> + ${uiLabelMap.PartyCountry}* >> + <div class="form-field"> >> + <select name="countryGeoId" id="countryGeoId" >> class="selectBox required" style="width: 70%"> >> + ${screens.render("component://common/widget/ >> CommonScreens.xml#countries")} >> + </select> >> + <span id="advice-required-countryGeoId" >> style="display: none" class="errorMessage">(required)</span> >> + </div> >> + </div> >> + <div class="form-row"> >> + ${uiLabelMap.PartyState}* >> + <div class="form-field"> >> + <select name="stateProvinceGeoId" >> id="stateProvinceGeoId" class="selectBox required" style="width: >> 70%"> >> + <option value="">${uiLabelMap.PartyNoState}</option> >> + ${screens.render("component://common/widget/ >> CommonScreens.xml#states")} >> + </select> >> + <span id="advice-required-stateProvinceGeoId" >> style="display: none" class="errorMessage">(required)</span> >> + </div> >> + </div> >> + <div class="form-row"> >> + <b>${uiLabelMap.EcommerceMyDefaultShippingAddress}</b> >> + <input type="checkbox" name="setShippingPurpose" >> id="setShippingPurpose" value="Y" <#if setShippingPurpose? >> exists>checked</#if>/> >> + </div> >> + <div class="form-row"> >> + <b>${uiLabelMap.EcommerceMyDefaultBillingAddress}</b> >> + <input type="checkbox" name="setBillingPurpose" >> id="setBillingPurpose" value="Y" <#if setBillingPurpose? >> exists>checked</#if>/> >> + </div> >> + <div class="form-row"> >> + <a href="javascript:void(0);" >> id="submitPostalAddressForm" class="buttontext" >> onclick="createPartyPostalAddress('submitPostalAddressForm')">$ >> {uiLabelMap.CommonSave}</a> >> + <form action=""> >> + <input class="popup_closebox buttontext" type="button" >> value="${uiLabelMap.CommonClose}"/> >> + </form> >> + </div> >> + </form> >> + </div> >> + <script type="text/javascript"> >> + new Popup('displayCreateAddressForm','addAddress', {modal: >> true, position: 'center', trigger: 'click'}) >> + </script> >> + </div> >> + <br/> >> + <div class="screenlet-header"><div class="boxhead"> $ >> {uiLabelMap.EcommerceAddressBook}</div></div> >> + <div class="screenlet-body"></div> >> + >> + <#-- Manage Addresses --> >> + <div class="left center"> >> + <div class="screenlet-header"><div class="boxhead"> $ >> {uiLabelMap.EcommerceDefault} ${uiLabelMap.CommonAddresses}</div></ >> div> >> + <div class="screenlet-body"> >> + <#assign postalAddressFlag = "N"> >> + <#list partyContactMechValueMaps as partyContactMechValueMap> >> + <#assign contactMech = >> partyContactMechValueMap.contactMech?if_exists> >> + <#if contactMech.contactMechTypeId?if_exists = >> "POSTAL_ADDRESS"> >> + <#assign partyContactMech = >> partyContactMechValueMap.partyContactMech?if_exists> >> + <#if partyContactMechValueMap.partyContactMechPurposes? >> has_content> >> + <#assign postalAddressFlag = "Y"> >> + <div id="displayEditAddressForm_$ >> {contactMech.contactMechId}" class="popup" style="display: none;"> >> + <#include "EditPostalAddress.ftl"/> >> + </div> >> + <div class="form-row"> >> + <div class="form-field"> >> + <#if showSetShippingPurpose == "N"> >> + <h3>${uiLabelMap.EcommercePrimary} $ >> {uiLabelMap.OrderShippingAddress}</h3> >> + <span class="buttontextdisabled">$ >> {uiLabelMap.EcommerceIsDefault}</span> >> + <#else> >> + <h3>${uiLabelMap.EcommercePrimary} $ >> {uiLabelMap.PartyBillingAddress}</h3> >> + <span class="buttontextdisabled">$ >> {uiLabelMap.EcommerceIsDefault}</span> >> + </#if> >> + </div> >> + </div> >> + >> + <#assign postalAddress = >> partyContactMechValueMap.postalAddress?if_exists> >> + <#if postalAddress?exists> >> + <div class="form-row"> >> + <div class="form-label"></div> >> + <div class="form-field"> >> + <div> >> + ${postalAddress.address1}<br/> >> + <#if postalAddress.address2?has_content>$ >> {postalAddress.address2}<br/></#if> >> + ${postalAddress.city} >> + <#if postalAddress.stateProvinceGeoId? >> has_content>, ${postalAddress.stateProvinceGeoId}</#if> >> + ${postalAddress.postalCode?if_exists} >> + <#if postalAddress.countryGeoId? >> has_content><br/>${postalAddress.countryGeoId}</#if> >> + <#if (!postalAddress.countryGeoId?has_content >> || postalAddress.countryGeoId?if_exists = "USA")> >> + <#assign addr1 = postalAddress.address1? >> if_exists> >> + <#if (addr1.indexOf(" ") gt 0)> >> + <#assign addressNum = addr1.substring(0, >> addr1.indexOf(" "))> >> + <#assign addressOther = >> addr1.substring(addr1.indexOf(" ")+1)> >> + <a target="_blank" href="$ >> {uiLabelMap.EcommerceLookupWhitepagesLink}" class="linktext">($ >> {uiLabelMap.EcommerceLookupWhitepages})</a> >> + </#if> >> + </#if> >> + </div> >> + </div> >> + </div> >> + <div class="form-row"></div> >> + <span> >> + <#if showSetShippingPurpose == "N"> >> + <div class="form-row"> >> + <#assign pcmps = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", >> Static >> ["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", >> "PHONE_SHIPPING")))> >> + <#if pcmps?has_content> >> + <#assign pcmp = >> Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> >> + <#assign telecomNumber = >> pcmp.getRelatedOne("TelecomNumber")/> >> + </#if> >> + + <#if telecomNumber?has_content> >> + <#assign pcm = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].getFirst(telecomNumber.getRelated("PartyContactMech"))/> >> + <h3>${uiLabelMap.PartyPhoneNumber}</h3> >> + ${telecomNumber.countryCode?if_exists}- >> + ${telecomNumber.areaCode?if_exists}- >> + ${telecomNumber.contactNumber?if_exists}- >> + ${pcm.extension?if_exists} >> + </#if> >> + </div><br/> >> + <a id="update_${contactMech.contactMechId}" >> href="javascript:void(0)" class="buttontext popup_link">$ >> {uiLabelMap.CommonEdit} ${uiLabelMap.OrderShippingAddress}</a> >> + <#else> >> + <div class="form-row"> >> + <#assign pcmps = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", >> Static >> ["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", >> "PHONE_BILLING")))> >> + <#if pcmps?has_content> >> + <#assign pcmp = >> Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> >> + <#assign telecomNumber = >> pcmp.getRelatedOne("TelecomNumber")/> >> + </#if> >> + + <#if telecomNumber? >> has_content> >> + <#assign pcm = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].getFirst(telecomNumber.getRelated("PartyContactMech"))/> >> + <h3>${uiLabelMap.PartyPhoneNumber}</h3> >> + ${telecomNumber.countryCode?if_exists}- >> + ${telecomNumber.areaCode?if_exists}- >> + ${telecomNumber.contactNumber?if_exists}- >> + ${pcm.extension?if_exists} >> + </#if> >> + </div><br/> >> + <a id="update_${contactMech.contactMechId}" >> href="javascript:void(0)" class="buttontext popup_link">$ >> {uiLabelMap.CommonEdit} ${uiLabelMap.PartyBillingAddress}</a> >> + </#if> >> + >> + <div class="form-row"></div> >> + <a href="<@ofbizUrl>deletePostalAddress? >> contactMechId=${contactMech.contactMechId}</@ofbizUrl>" >> class="buttontext">${uiLabelMap.CommonDelete}</a> >> + </span> >> + <script type="text/javascript"> >> + new Popup('displayEditAddressForm_$ >> {contactMech.contactMechId}','update_${contactMech.contactMechId}', >> {modal: true, position: 'center', trigger: 'click'}) >> + </script> >> + <#else> >> + <div class="form-row"> >> + <div class="form-label"> >> + <h5>$ >> {uiLabelMap.PartyPostalInformationNotFound}.</h5> >> + </div> >> + </div> >> + </#if> >> + <div class="form-row"><hr class="sepbar"/></div> >> + </#if> >> + </#if> >> + </#list> >> + <#if postalAddressFlag == "N"> >> + <div class="form-row"> >> + <div class="form-label"> >> + <h5>${uiLabelMap.PartyPostalInformationNotFound}.</h5> >> + </div> >> + </div> >> + </#if> >> + </div> >> + </div> >> + >> + <div class="center right"> >> + <div class="screenlet-header"> >> + <div class="boxhead"> ${uiLabelMap.EcommerceAdditional} >> ${uiLabelMap.CommonAddresses}</div> >> + </div> >> + >> + <div class="screenlet-body"> >> + <#assign postalAddressFlag = "N"> >> + <#list partyContactMechValueMaps as partyContactMechValueMap> >> + <#assign contactMech = >> partyContactMechValueMap.contactMech?if_exists> >> + <#if contactMech.contactMechTypeId?if_exists = >> "POSTAL_ADDRESS"> >> + <#assign partyContactMech = >> partyContactMechValueMap.partyContactMech?if_exists> >> + <#if !(partyContactMechValueMap.partyContactMechPurposes? >> has_content)> >> + <#assign postalAddressFlag = "Y"> >> + <div id="displayEditAddressForm_$ >> {contactMech.contactMechId}" class="popup" style="display: none;"> >> + <#include "EditPostalAddress.ftl"/> >> + </div> >> + <#assign postalAddress = >> partyContactMechValueMap.postalAddress?if_exists> >> + <#if postalAddress?exists> >> + <div class="form-row"> >> + <div class="form-label"></div> >> + <div class="form-field"> >> + <div> >> + ${postalAddress.address1}<br/> >> + <#if postalAddress.address2?has_content>$ >> {postalAddress.address2}<br/></#if> >> + ${postalAddress.city} >> + <#if postalAddress.stateProvinceGeoId? >> has_content>, ${postalAddress.stateProvinceGeoId}</#if> >> + ${postalAddress.postalCode?if_exists} >> + <#if postalAddress.countryGeoId? >> has_content><br/>${postalAddress.countryGeoId}</#if> >> + <#if (!postalAddress.countryGeoId?has_content >> || postalAddress.countryGeoId?if_exists = "USA")> >> + <#assign addr1 = postalAddress.address1? >> if_exists> >> + <#if (addr1.indexOf(" ") gt 0)> >> + <#assign addressNum = addr1.substring(0, >> addr1.indexOf(" "))> >> + <#assign addressOther = >> addr1.substring(addr1.indexOf(" ")+1)> >> + <a target="_blank" href="#" >> class="linktext">(${uiLabelMap.EcommerceLookupWhitepages})</a> >> + </#if> >> + </#if> >> + </div> >> + </div> >> + </div> >> + <div class="form-row"> >> + <span> >> + <a id="update_${contactMech.contactMechId}" >> href="javascript:void(0)" class="buttontext popup_link">$ >> {uiLabelMap.CommonEdit}</a> >> + <a href="<@ofbizUrl>deletePostalAddress? >> contactMechId=${contactMech.contactMechId}</@ofbizUrl>" >> class="buttontext">${uiLabelMap.CommonDelete}</a> >> + </span> >> + </div> >> + <script type="text/javascript"> >> + new Popup('displayEditAddressForm_$ >> {contactMech.contactMechId}','update_${contactMech.contactMechId}', >> {modal: true, position: 'center', trigger: 'click'}) >> + </script> >> + <#else> >> + <div class="form-row"> >> + <div class="form-label"> >> + <h5>$ >> {uiLabelMap.PartyPostalInformationNotFound}.</h5> >> + </div> >> + </div> >> + </#if> >> + <div class="form-row"><hr class="sepbar"/></div> >> + </#if> >> + </#if> >> + </#list> >> + <#if postalAddressFlag == "N"> >> + <div class="form-row"> >> + <div class="form-label"> >> + <h5>${uiLabelMap.PartyPostalInformationNotFound}.</h5> >> + </div> >> + </div> >> + </#if> >> + </div> >> + </div> >> + <div class="form-row"></div> >> +</div> >> \ No newline at end of file >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/ManageAddress.ftl >> ------------------------------------------------------------------------------ >> svn:eol-style = native >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/ManageAddress.ftl >> ------------------------------------------------------------------------------ >> svn:keywords = "Date Rev Author URL Id" >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/ManageAddress.ftl >> ------------------------------------------------------------------------------ >> svn:mime-type = text/plain >> Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/NewCustomer.ftl >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl?rev=688081&view=auto >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/NewCustomer.ftl (added) >> +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/NewCustomer.ftl Fri Aug 22 06:40:31 2008 >> @@ -0,0 +1,182 @@ >> +<#-- >> +Licensed to the Apache Software Foundation (ASF) under one >> +or more contributor license agreements. See the NOTICE file >> +distributed with this work for additional information >> +regarding copyright ownership. The ASF licenses this file >> +to you under the Apache License, Version 2.0 (the >> +"License"); you may not use this file except in compliance >> +with the License. You may obtain a copy of the License at >> + >> +http://www.apache.org/licenses/LICENSE-2.0 >> + >> +Unless required by applicable law or agreed to in writing, >> +software distributed under the License is distributed on an >> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY >> +KIND, either express or implied. See the License for the >> +specific language governing permissions and limitations >> +under the License. >> +--> >> + >> +<div id="form-container"> >> + <form id="newUserForm" name="newUserForm" method="post" >> action="<@ofbizUrl>createCustomerProfile</@ofbizUrl>"> >> + <input type="hidden" name="roleTypeId" value="CUSTOMER"/> >> + <input type="hidden" name="emailContactMechPurposeTypeId" >> value="PRIMARY_EMAIL"/> >> + <#assign productStoreId = >> Static >> ["org >> .ofbiz >> .product.store.ProductStoreWorker"].getProductStoreId(request)/> >> + <input type="hidden" name="productStoreId" value="$ >> {productStoreId?if_exists}"/> >> + >> + <div><h1>${uiLabelMap.PartyRequestNewAccount}</h1></div> >> + >> + <div class="left center"> >> + <div class="screenlet-header"><div class='boxhead'> $ >> {uiLabelMap.PartyContactInformation}</div></div> >> + <div class="form-row"> >> + <div class="field-label"><label for="firstName">$ >> {uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" >> style="display: none" class="errorMessage">(required)</span></ >> label></div> >> + <div class="field-widget"><input type="text" >> name="firstName" id="firstName" class="inputBox required" value="$ >> {parameters.firstName?if_exists}" size="30" maxlength="30"></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="lastName">$ >> {uiLabelMap.PartyLastName}*<span id="advice-required-lastName" >> style="display: none" class="errorMessage">(required)</span></ >> label></div> >> + <div class="field-widget"><input type="text" >> name="lastName" id="lastName" class="inputBox required" value="$ >> {parameters.lastName?if_exists}" size="30" maxlength="30"></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="emailAddress">$ >> {uiLabelMap.PartyEmailAddress}*<span id="advice-required- >> emailAddress" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"><input type="text" >> class="inputBox required" name="emailAddress" id="emailAddress" >> value="${parameters.emailAddress?if_exists}" size="30" >> maxlength="255"/></div> >> + </div> >> + </div> >> + >> + <div class="center right"> >> + <div class="screenlet-header"><div class='boxhead'> $ >> {uiLabelMap.AccountInformation}</div></div> >> + <div id="userNameAndPasswordPanel"> >> + <div class="form-row"> >> + <div class="field-label"><label for="userName">$ >> {uiLabelMap.CommonUsername}*<span id="advice-required-username" >> style="display: none" class="errorMessage">(required)</span></ >> label></div> >> + <div class="field-widget"><input type="text" >> name="username" id="username" class="inputBox required" value="$ >> {parameters.username?if_exists}" size="30" maxlength="255"></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="password">$ >> {uiLabelMap.CommonPassword}*<span id="advice-required-password" >> style="display: none" class="errorMessage">(required)</span></ >> label></div> >> + <div class="field-widget"><input type="password" >> name="password" id="password" class="inputBox required" value="$ >> {parameters.password?if_exists}" maxlength="16"></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="passwordVerify">$ >> {uiLabelMap.CommonConfirm} ${uiLabelMap.CommonPassword}*<span >> id="advice-required-passwordVerify" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"><input type="password" >> name="passwordVerify" id="passwordVerify" class="inputBox required" >> value="${parameters.passwordVerify?if_exists}" maxlength="16"></div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="currentPassword">$ >> {uiLabelMap.FormFieldTitle_passwordHint}</label></div> >> + <div class="field-widget"><input type="text" >> name="passwordHint" id="passwordHintId" class="inputBox" value="$ >> {parameters.passwordHint?if_exists}" maxlength="16"></div> >> + </div> >> + </div> >> + </div> >> + >> + <div class="form-row"><hr class="sepbar"/></div> >> + <div class="bothclear"></div> + >> + <div class="left center"> >> + <div class="screenlet-header"><div class='boxhead'> $ >> {uiLabelMap.OrderShippingInformation}</div></div> >> + <div class="form-row"> >> + <div class="field-label"><label for="shipToAddress1">$ >> {uiLabelMap.PartyAddressLine1}*<span id="advice-required- >> shipToAddress1" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"><input type="text" >> name="shipToAddress1" id="shipToAddress1" class="inputBox required" >> value="${parameters.shipToAddress1?if_exists}"/></div> >> + </div> + <div class="form-row"> >> + <div class="field-label"><label for="shipToAddress2">$ >> {uiLabelMap.PartyAddressLine2}</label></div> >> + <div class="field-widget"><input type="text" >> name="shipToAddress2" id="shipToAddress2" class="inputBox" value="$ >> {parameters.shipToAddress2?if_exists}"/></div> >> + </div> + <div class="form-row"> >> + <div class="field-label"><label for="shipToCity">$ >> {uiLabelMap.CommonCity}*<span id="advice-required-shipToCity" >> style="display: none" class="errorMessage">(required)</span></ >> label></div> >> + <div class="field-widget"><input type="text" >> name="shipToCity" id="shipToCity" class="inputBox required" value="$ >> {parameters.shipToCity?if_exists}"/></div> >> + </div> + <div class="form-row"> >> + <div class="field-label"><label >> for="shipToStateProvinceGeoId">${uiLabelMap.CommonState}*<span >> id="advice-required-shipToStateProvinceGeoId" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"> >> + <select name="shipToStateProvinceGeoId" >> id="shipToStateProvinceGeoId" class='selectBox'> >> + <#if parameters.shipToStateProvinceGeoId? >> exists><option>${parameters.shipToStateProvinceGeoId?if_exists}</ >> option></#if> >> + ${screens.render("component://common/widget/ >> CommonScreens.xml#states")} >> + </select> >> + </div> >> + </div> + <div class="form-row"> >> + <div class="field-label"><label for="shipToPostalCode">$ >> {uiLabelMap.PartyZipCode}*<span id="advice-required- >> shipToPostalCode" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"><input type="text" >> name="shipToPostalCode" id="shipToPostalCode" class="inputBox >> required" value="${parameters.shipToPostalCode?if_exists}"/></div> >> + </div> + <div class="form-row"> >> + <div class="field-label"><label for="shipToCountryGeoId">$ >> {uiLabelMap.PartyCountry}*<span id="advice-required- >> shipToCountryGeoId" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"> >> + <select name="shipToCountryGeoId" >> id="shipToCountryGeoId" class='selectBox'> >> + <#if parameters.shipToCountryGeoId?exists><option>$ >> {parameters.shipToCountryGeoId?if_exists}</option></#if> >> + ${screens.render("component://common/widget/ >> CommonScreens.xml#countries")} >> + </select> >> + </div> >> + </div> + <div class="form-row"> >> + <div class="field-label"> >> + <label for="shipToCountryCode">$ >> {uiLabelMap.PartyCountry}<span>*</span><span id="advice-required- >> shipToCountryCode" style="display:none" >> class="errorMessage">(required)</span></label> >> + <label for="shipToAreaCode">$ >> {uiLabelMap.PartyAreaCode}<span>*</span><span id="advice-required- >> shipToAreaCode" style="display:none" >> class="errorMessage">(required)</span></label> >> + <label for="shipToContactNumber">$ >> {uiLabelMap.PartyContactNumber}<span>*</span><span id="advice- >> required-shipToContactNumber" style="display:none" >> class="errorMessage">(required)</span></label> >> + <label for="shipToExtension">$ >> {uiLabelMap.PartyExtension}</label> >> + </div> >> + <div class="field-widget"> >> + <input type="text" name="shipToCountryCode" >> id="shipToCountryCode" class="inputBox required" value="$ >> {parameters.countryCode?if_exists}" size="3" maxlength="3"/> >> + - <input type="text" name="shipToAreaCode" >> id="shipToAreaCode" class="inputBox required" value="$ >> {parameters.areaCode?if_exists}" size="3" maxlength="3"/> >> + - <input type="text" name="shipToContactNumber" >> id="shipToContactNumber" class="inputBox required" value="$ >> {contactNumber?default("${parameters.contactNumber?if_exists}")}" >> size="6" maxlength="7"/> >> + - <input type="text" name="shipToExtension" >> id="shipToExtension" class="inputBox" value="${extension?default("$ >> {parameters.extension?if_exists}")}" size="3" maxlength="3"/> >> + </div> >> + </div> >> + <div class="form-row"> >> + <div class="field-widget"><input type="checkbox" >> class="checkbox" name="useShippingAddressForBilling" >> id="useShippingAddressForBilling" value="Y" <#if >> parameters.useShippingAddressForBilling?has_content && >> parameters.useShippingAddressForBilling?default("")=="Y">checked</ >> #if>/> ${uiLabelMap.FacilityBillingAddressSameShipping}</ >> div> >> + </div> + </div> >> + >> + <div class="center right"> >> + <div class="screenlet-header"><div class='boxhead'> $ >> {uiLabelMap.PageTitleBillingInformation}</div></div> >> + <div id="billingAddress"> >> + <div class="form-row"> >> + <div class="field-label"><label for="billToAddress1">$ >> {uiLabelMap.PartyAddressLine1}*<span id="advice-required- >> billToAddress1" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"><input type="text" >> name="billToAddress1" id="billToAddress1" class="inputBox required" >> value="${parameters.billToAddress1?if_exists}"/></div> >> + </div> + <div class="form-row"> >> + <div class="field-label"><label for="billToAddress2">$ >> {uiLabelMap.PartyAddressLine2}</label></div> >> + <div class="field-widget"><input type="text" >> name="billToAddress2" id="billToAddress2" class="inputBox" value="$ >> {parameters.billToAddress2?if_exists}"/></div> >> + </div> + <div class="form-row"> >> + <div class="field-label"><label for="billToCity">$ >> {uiLabelMap.CommonCity}*<span id="advice-required-billToCity" >> style="display: none" class="errorMessage">(required)</span></ >> label></div> >> + <div class="field-widget"><input type="text" >> name="billToCity" id="billToCity" class="inputBox required" value="$ >> {parameters.billToCity?if_exists}"/></div> >> + </div> + <div class="form-row"> >> + <div class="field-label"><label >> for="billToStateProvinceGeoId">${uiLabelMap.CommonState}*<span >> id="advice-required-billToStateProvinceGeoId" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"> >> + <select name="billToStateProvinceGeoId" >> id="billToStateProvinceGeoId" class="selectBox required"> >> + <#if parameters.billToStateProvinceGeoId? >> exists><option>${parameters.billToStateProvinceGeoId?if_exists}</ >> option></#if> >> + ${screens.render("component://common/widget/ >> CommonScreens.xml#states")} >> + </select> >> + </div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"><label for="billToPostalCode">$ >> {uiLabelMap.PartyZipCode}*<span id="advice-required- >> billToPostalCode" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"><input type="text" >> name="billToPostalCode" id="billToPostalCode" class="inputBox >> required" value="${parameters.billToPostalCode?if_exists}"/></div> >> + </div> + <div class="form-row"> >> + <div class="field-label"><label for="billToCountryGeoId"> >> ${uiLabelMap.PartyCountry}*<span id="advice-required- >> billToCountryGeoId" style="display: none" >> class="errorMessage">(required)</span></label></div> >> + <div class="field-widget"> >> + <select name="billToCountryGeoId" >> id="billToCountryGeoId" class="selectBox required"> >> + <#if parameters.billToCountryGeoId?exists><option>$ >> {parameters.billToCountryGeoId?if_exists}</option></#if> >> + ${screens.render("component://common/widget/ >> CommonScreens.xml#countries")} >> + </select> >> + </div> >> + </div> >> + <div class="form-row"> >> + <div class="field-label"> >> + <label for="billToCountryCode">$ >> {uiLabelMap.PartyCountry}<span>*</span><span id="advice-required- >> billToCountryCode" style="display:none" >> class="errorMessage">(required)</span></label> >> + <label for="billToAreaCode">$ >> {uiLabelMap.PartyAreaCode}<span>*</span><span id="advice-required- >> billToAreaCode" style="display:none" >> class="errorMessage">(required)</span></label> >> + <label for="billToContactNumber">$ >> {uiLabelMap.PartyContactNumber}<span>*</span><span id="advice- >> required-billToContactNumber" style="display:none" >> class="errorMessage">(required)</span></label> >> + <label for="billToExtension">$ >> {uiLabelMap.PartyExtension}</label> >> + </div> >> + <div class="field-widget"> >> + <input type="text" name="billToCountryCode" >> id="billToCountryCode" class="inputBox required" value="$ >> {parameters.countryCode?if_exists}" size="3" maxlength="3"/> >> + - <input type="text" name="billToAreaCode" >> id="billToAreaCode" class="inputBox required" value="$ >> {parameters.areaCode?if_exists}" size="3" maxlength="3"/> >> + - <input type="text" name="billToContactNumber" >> id="billToContactNumber" class="inputBox required" value="$ >> {contactNumber?default("${parameters.contactNumber?if_exists}")}" >> size="6" maxlength="7"/> >> + - <input type="text" name="billToExtension" >> id="billToExtension" class="inputBox" value="${extension?default("$ >> {parameters.extension?if_exists}")}" size="3" maxlength="3"/> >> + </div> >> + </div> >> + </div> + </div> >> + >> + <div class="bothclear"></div> >> + <div class="form-row"> <a id="submitNewUserForm" >> href="javascript:void(0);" class="buttontext">$ >> {uiLabelMap.CommonSave}</a></div> >> + </form> >> +</div> >> \ No newline at end of file >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/NewCustomer.ftl >> ------------------------------------------------------------------------------ >> svn:eol-style = native >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/NewCustomer.ftl >> ------------------------------------------------------------------------------ >> svn:keywords = "Date Rev Author URL Id" >> Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/ >> customer/profile/NewCustomer.ftl >> ------------------------------------------------------------------------------ >> svn:mime-type = text/plain >> Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/ViewProfile.ftl >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl?rev=688081&view=auto >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/ViewProfile.ftl (added) >> +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/ >> profile/ViewProfile.ftl Fri Aug 22 06:40:31 2008 >> @@ -0,0 +1,108 @@ >> +<#-- >> +Licensed to the Apache Software Foundation (ASF) under one >> +or more contributor license agreements. See the NOTICE file >> +distributed with this work for additional information >> +regarding copyright ownership. The ASF licenses this file >> +to you under the Apache License, Version 2.0 (the >> +"License"); you may not use this file except in compliance >> +with the License. You may obtain a copy of the License at >> + >> +http://www.apache.org/licenses/LICENSE-2.0 >> + >> +Unless required by applicable law or agreed to in writing, >> +software distributed under the License is distributed on an >> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY >> +KIND, either express or implied. See the License for the >> +specific language governing permissions and limitations >> +under the License. >> +--> >> + >> +<div class="screenlet"> >> + <div class="screenlet-header"> >> + <div class="boxhead"> ${uiLabelMap.EcommerceMyAccount}</ >> div> >> + </div> >> + <div class="screenlet-body"> >> + <div align="right"><a class="buttontext" >> href="<@ofbizUrl>editProfile</@ofbizUrl>">${uiLabelMap.CommonEdit} $ >> {uiLabelMap.CommonProfile}</a> </div><br/> >> + <div class="screenlet-header"><div class="boxhead"> $ >> {uiLabelMap.PartyContactInformation}</div></div> >> + <div class="screenlet-body"> >> + <div class="tabletext"><h3>${uiLabelMap.PartyName}</h3></div> >> + <div class="form-row">${parameters.firstName?if_exists} $ >> {parameters.lastName?if_exists}</div> >> + >> + <#assign emailContactMech = delegator.findOne("ContactMech", >> Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", >> parameters.emailContactMechId), true)> >> + <#assign emailContactMechType = >> emailContactMech.getRelatedOneCache("ContactMechType")> >> + >> + <div class="tabletext"><h3>$ >> {emailContactMechType.description?if_exists}</h3></div> + <div >> class="form-row"> >> + <input type="hidden" id="updatedEmailContactMechId" >> name="emailContactMechId" value="${parameters.emailContactMechId}"> >> + <input type="hidden" id="updatedEmailAddress" >> name="updatedEmailAddress" value="${parameters.emailAddress}"> >> + <div class="form-field" id="emailAddress">$ >> {parameters.emailAddress}</div> >> + <a href="mailto:${parameters.emailAddress}" >> class="linktext">(${uiLabelMap.PartySendEmail})</a> >> + </div> >> + <div class="form-row"><div id="serverError_$ >> {parameters.emailContactMechId}" class="errorMessage"></div></div> >> + </div> >> + >> + <#-- Manage Addresses --> >> + <div class="screenlet-header"><div class='boxhead'> $ >> {uiLabelMap.EcommerceAddressBook}</div></div> >> + <div class="screenlet-body"> >> + <div align="right"><a class="buttontext" >> href="<@ofbizUrl>manageAddress</@ofbizUrl>">$ >> {uiLabelMap.EcommerceManage} ${uiLabelMap.CommonAddresses}</ >> a> </div> >> + <div class="left center"> >> + <div class="screenlet-body"> >> + <h3>${uiLabelMap.OrderShippingAddress}</h3> >> + <#if parameters.shipToContactMechId?exists> >> + ${parameters.shipToAddress1?if_exists}<br/> >> + ${parameters.shipToAddress2?if_exists}<br/> >> + ${parameters.shipToCity?if_exists}, >> + ${parameters.shipToStateProvinceGeoId?if_exists} >> + ${parameters.shipToPostalCode?if_exists}<br/> >> + ${parameters.shipToCountryGeoId?if_exists}<br/> >> + <#assign pcmps = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", >> Static >> ["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", >> "PHONE_SHIPPING")))> >> + <#if pcmps?has_content> >> + <#assign pcmp = >> Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> >> + <#assign telecomNumber = >> pcmp.getRelatedOne("TelecomNumber")/> >> + </#if> >> + <#if telecomNumber?has_content> >> + <#assign pcm = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].getFirst(telecomNumber.getRelated("PartyContactMech"))/> >> + <h3>${uiLabelMap.PartyPhoneNumber}</h3> >> + ${telecomNumber.countryCode?if_exists}- >> + ${telecomNumber.areaCode?if_exists}- >> + ${telecomNumber.contactNumber?if_exists}- >> + ${pcm.extension?if_exists} >> + </#if> >> + <#else> >> + ${uiLabelMap.OrderShippingAddress} $ >> {uiLabelMap.EcommerceNotExists} >> + </#if> >> + </div> >> + </div> >> + >> + <div class="center right"> >> + <div class="screenlet-body"> >> + <h3>${uiLabelMap.PartyBillingAddress}</h3> >> + <#if parameters.billToContactMechId?exists> >> + ${parameters.billToAddress1?if_exists}<br/> >> + ${parameters.billToAddress2?if_exists}<br/> >> + ${parameters.billToCity?if_exists}, >> + ${parameters.billToStateProvinceGeoId?if_exists} >> + ${parameters.billToPostalCode?if_exists}<br/> >> + ${parameters.billToCountryGeoId?if_exists}<br/> >> + <#assign pcmps = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].filterByDate(party.getRelatedByAnd("PartyContactMechPurpose", >> Static >> ["org.ofbiz.base.util.UtilMisc"].toMap("contactMechPurposeTypeId", >> "PHONE_BILLING")))> >> + <#if pcmps?has_content> >> + <#assign pcmp = >> Static["org.ofbiz.entity.util.EntityUtil"].getFirst(pcmps)/> >> + <#assign telecomNumber = >> pcmp.getRelatedOne("TelecomNumber")/> >> + </#if> >> + <#if telecomNumber?has_content> >> + <#assign pcm = >> Static >> ["org >> .ofbiz >> .entity >> .util >> .EntityUtil >> "].getFirst(telecomNumber.getRelated("PartyContactMech"))/> >> + <h3>${uiLabelMap.PartyPhoneNumber}</h3> >> + ${telecomNumber.countryCode?if_exists}- >> + ${telecomNumber.areaCode?if_exists}- >> + ${telecomNumber.contactNumber?if_exists}- >> + ${pcm.extension?if_exists} >> + </#if> >> + <#else> >> + ${uiLabelMap.PartyBillingAddress} $ >> {uiLabelMap.EcommerceNotExists} >> + </#if> >> + </div> >> + </div> >> + </div> >> + <div class="form-row"></div> >> + </div> >> +</div> >> \ No newline at end of file |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |