svn commit: r937278 - in /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce: cart/ customer/profile/ order/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r937278 - in /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce: cart/ customer/profile/ order/

bibryam
Author: bibryam
Date: Fri Apr 23 13:06:54 2010
New Revision: 937278

URL: http://svn.apache.org/viewvc?rev=937278&view=rev
Log:
Applied patch from jira issue OFBIZ-3515 - Use UiLabel for "required"

Thanks Deepak Dixit for the contribution.

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl Fri Apr 23 13:06:54 2010
@@ -151,7 +151,7 @@ under the License.
                   <#else>
                     <input type="hidden" name="cartLineProductId" id="cartLineProductId_${cartLine_index}" value="${cartLine.getProductId()}" />
                     <input type="text" name="update${cartLine_index}" id="qty_${cartLine_index}" value="${cartLine.getQuantity()?string.number}" class="required validate-number" />
-                    <span id="advice-required-qty_${cartLine_index}" style="display:none;" class="errorMessage"> (required)</span>
+                    <span id="advice-required-qty_${cartLine_index}" style="display:none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                     <span id="advice-validate-number-qty_${cartLine_index}" style="display:none;" class="errorMessage"> (${uiLabelMap.CommonPleaseEnterValidNumberInThisField}) </span>
                   </#if>
                 </td>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl Fri Apr 23 13:06:54 2010
@@ -27,7 +27,7 @@ under the License.
     <div>
       <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}*</label>
       <input type="text" class="required" name="address1" id="billToAddress1" value="${billToAddress1?if_exists}" maxlength="30" />
-      <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(required)</span>
+      <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div>
       <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label>
@@ -36,12 +36,12 @@ under the License.
     <div>
       <label for="billToCity">${uiLabelMap.PartyCity}*</label>
       <input type="text" class="required" name="city" id="billToCity" value="${billToCity?if_exists}" maxlength="30" />
-      <span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span>
+      <span id="advice-required-billToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div>
       <label for="billToPostalCode">${uiLabelMap.PartyZipCode}*</label>
       <input type="text" class="required" name="postalCode" id="billToPostalCode" value="${billToPostalCode?if_exists}" maxlength="10" />
-      <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span>
+      <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div>
       <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}*</label>
@@ -51,10 +51,10 @@ under the License.
         </#if>
         ${screens.render("component://common/widget/CommonScreens.xml#countries")}
       </select>
-      <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(required)</span>
+      <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div id="billToStates">
-      <label for="billToStateProvinceGeoId">${uiLabelMap.PartyState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
+      <label for="billToStateProvinceGeoId">${uiLabelMap.PartyState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
       <select name="stateProvinceGeoId" id="billToStateProvinceGeoId">
         <#if billToStateProvinceGeoId?has_content>
           <option value='${billToStateProvinceGeoId!}'>${billToStateProvinceGeo!(billToStateProvinceGeoId!)}</option>
@@ -69,7 +69,7 @@ under the License.
         <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"></span>
         <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"></span>
         <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"></span>
-        <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
+        <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
         <input type="hidden" name="phoneContactMechId" value="${billToTelecomNumber.contactMechId?if_exists}" />
         <input type="text" name="countryCode" id="billToCountryCode" class="required" value="${billToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3" />
         - <input type="text" name="areaCode" id="billToAreaCode" class="required" value="${billToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3" />

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl Fri Apr 23 13:06:54 2010
@@ -28,7 +28,7 @@ under the License.
       <div>
         <label for="address1_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine1}*</label>
         <input type="text" class="required" name="address1" id="address1_${contactMech.contactMechId}" value="${postalAddress.address1?if_exists}" maxlength="30" />
-        <span id="advice-required-address1_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span>
+        <span id="advice-required-address1_${contactMech.contactMechId}" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
       </div>
       <div>
         <label for="additionalAddress2_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine2}</label>
@@ -37,12 +37,12 @@ under the License.
       <div>
         <label for="city_${contactMech.contactMechId}">${uiLabelMap.PartyCity}*</label>
         <input type="text" class="required" name="city" id="city_${contactMech.contactMechId}" value="${postalAddress.city?if_exists}" maxlength="30" />
-        <span id="advice-required-city_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span>
+        <span id="advice-required-city_${contactMech.contactMechId}" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
       </div>
       <div>
         <label for="postalCode_${contactMech.contactMechId}">${uiLabelMap.PartyZipCode}*</label>
         <input type="text" class="required" name="postalCode" id="postalCode_${contactMech.contactMechId}" value="${postalAddress.postalCode?if_exists}" maxlength="10" />
-        <span id="advice-required-postalCode_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span>
+        <span id="advice-required-postalCode_${contactMech.contactMechId}" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
       </div>
       <div>
         <label for="countryGeoId_${contactMech.contactMechId}">${uiLabelMap.PartyCountry}*</label>
@@ -53,7 +53,7 @@ under the License.
           </#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 id="advice-required-countryGeoId_${contactMech.contactMechId}" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
       </div>
       <div id="states_${contactMech.contactMechId}">
         <label for="stateProvinceGeoId_${contactMech.contactMechId}">${uiLabelMap.PartyState}*</label>
@@ -65,7 +65,7 @@ under the License.
             <option value="_NA_">${uiLabelMap.PartyNoState}</option>
           </#if>
         </select>
-        <span id="advice-required-stateProvinceGeoId_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span>
+        <span id="advice-required-stateProvinceGeoId_${contactMech.contactMechId}" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
       </div>
       <div class="inline">
         <label for="setBillingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl Fri Apr 23 13:06:54 2010
@@ -25,16 +25,16 @@ under the License.
       <input type="hidden" name="emailContactMechId" value="${emailContactMechId?if_exists}" />
         <h3>${uiLabelMap.PartyContactInformation}</h3>
         <div>
-          <label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label>
+          <label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
           <input type="text" name="firstName" id="firstName" class="required" value="${firstName?if_exists}" maxlength="30" />
         </div>
         <div>
-          <label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label>
+          <label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
           <input type="text" name="lastName" id="lastName" class="required" value="${lastName?if_exists}" maxlength="30" />
         </div>
         <div>
           <label for="emailAddress">${uiLabelMap.CommonEmail}*
-            <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span>
+            <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
             <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span>
           </label>
           <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${emailAddress?if_exists}" maxlength="255" />

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl Fri Apr 23 13:06:54 2010
@@ -27,7 +27,7 @@ under the License.
     <div>
       <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*</label>
       <input type="text" class="required" name="address1" id="shipToAddress1" value="${shipToAddress1?if_exists}" maxlength="30" />
-      <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(required)</span>
+      <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div>
       <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label>
@@ -36,12 +36,12 @@ under the License.
     <div>
       <label for="shipToCity">${uiLabelMap.PartyCity}*</label>
       <input type="text" class="required" name="city" id="shipToCity" value="${shipToCity?if_exists}" maxlength="30" />
-      <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span>
+      <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div>
       <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*</label>
       <input type="text" class="required" name="postalCode" id="shipToPostalCode" value="${shipToPostalCode?if_exists}" maxlength="10" />
-      <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span>
+      <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div>
       <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}*</label>
@@ -51,10 +51,10 @@ under the License.
         </#if>
         ${screens.render("component://common/widget/CommonScreens.xml#countries")}
       </select>
-      <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(required)</span>
+      <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div id="shipToStates">
-      <label for="shipToStateProvinceGeoId">${uiLabelMap.PartyState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
+      <label for="shipToStateProvinceGeoId">${uiLabelMap.PartyState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
       <select name="stateProvinceGeoId" id="shipToStateProvinceGeoId">
         <#if shipToStateProvinceGeoId?has_content>
           <option value='${shipToStateProvinceGeoId!}'>${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}</option>
@@ -69,7 +69,7 @@ under the License.
         <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"></span>
         <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"></span>
         <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"></span>
-        <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
+        <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
         <input type="hidden" name="phoneContactMechId" value="${shipToTelecomNumber.contactMechId?if_exists}" />
         <input type="text" name="countryCode" id="shipToCountryCode" class="required" value="${shipToTelecomNumber.countryCode?if_exists}" size="3" maxlength="3" />
         - <input type="text" name="areaCode" id="shipToAreaCode" class="required" value="${shipToTelecomNumber.areaCode?if_exists}" size="3" maxlength="3" />

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Fri Apr 23 13:06:54 2010
@@ -34,7 +34,7 @@ under the License.
           <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
           <div>
             <label for="address1">${uiLabelMap.PartyAddressLine1}*
-               <span id="advice-required-address1" style="display: none" class="errorMessage">(required)</span>
+               <span id="advice-required-address1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
             </label>
             <input type="text" class="required" name="address1" id="address1" value="" maxlength="30" />
           </div>
@@ -44,19 +44,19 @@ under the License.
           </div>
           <div>
             <label for="city">${uiLabelMap.PartyCity}*
-              <span id="advice-required-city" style="display: none" class="errorMessage">(required)</span>
+              <span id="advice-required-city" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
             </label>
             <input type="text" class="required" name="city" id="city" value="" maxlength="30" />
           </div>
           <div>
             <label for="postalCode">${uiLabelMap.PartyZipCode}*
-              <span id="advice-required-postalCode" style="display: none" class="errorMessage">(required)</span>
+              <span id="advice-required-postalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
             </label>
             <input type="text" class="required" name="postalCode" id="postalCode" value="" maxlength="10" />
           </div>
           <div>
             <label for="countryGeoId">${uiLabelMap.PartyCountry}*
-              <span id="advice-required-countryGeoId" style="display: none" class="errorMessage">(required)</span>
+              <span id="advice-required-countryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
             </label>
              <select name="countryGeoId" id="countryGeoId" class="required" style="width: 70%">
                <#if countryGeoId??>
@@ -67,7 +67,7 @@ under the License.
           </div>
           <div id="states">
             <label for="stateProvinceGeoId">${uiLabelMap.PartyState}*
-              <span id="advice-required-stateProvinceGeoId" style="display: none" class="errorMessage">(required)</span>
+              <span id="advice-required-stateProvinceGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
             </label>  
               <select name="stateProvinceGeoId" id="stateProvinceGeoId" style="width: 70%">
               <#if stateProvinceGeoId?has_content>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl Fri Apr 23 13:06:54 2010
@@ -28,16 +28,16 @@ under the License.
         <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
         <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
           <div>
-            <label for="firstName">${uiLabelMap.PartyFirstName}* <span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label>
+            <label for="firstName">${uiLabelMap.PartyFirstName}* <span id="advice-required-firstName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
             <input type="text" name="firstName" id="firstName" class="required" value="${parameters.firstName?if_exists}" maxlength="30" />
           </div>
           <div>
-            <label for="lastName">${uiLabelMap.PartyLastName}* <span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label>
+            <label for="lastName">${uiLabelMap.PartyLastName}* <span id="advice-required-lastName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
             <input type="text" name="lastName" id="lastName" class="required" value="${parameters.lastName?if_exists}" maxlength="30" />
           </div>
           <div>
             <label for="emailAddress">${uiLabelMap.CommonEmail}*
-              <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span>
+              <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
             </label>
             <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${parameters.emailAddress?if_exists}" maxlength="255" />
           </div>
@@ -46,16 +46,16 @@ under the License.
       <fieldset class="center right" id="userNameAndPasswordPanel">
           <legend>${uiLabelMap.EcommerceAccountInformation}</legend>
             <div>
-              <label for="username">${uiLabelMap.CommonUsername}* <span id="advice-required-username" style="display: none" class="errorMessage">(required)</span></label>
+              <label for="username">${uiLabelMap.CommonUsername}* <span id="advice-required-username" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
               <input type="text" name="username" id="username" class="required" value="${parameters.username?if_exists}" maxlength="255" />
             </div>
             <div>
-              <label for="password">${uiLabelMap.CommonPassword}* <span id="advice-required-password" style="display: none" class="errorMessage">(required)</span></label>
+              <label for="password">${uiLabelMap.CommonPassword}* <span id="advice-required-password" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
               <input type="password" name="password" id="password" class="required validate-password" value="${parameters.password?if_exists}" maxlength="16" />
               <span id="advice-validate-password-password" class="errorMessage" style="display:none">${uiLabelMap["loginservices.password_may_not_equal_username"]}</span>
             </div>
             <div>
-              <label for="passwordVerify">${uiLabelMap.PartyRepeatPassword}* <span id="advice-required-passwordVerify" style="display: none" class="errorMessage">(required)</span></label>
+              <label for="passwordVerify">${uiLabelMap.PartyRepeatPassword}* <span id="advice-required-passwordVerify" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
               <input type="password" name="passwordVerify" id="passwordVerify" class="required validate-passwordVerify" value="${parameters.passwordVerify?if_exists}" maxlength="16" />
               <span id="advice-validate-passwordVerify-passwordVerify" class="errorMessage" style="display:none">${uiLabelMap["loginservices.password_did_not_match_verify_password"]}</span>
             </div>
@@ -63,7 +63,7 @@ under the License.
       <fieldset class="left center">
           <legend>${uiLabelMap.OrderShippingInformation}</legend>
           <div>
-            <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(required)</span></label>
+            <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
             <input type="text" name="shipToAddress1" id="shipToAddress1" class="required" value="${parameters.shipToAddress1?if_exists}" />
           </div>
           <div>
@@ -71,15 +71,15 @@ under the License.
             <input type="text" name="shipToAddress2" id="shipToAddress2" value="${parameters.shipToAddress2?if_exists}" />
           </div>
           <div>
-            <label for="shipToCity">${uiLabelMap.CommonCity}* <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span></label>
+            <label for="shipToCity">${uiLabelMap.CommonCity}* <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
             <input type="text" name="shipToCity" id="shipToCity" class="required" value="${parameters.shipToCity?if_exists}" />
           </div>
           <div>
-            <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span></label>
+            <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
             <input type="text" name="shipToPostalCode" id="shipToPostalCode" class="required" value="${parameters.shipToPostalCode?if_exists}" maxlength="10" />
           </div>
           <div>
-            <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label>
+            <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
             <div>
               <select name="shipToCountryGeoId" id="shipToCountryGeoId">
                 <#if shipToCountryGeoId??>
@@ -90,7 +90,7 @@ under the License.
             </div>
           </div>
           <div id='shipToStates'>
-            <label for="shipToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
+            <label for="shipToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-shipToStateProvinceGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
             <div>
               <select id="shipToStateProvinceGeoId" name="shipToStateProvinceGeoId">
                 <#if shipToStateProvinceGeoId?has_content>
@@ -106,7 +106,7 @@ under the License.
             <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"></span>
             <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"></span>
             <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"></span>
-            <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
+            <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
             <input type="text" name="shipToCountryCode" id="shipToCountryCode" class="required" value="${parameters.shipToCountryCode?if_exists}" size="3" maxlength="3" />
             - <input type="text" name="shipToAreaCode" id="shipToAreaCode" class="required" value="${parameters.shipToAreaCode?if_exists}" size="3" maxlength="3" />
             - <input type="text" name="shipToContactNumber" id="shipToContactNumber" class="required" value="${contactNumber?default("${parameters.shipToContactNumber?if_exists}")}" size="6" maxlength="7" />
@@ -120,7 +120,7 @@ under the License.
       <fieldset class="center right" id="billingAddress">
           <legend>${uiLabelMap.PageTitleBillingInformation}</legend>
             <div>
-              <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(required)</span></label>
+              <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
               <input type="text" name="billToAddress1" id="billToAddress1" class="required" value="${parameters.billToAddress1?if_exists}" />
             </div>
             <div>
@@ -128,15 +128,15 @@ under the License.
               <input type="text" name="billToAddress2" id="billToAddress2" value="${parameters.billToAddress2?if_exists}" />
             </div>
             <div>
-              <label for="billToCity">${uiLabelMap.CommonCity}*<span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span></label>
+              <label for="billToCity">${uiLabelMap.CommonCity}*<span id="advice-required-billToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
               <input type="text" name="billToCity" id="billToCity" class="required" value="${parameters.billToCity?if_exists}" />
             </div>
             <div>
-              <label for="billToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span></label>
+              <label for="billToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
               <input type="text" name="billToPostalCode" id="billToPostalCode" class="required" value="${parameters.billToPostalCode?if_exists}" maxlength="10" />
             </div>
             <div>
-              <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(required)</span></label>
+              <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
               <select name="billToCountryGeoId" id="billToCountryGeoId" class='required selectBox'>
               <#if billToCountryGeoId??>
                 <option value='${billToCountryGeoId!}'>${billToCountryProvinceGeo!(billToCountryGeoId!)}</option>
@@ -145,7 +145,7 @@ under the License.
               </select>
             </div>
             <div id='billToStates'>
-              <label for="billToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(required)</span></label>
+              <label for="billToStateProvinceGeoId">${uiLabelMap.CommonState}*<span id="advice-required-billToStateProvinceGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
               <div>
                 <select id="billToStateProvinceGeoId" name="billToStateProvinceGeoId">
                 <#if billToStateProvinceGeoId?has_content>
@@ -161,7 +161,7 @@ under the License.
               <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"></span>
               <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"></span>
               <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"></span>
-              <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(required)</span>
+              <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
               <input type="text" name="billToCountryCode" id="billToCountryCode" class="required" value="${parameters.billToCountryCode?if_exists}" size="3" maxlength="3"/>
               - <input type="text" name="billToAreaCode" id="billToAreaCode" class="required" value="${parameters.billToAreaCode?if_exists}" size="3" maxlength="3"/>
               - <input type="text" name="billToContactNumber" id="billToContactNumber" class="required" value="${contactNumber?default("${parameters.billToContactNumber?if_exists}")}" size="6" maxlength="7"/>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Fri Apr 23 13:06:54 2010
@@ -160,7 +160,7 @@ under the License.
                             <#else>
                               <input type="hidden" name="cartLineProductId" id="cartLineProductId_${cartLine_index}" value="${cartLine.getProductId()}" />
                               <input type="text" name="update${cartLine_index}" id="qty_${cartLine_index}" value="${cartLine.getQuantity()?string.number}" class="required validate-number" />
-                              <span id="advice-required-qty_${cartLine_index}" style="display:none;" class="errorMessage"> (required)</span>
+                              <span id="advice-required-qty_${cartLine_index}" style="display:none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                               <span id="advice-validate-number-qty_${cartLine_index}" style="display:none;" class="errorMessage"> (${uiLabelMap.CommonPleaseEnterValidNumberInThisField}) </span>
                             </#if>
                           </td>
@@ -241,13 +241,13 @@ under the License.
                   <div>
                       <span>
                         <label for="firstName">${uiLabelMap.PartyFirstName}*
-                          <span id="advice-required-firstName" style="display: none" class="errorMessage"> (required)</span>
+                          <span id="advice-required-firstName" style="display: none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                         </label>
                         <input id="firstName" name="firstName" class="required" type="text" value="${firstName?if_exists}" />
                       </span>
                       <span>
                         <label for="lastName">${uiLabelMap.PartyLastName}*
-                          <span id="advice-required-lastName" style="display:none" class="errorMessage"> (required)</span>
+                          <span id="advice-required-lastName" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                         </label>
                         <input id="lastName" name="lastName" class="required" type="text" value="${lastName?if_exists}" />
                       </span>
@@ -256,19 +256,19 @@ under the License.
                   <#if shipToTelecomNumber?has_content>
                       <span>
                           <label for="shipToCountryCode">${uiLabelMap.PartyCountry}*
-                              <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (required)</span>
+                              <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                           </label>    
                           <input type="text" name="countryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> -
                       </span>
                       <span>
                           <label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}*
-                              <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (required)</span>
+                              <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                           </label>
                           <input type="text" name="areaCode" class="required" id="shipToAreaCode" value="${shipToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> -
                       </span>
                       <span>
                           <label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}*
-                              <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (required)</span>
+                              <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                           </label>
                           <input type="text" name="contactNumber" class="required" id="shipToContactNumber" value="${shipToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> -
                       </span>
@@ -279,19 +279,19 @@ under the License.
                   <#else>
                       <span>
                           <label for="shipToCountryCode">${uiLabelMap.PartyCountry}*
-                              <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (required)</span>
+                              <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                           </label>
                           <input type="text" name="countryCode" class="required" id="shipToCountryCode" value="${parameters.countryCode?if_exists}" size="5" maxlength="3" /> -
                       </span>
                       <span>
                           <label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}*
-                              <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (required)</span>
+                              <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                           </label>
                           <input type="text" name="areaCode" class="required" id="shipToAreaCode" value="${parameters.areaCode?if_exists}" size="5" maxlength="3" /> -
                       </span>
                       <span>
                           <label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}*
-                              <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (required)</span>
+                              <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                           </label>
                           <input type="text" name="contactNumber" class="required" id="shipToContactNumber" value="${parameters.contactNumber?if_exists}" size="10" maxlength="7" /> -
                       </span>
@@ -304,7 +304,7 @@ under the License.
                   <div>
                       <span>
                           <label for="emailAddress">${uiLabelMap.PartyEmailAddress}*
-                            <span id="advice-required-emailAddress" style="display:none" class="errorMessage"> (required)</span>
+                            <span id="advice-required-emailAddress" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                           </label>
                           <input id="emailAddress" name="emailAddress" class="required validate-email" maxlength="255" size="40" type="text" value="${emailAddress?if_exists}" />
                       </span>
@@ -312,7 +312,7 @@ under the License.
                     <div>
                         <span>
                             <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*
-                                <span id="advice-required-shipToAddress1" class="custom-advice errorMessage" style="display:none"> (required)</span>
+                                <span id="advice-required-shipToAddress1" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span>
                             </label>
                             <input id="shipToAddress1" name="shipToAddress1" class="required" type="text" value="${shipToAddress1?if_exists}" maxlength="255" size="40" />
                         </span>
@@ -326,7 +326,7 @@ under the License.
                     <div>
                         <span>
                             <label for="shipToCity">${uiLabelMap.CommonCity}*
-                                <span id="advice-required-shipToCity" class="custom-advice errorMessage" style="display:none"> (required)</span>
+                                <span id="advice-required-shipToCity" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span>
                             </label>
                             <input id="shipToCity" name="shipToCity" class="required" type="text" value="${shipToCity?if_exists}" maxlength="255" size="40" />
                         </span>
@@ -334,7 +334,7 @@ under the License.
                     <div>
                         <span>
                             <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*
-                                <span id="advice-required-shipToPostalCode" class="custom-advice errorMessage" style="display:none"> (required)</span>
+                                <span id="advice-required-shipToPostalCode" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span>
                             </label>
                             <input id="shipToPostalCode" name="shipToPostalCode" class="required" type="text" value="${shipToPostalCode?if_exists}" size="12" maxlength="10" />
                         </span>
@@ -342,7 +342,7 @@ under the License.
                     <div>
                         <span>
                             <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}*
-                                <span id="advice-required-shipToCountryGeo" style="display:none" class="errorMessage"> (required)</span>
+                                <span id="advice-required-shipToCountryGeo" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                             </label>
                             <select name="shipToCountryGeoId" id="shipToCountryGeoId">
                               <#if shipToCountryGeoId?exists>
@@ -355,7 +355,7 @@ under the License.
                     <div id="shipToStates">
                         <span>
                             <label for="shipToStateProvinceGeoId">${uiLabelMap.CommonState}*
-                                <span id="advice-required-shipToStateProvinceGeoId" style="display:none" class="errorMessage">(required)</span>
+                                <span id="advice-required-shipToStateProvinceGeoId" style="display:none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
                             </label>
                             <select id="shipToStateProvinceGeoId" name="shipToStateProvinceGeoId">
                               <#if shipToStateProvinceGeoId?has_content>
@@ -396,7 +396,7 @@ under the License.
                   <div id="shippingOptionFormServerError" class="errorMessage"></div>
                   <div>
                       <label for="shipMethod">${uiLabelMap.OrderSelectShippingMethod}*
-                          <span id="advice-required-shipping_method" class="custom-advice" style="display:none"> (required)</span>
+                          <span id="advice-required-shipping_method" class="custom-advice" style="display:none"> (${uiLabelMap.CommonRequired})</span>
                       </label>
                       <select id="shipMethod" name="shipMethod" class="required">
                           <option value=""></option>
@@ -464,13 +464,13 @@ under the License.
                         <div>
                             <span>
                                 <label for="firstNameOnCard">${uiLabelMap.PartyFirstName}*
-                                    <span id="advice-required-firstNameOnCard" style="display: none;" class="errorMessage"> (required)</span>
+                                    <span id="advice-required-firstNameOnCard" style="display: none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input id="firstNameOnCard" name="firstNameOnCard" class="required" type="text" value="${firstNameOnCard?if_exists}" />
                             </span>
                             <span>
                                 <label for="lastNameOnCard">${uiLabelMap.PartyLastName}*
-                                    <span id="advice-required-lastNameOnCard" style="display: none;" class="errorMessage"> (required)</span>
+                                    <span id="advice-required-lastNameOnCard" style="display: none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input id="lastNameOnCard" name="lastNameOnCard" class="required" type="text" value="${lastNameOnCard?if_exists}" />
                             </span>
@@ -479,19 +479,19 @@ under the License.
                           <#if billToTelecomNumber?has_content>
                             <span>
                                 <label for="billToCountryCode">${uiLabelMap.PartyCountry}*
-                                    <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (required)</span>
+                                    <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input type="text" name="countryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> -
                             </span>
                             <span>
                                 <label for="billToAreaCode">${uiLabelMap.PartyAreaCode}*
-                                    <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (required)</span>
+                                    <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input type="text" name="areaCode" class="required" id="billToAreaCode" value="${billToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> -
                             </span>
                             <span>
                                 <label for="billToContactNumber">${uiLabelMap.PartyContactNumber}*
-                                    <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (required)</span>
+                                    <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input type="text" name="contactNumber" class="required" id="billToContactNumber" value="${billToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> -
                             </span>
@@ -502,19 +502,19 @@ under the License.
                           <#else>
                             <span>
                                 <label for="billToCountryCode">${uiLabelMap.PartyCountry}*
-                                    <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (required)</span>
+                                    <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input type="text" name="countryCode" class="required" id="billToCountryCode" value="${parameters.countryCode?if_exists}" size="5" maxlength="3" /> -
                             </span>
                             <span>
                                 <label for="billToAreaCode">${uiLabelMap.PartyAreaCode}*
-                                    <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (required)</span>
+                                    <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input type="text" name="areaCode" class="required" id="billToAreaCode" value="${parameters.areaCode?if_exists}" size="5" maxlength="3" /> -
                             </span>
                             <span>
                                 <label for="billToContactNumber">${uiLabelMap.PartyContactNumber}*
-                                    <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (required)</span>
+                                    <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input type="text" name="contactNumber" class="required" id="billToContactNumber" value="${parameters.contactNumber?if_exists}" size="10" maxlength="7" /> -
                             </span>
@@ -526,7 +526,7 @@ under the License.
                         </div>
                         <div>
                           <span>
-                                <label for="cardType">${uiLabelMap.AccountingCardType}*<span id="advice-required-cardType" style="display: none;" class="errorMessage"> (required)</span></label>
+                                <label for="cardType">${uiLabelMap.AccountingCardType}*<span id="advice-required-cardType" style="display: none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span></label>
                                 <select name="cardType" id="cardType">
                                   <#if cardType?has_content>
                                     <option label="${cardType?if_exists}" value="${cardType?if_exists}">${cardType?if_exists}</option>
@@ -538,7 +538,7 @@ under the License.
                         <div>
                             <span>
                                 <label for="cardNumber">${uiLabelMap.AccountingCardNumber}*
-                                    <span id="advice-required-cardNumber" style="display: none;" class="errorMessage"> (required)</span>
+                                    <span id="advice-required-cardNumber" style="display: none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input id="cardNumber" name="cardNumber" class="required" type="text" value="${cardNumber?if_exists}" size="30" maxlength="16" />
                             </span>
@@ -550,7 +550,7 @@ under the License.
                         <div>
                           <span>
                             <label for="expMonth">${uiLabelMap.CommonMonth}:*
-                                <span id="advice-required-expMonth" style="display:none" class="errorMessage"> (required)</span>
+                                <span id="advice-required-expMonth" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                             </label>
                             <select id="expMonth" name="expMonth" class="required">
                               <#if expMonth?has_content>
@@ -561,7 +561,7 @@ under the License.
                           </span>
                           <span>
                             <label for="expYear">${uiLabelMap.CommonYear}:*
-                                <span id="advice-required-expYear" style="display:none" class="errorMessage"> (required)</span>
+                                <span id="advice-required-expYear" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                             </label>
                             <select id="expYear" name="expYear" class="required">
                               <#if expYear?has_content>
@@ -579,7 +579,7 @@ under the License.
                         <div id="billingAddress" <#if useShippingAddressForBilling?has_content && useShippingAddressForBilling?default("")=="Y">style="display:none"</#if>>
                           <div>
                               <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}*
-                                <span id="advice-required-billToAddress1" style="display:none" class="errorMessage"> (required)</span>
+                                <span id="advice-required-billToAddress1" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                               </label>
                               <input id="billToAddress1" name="billToAddress1" class="required" size="30" type="text" value="${billToAddress1?if_exists}" />
                           </div>
@@ -589,19 +589,19 @@ under the License.
                           </div>
                           <div>
                               <label for="billToCity">${uiLabelMap.CommonCity}*
-                                <span id="advice-required-billToCity" style="display:none" class="errorMessage"> (required)</span>
+                                <span id="advice-required-billToCity" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                               </label>
                               <input id="billToCity" name="billToCity" class="required" type="text" value="${billToCity?if_exists}" />
                           </div>
                           <div>
                               <label for="billToPostalCode">${uiLabelMap.PartyZipCode}*
-                                <span id="advice-required-billToPostalCode" style="display:none" class="errorMessage"> (required)</span>
+                                <span id="advice-required-billToPostalCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                               </label>
                               <input id="billToPostalCode" name="billToPostalCode" class="required" type="text" value="${billToPostalCode?if_exists}" size="12" maxlength="10" />
                           </div>
                           <div>
                               <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}*
-                                <span id="advice-required-billToCountryGeoId" style="display:none" class="errorMessage"> (required)</span>
+                                <span id="advice-required-billToCountryGeoId" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                               </label>
                               <select name="billToCountryGeoId" id="billToCountryGeoId">
                                 <#if billToCountryGeoId?exists>
@@ -612,7 +612,7 @@ under the License.
                           </div>
                           <div>
                               <label for="billToStateProvinceGeoId">${uiLabelMap.CommonState}*
-                                <span id="advice-required-billToStateProvinceGeoId" style="display:none" class="errorMessage"> (required)</span>
+                                <span id="advice-required-billToStateProvinceGeoId" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                               </label>
                               <select id="billToStateProvinceGeoId" name="billToStateProvinceGeoId">
                                 <#if billToStateProvinceGeoId?has_content>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl Fri Apr 23 13:06:54 2010
@@ -70,7 +70,7 @@ under the License.
                 <td width="2%">&nbsp;</td>
                 <td width="72%">
                   <@fieldErrors fieldName="firstName"/>
-                    <input type="text" class="inputBox required" name="firstName" id="firstName" value="${parameters.firstName?if_exists}" size="30" maxlength="30"/>*<span id="advice-required-firstName" class="required" style="display:none">(required)</span>
+                    <input type="text" class="inputBox required" name="firstName" id="firstName" value="${parameters.firstName?if_exists}" size="30" maxlength="30"/>*<span id="advice-required-firstName" class="required" style="display:none">(${uiLabelMap.CommonRequired})</span>
                 </td>
               </tr>
               <tr>
@@ -85,7 +85,7 @@ under the License.
                 <td width="2%">&nbsp;</td>
                 <td width="72%">
                   <@fieldErrors fieldName="lastName"/>
-                  <input type="text" class="inputBox required" name="lastName" value="${parameters.lastName?if_exists}" size="30" maxlength="30"/>*<span id="advice-required-lastName" class="required" style="display:none">(required)</span>
+                  <input type="text" class="inputBox required" name="lastName" value="${parameters.lastName?if_exists}" size="30" maxlength="30"/>*<span id="advice-required-lastName" class="required" style="display:none">(${uiLabelMap.CommonRequired})</span>
                 </td>
               </tr>
               <tr>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl?rev=937278&r1=937277&r2=937278&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl Fri Apr 23 13:06:54 2010
@@ -26,7 +26,7 @@ under the License.
       <div>
         <label for="address1">${uiLabelMap.PartyAddressLine1}*</label>
         <input id="address1" name="address1" class="required" type="text" value="${address1?if_exists}"/>
-        <span id="advice-required-address1" class="custom-advice errorMessage" style="display:none"> (required)</span>
+        <span id="advice-required-address1" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span>
       </div>
       <div>
         <label for="address2">${uiLabelMap.PartyAddressLine2}</label>
@@ -35,12 +35,12 @@ under the License.
       <div>
         <label for="city">${uiLabelMap.CommonCity}*</label>
         <input id="city" name="city" class="required" type="text" value="${city?if_exists}"/>
-        <span id="advice-required-city" class="custom-advice errorMessage" style="display:none"> (required)</span>
+        <span id="advice-required-city" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span>
       </div>
       <div>
         <label for="postalCode">${uiLabelMap.PartyZipCode}*</label>
         <input id="postalCode" name="postalCode" class="required" type="text" value="${postalCode?if_exists}" size="12" maxlength="10"/>
-        <span id="advice-required-postalCode" class="custom-advice errorMessage" style="display:none"> (required)</span>
+        <span id="advice-required-postalCode" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span>
       </div>
       <div>
         <label for="countryGeoId">${uiLabelMap.PartyCountry}*</label>
@@ -50,7 +50,7 @@ under the License.
           </#if>
           ${screens.render("component://common/widget/CommonScreens.xml#countries")}
         </select>
-        <span id="advice-required-countryGeoId" style="display:none" class="errorMessage"> (required)</span>
+        <span id="advice-required-countryGeoId" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
       </div>
       <div>
         <label for="state">${uiLabelMap.CommonState}*</label>
@@ -62,7 +62,7 @@ under the License.
           </#if>
           ${screens.render("component://common/widget/CommonScreens.xml#states")}
         </select>
-        <span id="advice-required-stateProvinceGeoId" style="display:none" class="errorMessage">(required)</span>
+        <span id="advice-required-stateProvinceGeoId" style="display:none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
       </div>
       <div class="buttons">
         <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/>