svn commit: r693775 - in /ofbiz/trunk/applications/ecom
Locked
svn commit: r693775 - in /ofbiz/trunk/applications/ecom
 
|
Author: mor
Date: Wed Sep 10 03:25:11 2008 New Revision: 693775 URL: http://svn.apache.org/viewvc?rev=693775&view=rev Log: Added new labels and misc cleanup. Contribution from Rishi Solanki. Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=693775&r1=693774&r2=693775&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original) +++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Wed Sep 10 03:25:11 2008 @@ -1091,6 +1091,9 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸£à¸²à¸¢à¸à¸²à¸£à¸¥à¸à¸à¸£à¸°à¸à¸£à¹à¸²</value> <value xml:lang="zh">æå表æ¾å ¥è´ç©è½¦</value> </property> + <property key="EcommerceAddNewAddress"> + <value xml:lang="en">Add New Address</value> + </property> <property key="EcommerceAddNewDigitalProduct"> <value xml:lang="en">Add New Digital Product</value> <value xml:lang="fr">Ajouter le nouveau produit numérique</value> @@ -1129,8 +1132,8 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸µà¹à¹à¸¥à¸·à¸à¸à¸¥à¸à¸ªà¸¹à¹à¸£à¸²à¸¢à¸à¸²à¸£</value> <value xml:lang="zh">æéä¸çæ·»å å°å表ä¸</value> </property> - <property key="EcommerceAdditional"> - <value xml:lang="en">Additional</value> + <property key="EcommerceAdditionalAddresses"> + <value xml:lang="en">Additional Addresses</value> </property> <property key="EcommerceAddressBook"> <value xml:lang="en">Address Book</value> @@ -1370,8 +1373,8 @@ <value xml:lang="th">หมายà¹à¸¥à¸à¹à¸«à¸¥à¹à¸à¸à¸µà¹à¸¡à¸²</value> <value xml:lang="zh">æ°æ®èµæºæ è¯</value> </property> - <property key="EcommerceDefault"> - <value xml:lang="en">Default</value> + <property key="EcommerceDefaultAddresses"> + <value xml:lang="en">Default Addresses</value> </property> <property key="EcommerceDigitalAddFromMyFiles"> <value xml:lang="en">Digital Add From My Files</value> @@ -2567,8 +2570,11 @@ <value xml:lang="th">ราà¸à¸²</value> <value xml:lang="zh">ä»·æ ¼</value> </property> - <property key="EcommercePrimary"> - <value xml:lang="en">Primary</value> + <property key="EcommercePrimaryBillingAddress"> + <value xml:lang="en">Primary Billing Address</value> + </property> + <property key="EcommercePrimaryShippingAddress"> + <value xml:lang="en">Primary Shipping Address</value> </property> <property key="EcommerceProductNumber"> <value xml:lang="en">Product Number</value> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=693775&r1=693774&r2=693775&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Wed Sep 10 03:25:11 2008 @@ -26,7 +26,7 @@ <div class="screenlet-body"> <#-- Add address --> <div class="form-row" align="right"> - <a class="buttontext" id="addAddress" href="javascript:void(0)">${uiLabelMap.CommonAdd} ${uiLabelMap.CommonNew} ${uiLabelMap.OrderAddress}</a> + <a class="buttontext" id="addAddress" href="javascript:void(0)">${uiLabelMap.EcommerceAddNewAddress}</a> </div> <div id="displayCreateAddressForm" class="popup" style="display: none;"> <div id="serverError" class="errorMessage"></div> @@ -99,10 +99,10 @@ <#-- Default Addresses --> <div class="left center"> - <div class="screenlet-header"><div class="boxhead"> ${uiLabelMap.EcommerceDefault} ${uiLabelMap.CommonAddresses}</div></div> + <div class="screenlet-header"><div class="boxhead"> ${uiLabelMap.EcommerceDefaultAddresses}</div></div> <div class="screenlet-body"> <#--===================================== Billing Address and Telecom number ===========================================--> - <h3>${uiLabelMap.EcommercePrimary} ${uiLabelMap.PartyBillingAddress}</h3> + <h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3> <#if billToContactMechId?exists> ${billToAddress1?if_exists}<br/> <#if billToAddress2?has_content>${billToAddress2?if_exists}<br/></#if> @@ -116,9 +116,9 @@ ${billToTelecomNumber.contactNumber?if_exists} <#if billToExtension?exists>-${billToExtension?if_exists}</#if><br/> </#if> - <a id="updateBillToPostalAddress" href="javascript:void(0)" class="buttontext popup_link">${uiLabelMap.CommonEdit} ${uiLabelMap.PartyBillingAddress}</a> + <a id="updateBillToPostalAddress" href="javascript:void(0)" class="buttontext popup_link">${uiLabelMap.CommonEdit}</a> <#else> - ${uiLabelMap.PartyBillingAddress} ${uiLabelMap.EcommerceNotExists} + ${uiLabelMap.PartyPostalInformationNotFound} </#if> <div id="displayEditBillToPostalAddress" class="popup" style="display: none;"> <#include "EditBillToAddress.ftl"/> @@ -129,7 +129,7 @@ </script> <#--===================================== Shipping Address and Telecom number ===========================================--> - <h3>${uiLabelMap.EcommercePrimary} ${uiLabelMap.OrderShippingAddress}</h3> + <h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3> <#if shipToContactMechId?exists> ${shipToAddress1?if_exists}<br/> <#if shipToAddress2?has_content>${shipToAddress2?if_exists}<br/></#if> @@ -143,9 +143,9 @@ ${shipToTelecomNumber.contactNumber?if_exists} <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if><br/> </#if> - <a id="updateShipToPostalAddress" href="javascript:void(0)" class="buttontext popup_link">${uiLabelMap.CommonEdit} ${uiLabelMap.OrderShippingAddress}</a> + <a id="updateShipToPostalAddress" href="javascript:void(0)" class="buttontext popup_link">${uiLabelMap.CommonEdit}</a> <#else> - ${uiLabelMap.OrderShippingAddress} ${uiLabelMap.EcommerceNotExists} + ${uiLabelMap.PartyPostalInformationNotFound} </#if> <div id="displayEditShipToPostalAddress" class="popup" style="display: none;"> <#include "EditShipToAddress.ftl"/> @@ -160,7 +160,7 @@ <#-- Additional Addresses --> <div class="center right"> <div class="screenlet-header"> - <div class="boxhead"> ${uiLabelMap.EcommerceAdditional} ${uiLabelMap.CommonAddresses}</div> + <div class="boxhead"> ${uiLabelMap.EcommerceAdditionalAddresses}</div> </div> <div class="screenlet-body"> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl?rev=693775&r1=693774&r2=693775&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl Wed Sep 10 03:25:11 2008 @@ -31,11 +31,11 @@ <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-label"><label for="firstName">${uiLabelMap.PartyFirstName}* <span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="text" name="firstName" id="firstName" class="required" value="${parameters.firstName?if_exists}" size="30" maxlength="30"></div> </div> <div class="form-row"> - <div class="field-label"><label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label></div> + <div class="field-label"><label for="lastName">${uiLabelMap.PartyLastName}* <span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="text" name="lastName" id="lastName" class="required" value="${parameters.lastName?if_exists}" size="30" maxlength="30"></div> </div> <div class="form-row"> @@ -51,15 +51,15 @@ <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-label"><label for="userName">${uiLabelMap.CommonUsername}* <span id="advice-required-username" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="text" name="username" id="username" class="required" value="${parameters.username?if_exists}" size="30" maxlength="255"></div> </div> <div class="form-row"> - <div class="field-label"><label for="password">${uiLabelMap.CommonPassword}*<span id="advice-required-password" style="display: none" class="errorMessage">(required)</span></label></div> + <div class="field-label"><label for="password">${uiLabelMap.CommonPassword}* <span id="advice-required-password" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="password" name="password" id="password" class="required" value="${parameters.password?if_exists}" maxlength="16"></div> </div> <div class="form-row"> - <div class="field-label"><label for="passwordVerify">${uiLabelMap.CommonConfirm} ${uiLabelMap.CommonPassword}*<span id="advice-required-passwordVerify" style="display: none" class="errorMessage">(required)</span></label></div> + <div class="field-label"><label for="passwordVerify">${uiLabelMap.PartyRepeatPassword}* <span id="advice-required-passwordVerify" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="password" name="passwordVerify" id="passwordVerify" class="required" value="${parameters.passwordVerify?if_exists}" maxlength="16"></div> </div> </div> @@ -72,7 +72,7 @@ <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-label"><label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="text" name="shipToAddress1" id="shipToAddress1" class="required" value="${parameters.shipToAddress1?if_exists}"/></div> </div> <div class="form-row"> @@ -80,15 +80,15 @@ <div><input type="text" name="shipToAddress2" id="shipToAddress2" value="${parameters.shipToAddress2?if_exists}"/></div> </div> <div class="form-row"> - <div class="field-label"><label for="shipToCity">${uiLabelMap.CommonCity}*<span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span></label></div> + <div class="field-label"><label for="shipToCity">${uiLabelMap.CommonCity}* <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="text" name="shipToCity" id="shipToCity" class="required" value="${parameters.shipToCity?if_exists}"/></div> </div> <div class="form-row"> - <div class="field-label"><label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*<span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span></label></div> + <div class="field-label"><label for="shipToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="text" name="shipToPostalCode" id="shipToPostalCode" class="required" value="${parameters.shipToPostalCode?if_exists}" maxlength="10"/></div> </div> <div class="form-row"> - <div class="field-label"><label for="shipToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label></div> + <div class="field-label"><label for="shipToStateProvinceGeoId">${uiLabelMap.CommonState}* <span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label></div> <div> <select name="shipToStateProvinceGeoId" id="shipToStateProvinceGeoId" class='selectBox'> <#if parameters.shipToStateProvinceGeoId?exists> @@ -100,7 +100,7 @@ </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-label"><label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label></div> <div> <select name="shipToCountryGeoId" id="shipToCountryGeoId" class='selectBox'> <#if parameters.shipToCountryGeoId?exists> @@ -135,7 +135,7 @@ <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-label"><label for="billToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="text" name="billToAddress1" id="billToAddress1" class="required" value="${parameters.billToAddress1?if_exists}"/></div> </div> <div class="form-row"> @@ -143,15 +143,15 @@ <div><input type="text" name="billToAddress2" id="billToAddress2" value="${parameters.billToAddress2?if_exists}"/></div> </div> <div class="form-row"> - <div class="field-label"><label for="billToCity">${uiLabelMap.CommonCity}*<span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span></label></div> + <div class="field-label"><label for="billToCity">${uiLabelMap.CommonCity}* <span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="text" name="billToCity" id="billToCity" class="required" value="${parameters.billToCity?if_exists}"/></div> </div> <div class="form-row"> - <div class="field-label"><label for="billToPostalCode">${uiLabelMap.PartyZipCode}*<span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span></label></div> + <div class="field-label"><label for="billToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span></label></div> <div><input type="text" name="billToPostalCode" id="billToPostalCode" class="required" value="${parameters.billToPostalCode?if_exists}" maxlength="10"/></div> </div> <div class="form-row"> - <div class="field-label"><label for="billToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label></div> + <div class="field-label"><label for="billToStateProvinceGeoId">${uiLabelMap.CommonState}* <span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label></div> <div> <select name="billToStateProvinceGeoId" id="billToStateProvinceGeoId" class="selectBox required"> <#if parameters.billToStateProvinceGeoId?exists> @@ -163,7 +163,7 @@ </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-label"><label for="billToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label></div> <div> <select name="billToCountryGeoId" id="billToCountryGeoId" class="selectBox required"> <#if parameters.billToCountryGeoId?exists> Modified: 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=693775&r1=693774&r2=693775&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Wed Sep 10 03:25:11 2008 @@ -43,7 +43,7 @@ <div class="screenlet-body"> <div align="right"><a class="buttontext" href="<@ofbizUrl>manageAddress</@ofbizUrl>">${uiLabelMap.EcommerceManageAddresses}</a> </div> <div class="left center"> - <div class="screenlet-header"><div class='boxhead'>${uiLabelMap.EcommercePrimary} ${uiLabelMap.OrderShippingAddress}</div></div> + <div class="screenlet-header"><div class='boxhead'>${uiLabelMap.EcommercePrimaryShippingAddress}</div></div> <div class="screenlet-body"> <#if shipToContactMechId?exists> ${shipToAddress1?if_exists}<br/> @@ -59,13 +59,13 @@ <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if><br/> </#if> <#else> - ${uiLabelMap.OrderShippingAddress} ${uiLabelMap.EcommerceNotExists} + ${uiLabelMap.PartyPostalInformationNotFound} </#if> </div> </div> <div class="center right"> - <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.EcommercePrimary} ${uiLabelMap.PartyBillingAddress}</div></div> + <div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.EcommercePrimaryBillingAddress}</div></div> <div class="screenlet-body"> <#if billToContactMechId?exists> ${billToAddress1?if_exists}<br/> @@ -81,7 +81,7 @@ <#if billToExtension?exists>-${billToExtension?if_exists}</#if><br/> </#if> <#else> - ${uiLabelMap.PartyBillingAddress} ${uiLabelMap.EcommerceNotExists} + ${uiLabelMap.PartyPostalInformationNotFound} </#if> </div> </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |