svn commit: r806206 [1/2] - in /ofbiz/trunk/specialpurpose/ec
Locked
 
|
Author: apatel
Date: Thu Aug 20 15:12:57 2009 New Revision: 806206 URL: http://svn.apache.org/viewvc?rev=806206&view=rev Log: a step closer to having better html markup. Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl?rev=806206&r1=806205&r2=806206&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl Thu Aug 20 15:12:57 2009 @@ -16,34 +16,34 @@ specific language governing permissions and limitations under the License. --> - <h1>${uiLabelMap.PartyChangePassword}</h1> + <h2>${uiLabelMap.PartyChangePassword}</h2> - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> - <a href="javascript:document.changepasswordform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> + <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="button">[${uiLabelMap.CommonGoBack}]</a> + <a href="javascript:document.changepasswordform.submit()" class="button">[${uiLabelMap.CommonSave}]</a> <form method="post" action="<@ofbizUrl>updatePassword/${donePage}</@ofbizUrl>" name="changepasswordform"> <table width="90%" border="0" cellpadding="2" cellspacing="0" class="tabletext"> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyOldPassword}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyOldPassword}</td> + <td> <input type="password" class='inputBox' name="currentPassword" size="20" maxlength="20"/> *</td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyNewPassword}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyNewPassword}</td> + <td> <input type="password" class='inputBox' name="newPassword" size="20" maxlength="20"/> *</td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyNewPasswordVerify}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyNewPasswordVerify}</td> + <td> <input type="password" class='inputBox' name="newPasswordVerify" size="20" maxlength="20"/> *</td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyPasswordHint}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyPasswordHint}</td> + <td> <input type="text" class='inputBox' size="40" maxlength="100" name="passwordHint" value="${userLoginData.passwordHint?if_exists}"/> </td> </tr> @@ -51,5 +51,5 @@ </form> <div class="tabletext">${uiLabelMap.CommonFieldsMarkedAreRequired}</div> - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> - <a href="javascript:document.changepasswordform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> + <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="button">[${uiLabelMap.CommonGoBack}]</a> + <a href="javascript:document.changepasswordform.submit()" class="button">[${uiLabelMap.CommonSave}]</a> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=806206&r1=806205&r2=806206&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Thu Aug 20 15:12:57 2009 @@ -17,27 +17,28 @@ under the License. --> <#if canNotView> - <p><h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3></p> - <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBack}</a> + <h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3> + <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="button">${uiLabelMap.CommonBack}</a> <#else> - <#if !contactMech?exists> <#-- When creating a new contact mech, first select the type, then actually create --> <#if !requestParameters.preContactMechTypeId?exists && !preContactMechTypeId?exists> - <h1>${uiLabelMap.PartyCreateNewContactInfo}</h1> + <h2>${uiLabelMap.PartyCreateNewContactInfo}</h2> <form method="post" action='<@ofbizUrl>editcontactmechnosave</@ofbizUrl>' name="createcontactmechform"> + <div> <table width="90%" border="0" cellpadding="2" cellspacing="0"> <tr> - <td width="26%"><div class="tabletext">${uiLabelMap.PartySelectContactType}:</div></td> - <td width="74%"> + <td>${uiLabelMap.PartySelectContactType}:</td> + <td> <select name="preContactMechTypeId" class='selectBox'> <#list contactMechTypes as contactMechType> <option value='${contactMechType.contactMechTypeId}'>${contactMechType.get("description",locale)}</option> </#list> - </select> <a href="javascript:document.createcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonCreate}</a> + </select> <a href="javascript:document.createcontactmechform.submit()" class="button">${uiLabelMap.CommonCreate}</a> </td> </tr> </table> + </div> </form> <#-- <p><h3>ERROR: Contact information with ID "${contactMechId}" not found!</h3></p> --> </#if> @@ -45,201 +46,199 @@ <#if contactMechTypeId?exists> <#if !contactMech?exists> - <h1>${uiLabelMap.PartyCreateNewContactInfo}</h1> - <a href='<@ofbizUrl>editcontactmechdone</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonGoBack}</a> - <a href="javascript:document.editcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> + <h2>${uiLabelMap.PartyCreateNewContactInfo}</h2> + <a href='<@ofbizUrl>editcontactmechdone</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a> <table width="90%" border="0" cellpadding="2" cellspacing="0"> <form method="post" action='<@ofbizUrl>${requestName}</@ofbizUrl>' name="editcontactmechform"> - <input type='hidden' name='contactMechTypeId' value='${contactMechTypeId}'> - <#if contactMechPurposeType?exists> - <div class="tabletext">(${uiLabelMap.PartyNewContactHavePurpose} <b>"${contactMechPurposeType.get("description",locale)?if_exists}"</b>)</div> - </#if> - <#if cmNewPurposeTypeId?has_content><input type='hidden' name='contactMechPurposeTypeId' value='${cmNewPurposeTypeId}'></#if> - <#if preContactMechTypeId?has_content><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}'></#if> - <#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}'></#if> + <div> + <input type='hidden' name='contactMechTypeId' value='${contactMechTypeId}' /> + <#if contactMechPurposeType?exists> + <div class="tabletext">(${uiLabelMap.PartyNewContactHavePurpose} "${contactMechPurposeType.get("description",locale)?if_exists}")</div> + </#if> + <#if cmNewPurposeTypeId?has_content><input type='hidden' name='contactMechPurposeTypeId' value='${cmNewPurposeTypeId}' /></#if> + <#if preContactMechTypeId?has_content><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}' /></#if> + <#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if> <#else> - <h1>${uiLabelMap.PartyEditContactInfo}</h1> - <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> - <a href="javascript:document.editcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> + <h2>${uiLabelMap.PartyEditContactInfo}</h2> + <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a> <table width="90%" border="0" cellpadding="2" cellspacing="0"> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyContactPurposes}</div></td> - <td width="5"> </td> - <td width="74%"> - <table border="0" cellspacing="1" bgcolor="black"> + <td align="right" valign="top">${uiLabelMap.PartyContactPurposes}</td> + <td> </td> + <td> + <table border="0" cellspacing="1"> <#list partyContactMechPurposes?if_exists as partyContactMechPurpose> - <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") /> <tr> - <td bgcolor='white'> - <div class="tabletext"> - <#if contactMechPurposeType?exists> - <b>${contactMechPurposeType.get("description",locale)}</b> - <#else> - <b>${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b> - </#if> - (${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()}) - <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpires}:${partyContactMechPurpose.thruDate.toString()})</#if> - </div></td> - <td bgcolor='white'> - <div> + <td> + <#if contactMechPurposeType?exists> + ${contactMechPurposeType.get("description",locale)} + <#else> + ${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}" + </#if> + (${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()}) + <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpires}:${partyContactMechPurpose.thruDate.toString()})</#if> + </td> + <td> <form name="deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}" method="post" action="<@ofbizUrl>deletePartyContactMechPurpose</@ofbizUrl>"> - <input type="hidden" name="contactMechId" value=${contactMechId}"/> - <input type="hidden" name="contactMechPurposeTypeId" value="${partyContactMechPurpose.contactMechPurposeTypeId}"/> - <input type="hidden" name="fromDate" value="${partyContactMechPurpose.fromDate}"/> - <input type="hidden" name="useValues" value="true"/> - <a href='javascript:document.deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}.submit()' class='buttontext'> ${uiLabelMap.CommonDelete} </a> + <div> + <input type="hidden" name="contactMechId" value="${contactMechId}"/> + <input type="hidden" name="contactMechPurposeTypeId" value="${partyContactMechPurpose.contactMechPurposeTypeId}"/> + <input type="hidden" name="fromDate" value="${partyContactMechPurpose.fromDate}"/> + <input type="hidden" name="useValues" value="true"/> + <a href='javascript:document.deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}.submit()' class='button'> ${uiLabelMap.CommonDelete} </a> + </div> </form> - </div> </td> </tr> </#list> <#if purposeTypes?has_content> <tr> - <form method="post" action='<@ofbizUrl>createPartyContactMechPurpose</@ofbizUrl>' name='newpurposeform'> - <input type="hidden" name="contactMechId" value="${contactMechId}"/> - <input type="hidden" name="useValues" value="true"/> - <td bgcolor='white'> - <select name='contactMechPurposeTypeId' class='selectBox'> - <option></option> - <#list purposeTypes as contactMechPurposeType> - <OPTION value='${contactMechPurposeType.contactMechPurposeTypeId}'>${contactMechPurposeType.get("description",locale)}</OPTION> - </#list> - </select> - </td> - </form> - <td bgcolor='white'><div><a href='javascript:document.newpurposeform.submit()' class='buttontext'>${uiLabelMap.PartyAddPurpose} </a></div></td> + <td> + <form method="post" action='<@ofbizUrl>createPartyContactMechPurpose</@ofbizUrl>' name='newpurposeform'> + <div> + <input type="hidden" name="contactMechId" value="${contactMechId}"/> + <input type="hidden" name="useValues" value="true"/> + <select name='contactMechPurposeTypeId' class='selectBox'> + <option></option> + <#list purposeTypes as contactMechPurposeType> + <option value='${contactMechPurposeType.contactMechPurposeTypeId}'>${contactMechPurposeType.get("description",locale)}</option> + </#list> + </select> + </div> + </form> + </td> + <td><a href='javascript:document.newpurposeform.submit()' class='button'>${uiLabelMap.PartyAddPurpose}</a></td> </tr> </#if> </table> </td> </tr> <form method="post" action='<@ofbizUrl>${requestName}</@ofbizUrl>' name="editcontactmechform"> - <input type="hidden" name="contactMechId" value='${contactMechId}'> - <input type="hidden" name="contactMechTypeId" value='${contactMechTypeId}'> + <div> + <input type="hidden" name="contactMechId" value='${contactMechId}' /> + <input type="hidden" name="contactMechTypeId" value='${contactMechTypeId}' /> </#if> - <#if contactMechTypeId = "POSTAL_ADDRESS"> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyToName}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="30" maxlength="60" name="toName" value="${postalAddressData.toName?if_exists}"> - </td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="30" maxlength="60" name="attnName" value="${postalAddressData.attnName?if_exists}"> - </td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="30" maxlength="30" name="address1" value="${postalAddressData.address1?if_exists}"> - *</td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="30" maxlength="30" name="address2" value="${postalAddressData.address2?if_exists}"> - </td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyCity}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="30" maxlength="30" name="city" value="${postalAddressData.city?if_exists}"> - *</td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyState}</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="stateProvinceGeoId" class='selectBox'> - <#if postalAddressData.stateProvinceGeoId?exists><option value='${postalAddressData.stateProvinceGeoId}'>${selectedStateName?default(postalAddressData.stateProvinceGeoId)}</option></#if> - <option value="">${uiLabelMap.PartyNoState}</option> - ${screens.render("component://common/widget/CommonScreens.xml#states")} - </select> - *</td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="12" maxlength="10" name="postalCode" value="${postalAddressData.postalCode?if_exists}"> - *</td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyCountry}</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="countryGeoId" class='selectBox'> - <#if postalAddressData.countryGeoId?exists><option value='${postalAddressData.countryGeoId}'>${selectedCountryName?default(postalAddressData.countryGeoId)}</option></#if> - ${screens.render("component://common/widget/CommonScreens.xml#countries")} - </select> - *</td> - </tr> - <#elseif contactMechTypeId = "TELECOM_NUMBER"> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyPhoneNumber}</div></td> - <td width="5"> </td> - <td width="74%"> - <div class="tabletext"> - <input type="text" class='inputBox' size="4" maxlength="10" name="countryCode" value="${telecomNumberData.countryCode?if_exists}"> - - <input type="text" class='inputBox' size="4" maxlength="10" name="areaCode" value="${telecomNumberData.areaCode?if_exists}"> - - <input type="text" class='inputBox' size="15" maxlength="15" name="contactNumber" value="${telecomNumberData.contactNumber?if_exists}"> - ${uiLabelMap.PartyExtension} <input type="text" class='inputBox' size="6" maxlength="10" name="extension" value="${partyContactMechData.extension?if_exists}"> - </div> - </td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext"></div></td> - <td width="5"> </td> - <td><div class="tabletext">[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td> - </tr> - <#elseif contactMechTypeId = "EMAIL_ADDRESS"> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyEmailAddress}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="60" maxlength="255" name="emailAddress" value="<#if tryEntity>${contactMech.infoString?if_exists}<#else>${requestParameters.emailAddress?if_exists}</#if>"> - *</td> - </tr> - <#else> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${contactMechType.get("description",locale)?if_exists}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="60" maxlength="255" name="infoString" value="${contactMechData.infoString?if_exists}"> - *</td> - </tr> - </#if> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAllowSolicitation}?</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="allowSolicitation" class='selectBox'> - <#if (((partyContactMechData.allowSolicitation)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> - <#if (((partyContactMechData.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> - <option></option> - <option value="Y">${uiLabelMap.CommonY}</option> - <option value="N">${uiLabelMap.CommonN}</option> - </select> - </td> - </tr> - </form> + <#if contactMechTypeId = "POSTAL_ADDRESS"> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyToName}</td> + <td> </td> + <td> + <input type="text" class='inputBox' size="30" maxlength="60" name="toName" value="${postalAddressData.toName?if_exists}" /> + </td> + </tr> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyAttentionName}</td> + <td> </td> + <td> + <input type="text" class='inputBox' size="30" maxlength="60" name="attnName" value="${postalAddressData.attnName?if_exists}" /> + </td> + </tr> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyAddressLine1}</td> + <td> </td> + <td> + <input type="text" class='inputBox' size="30" maxlength="30" name="address1" value="${postalAddressData.address1?if_exists}" /> + *</td> + </tr> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyAddressLine2}</td> + <td> </td> + <td> + <input type="text" class='inputBox' size="30" maxlength="30" name="address2" value="${postalAddressData.address2?if_exists}" /> + </td> + </tr> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyCity}</td> + <td> </td> + <td> + <input type="text" class='inputBox' size="30" maxlength="30" name="city" value="${postalAddressData.city?if_exists}" /> + *</td> + </tr> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyState}</td> + <td> </td> + <td> + <select name="stateProvinceGeoId" class='selectBox'> + <#if postalAddressData.stateProvinceGeoId?exists><option value='${postalAddressData.stateProvinceGeoId}'>${selectedStateName?default(postalAddressData.stateProvinceGeoId)}</option></#if> + <option value="">${uiLabelMap.PartyNoState}</option> + ${screens.render("component://common/widget/CommonScreens.xml#states")} + </select> + *</td> + </tr> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyZipCode}</td> + <td > </td> + <td> + <input type="text" class='inputBox' size="12" maxlength="10" name="postalCode" value="${postalAddressData.postalCode?if_exists}" /> + *</td> + </tr> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyCountry}</td> + <td> </td> + <td> + <select name="countryGeoId" class='selectBox'> + <#if postalAddressData.countryGeoId?exists><option value='${postalAddressData.countryGeoId}'>${selectedCountryName?default(postalAddressData.countryGeoId)}</option></#if> + ${screens.render("component://common/widget/CommonScreens.xml#countries")} + </select> + *</td> + </tr> + <#elseif contactMechTypeId = "TELECOM_NUMBER"> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyPhoneNumber}</td> + <td> </td> + <td> + <input type="text" class='inputBox' size="4" maxlength="10" name="countryCode" value="${telecomNumberData.countryCode?if_exists}" /> + - <input type="text" class='inputBox' size="4" maxlength="10" name="areaCode" value="${telecomNumberData.areaCode?if_exists}" /> + - <input type="text" class='inputBox' size="15" maxlength="15" name="contactNumber" value="${telecomNumberData.contactNumber?if_exists}" /> + ${uiLabelMap.PartyExtension} <input type="text" class='inputBox' size="6" maxlength="10" name="extension" value="${partyContactMechData.extension?if_exists}" /> + </td> + </tr> + <tr> + <td align="right" valign="top"></td> + <td> </td> + <td>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</td> + </tr> + <#elseif contactMechTypeId = "EMAIL_ADDRESS"> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyEmailAddress}</td> + <td> </td> + <td> + <input type="text" class='inputBox' size="60" maxlength="255" name="emailAddress" value="<#if tryEntity>${contactMech.infoString?if_exists}<#else>${requestParameters.emailAddress?if_exists}</#if>" /> + *</td> + </tr> + <#else> + <tr> + <td align="right" valign="top">${contactMechType.get("description",locale)?if_exists}</td> + <td> </td> + <td> + <input type="text" class='inputBox' size="60" maxlength="255" name="infoString" value="${contactMechData.infoString?if_exists}" /> + *</td> + </tr> + </#if> + <tr> + <td align="right" valign="top">${uiLabelMap.PartyAllowSolicitation}?</td> + <td> </td> + <td> + <select name="allowSolicitation" class='selectBox'> + <#if (((partyContactMechData.allowSolicitation)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> + <#if (((partyContactMechData.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> + </select> + </td> + </tr> + </div> + </form> </table> - <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> - <a href="javascript:document.editcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> + <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a> <#else> - <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> + <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> </#if> -</#if> - - - - +</#if> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl?rev=806206&r1=806205&r2=806206&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Thu Aug 20 15:12:57 2009 @@ -18,124 +18,125 @@ --> <#if canNotView> - <p><h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3></p> - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBack}</a> + <h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3> +<a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonBack}</a> <#else> - <#if !creditCard?exists> - <h1>${uiLabelMap.AccountingAddNewCreditCard}</h1> - <form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;"> + <#if !creditCard?exists> + <h2>${uiLabelMap.AccountingAddNewCreditCard}</h2> + <form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform"> + <div> <#else> - <h1>${uiLabelMap.AccountingEditCreditCard}</h1> - <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;"> - <input type="hidden" name="paymentMethodId" value="${paymentMethodId}"> + <h2>${uiLabelMap.AccountingEditCreditCard}</h2> + <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform"> + <div> + <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> </#if> - <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancelDone}</a> - <a href="javascript:document.editcreditcardform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> - - <table width="90%" border="0" cellpadding="2" cellspacing="0"> - - ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")} - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyBillingAddress}</div></td> - <td width="5"> </td> - <td width="74%"> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonCancelDone}</a> + <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a> + <table width="90%" border="0" cellpadding="2" cellspacing="0"> + ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")} + <tr> + <td align="right" valign="top">${uiLabelMap.PartyBillingAddress}</td> + <td> </td> + <td> <#-- Removed because is confusing, can add but would have to come back here with all data populated as before... <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="buttontext"> [Create New Address]</a> --> - <table width="100%" border="0" cellpadding="1"> - <#assign hasCurrent = false> - <#if curPostalAddress?has_content> - <#assign hasCurrent = true> - <tr> - <td align="right" valign="top" width="1%"> - <input type="radio" name="contactMechId" value="${curContactMechId}" checked> - </td> - <td valign="top" width="80%"> - <div class="tabletext"><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div> - <#list curPartyContactMechPurposes as curPartyContactMechPurpose> - <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> - <div class="tabletext"> - <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b> - <#if curPartyContactMechPurpose.thruDate?exists> - ((${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()}) - </#if> - </div> - </#list> - <div class="tabletext"> - <#if curPostalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}<br/></#if> - <#if curPostalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}<br/></#if> - ${curPostalAddress.address1?if_exists}<br/> - <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br/></#if> - ${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode} - <#if curPostalAddress.countryGeoId?exists><br/>${curPostalAddress.countryGeoId}</#if> - </div> - <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div> - <#if curPartyContactMech.thruDate?exists><div class="tabletext"><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if> - </td> - </tr> - <#else> + <table width="100%" border="0" cellpadding="1"> + <#assign hasCurrent = false /> + <#if curPostalAddress?has_content> + <#assign hasCurrent = true /> + <tr> + <td align="right" valign="top"> + <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" /> + </td> + <td valign="top"> + ${uiLabelMap.PartyUseCurrentAddress}: + <#list curPartyContactMechPurposes as curPartyContactMechPurpose> + <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") /> + <div class="tabletext"> + ${curContactMechPurposeType.get("description",locale)?if_exists} + <#if curPartyContactMechPurpose.thruDate?exists> + ((${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()}) + </#if> + </div> + </#list> + <div class="tabletext"> + <#if curPostalAddress.toName?exists>${uiLabelMap.CommonTo}: ${curPostalAddress.toName}<br/></#if> + <#if curPostalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${curPostalAddress.attnName}<br/></#if> + ${curPostalAddress.address1?if_exists}<br/> + <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br/></#if> + ${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode} + <#if curPostalAddress.countryGeoId?exists><br/>${curPostalAddress.countryGeoId}</#if> + <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div> + <#if curPartyContactMech.thruDate?exists><div class="tabletext">${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</#if> + </div> + </td> + </tr> + <#else> <#-- <tr> <td valign="top" colspan="2"> <div class="tabletext">${uiLabelMap.PartyBillingAddressNotSelected}</div> </td> </tr> --> - </#if> + </#if> <#-- is confusing <tr> <td valign="top" colspan="2"> - <div class="tabletext"><b>${uiLabelMap.EcommerceMessage3}</b></div> + <div class="tabletext">${uiLabelMap.EcommerceMessage3}</div> </td> </tr> --> - <#list postalAddressInfos as postalAddressInfo> - <#assign contactMech = postalAddressInfo.contactMech> - <#assign partyContactMechPurposes = postalAddressInfo.partyContactMechPurposes> - <#assign postalAddress = postalAddressInfo.postalAddress> - <#assign partyContactMech = postalAddressInfo.partyContactMech> - <tr> - <td align="right" valign="top" width="1%"> - <input type="radio" name="contactMechId" value="${contactMech.contactMechId}"> - </td> - <td valign="middle" width="80%"> - <#list partyContactMechPurposes as partyContactMechPurpose> - <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> - <div class="tabletext"> - <b>${contactMechPurposeType.get("description",locale)?if_exists}</b> - <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> - </div> - </#list> - <div class="tabletext"> - <#if postalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br/></#if> - <#if postalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br/></#if> - ${postalAddress.address1?if_exists}<br/> - <#if postalAddress.address2?exists>${postalAddress.address2}<br/></#if> - ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode} - <#if postalAddress.countryGeoId?exists><br/>${postalAddress.countryGeoId}</#if> - </div> - <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div> - <#if partyContactMech.thruDate?exists><div class="tabletext"><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if> - </td> - </tr> - </#list> - <#if !postalAddressInfos?has_content && !curContactMech?exists> - <tr><td colspan="2"><div class="tabletext">${uiLabelMap.PartyNoContactInformation}.</div></td></tr> - </#if> - <tr> - <td align="right" valigh="top" width="1%"> - <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked</#if>> - </td> - <td valign="middle" width="80%"> - <span class="tabletext">${uiLabelMap.PartyCreateNewBillingAddress}.</span> - </td> - </tr> - </table> - </td> - </tr> - </table> - </form> + <#list postalAddressInfos as postalAddressInfo> + <#assign contactMech = postalAddressInfo.contactMech /> + <#assign partyContactMechPurposes = postalAddressInfo.partyContactMechPurposes /> + <#assign postalAddress = postalAddressInfo.postalAddress /> + <#assign partyContactMech = postalAddressInfo.partyContactMech /> + <tr> + <td align="right" valign="top"> + <input type="radio" name="contactMechId" value="${contactMech.contactMechId}" /> + </td> + <td valign="middle"> + <#list partyContactMechPurposes as partyContactMechPurpose> + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") /> + <div class="tabletext"> + ${contactMechPurposeType.get("description",locale)?if_exists} + <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> + </div> + </#list> + <div class="tabletext"> + <#if postalAddress.toName?exists>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br/></#if> + <#if postalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br/></#if> + ${postalAddress.address1?if_exists}<br/> + <#if postalAddress.address2?exists>${postalAddress.address2}<br/></#if> + ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode} + <#if postalAddress.countryGeoId?exists><br/>${postalAddress.countryGeoId}</#if> + </div> + <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div> + <#if partyContactMech.thruDate?exists><div class="tabletext">${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if> + </td> + </tr> + </#list> + <#if !postalAddressInfos?has_content && !curContactMech?exists> + <tr><td colspan="2"><div class="tabletext">${uiLabelMap.PartyNoContactInformation}.</div></td></tr> + </#if> + <tr> + <td align="right" valign="top"> + <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked="checked"</#if> /> + </td> + <td valign="middle"> + <span class="tabletext">${uiLabelMap.PartyCreateNewBillingAddress}.</span> + </td> + </tr> + </table> + </td> + </tr> + </table> + </div> + </form> - <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancelDone}</a> - <a href="javascript:document.editcreditcardform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonCancelDone}</a> + <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl?rev=806206&r1=806205&r2=806206&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl Thu Aug 20 15:12:57 2009 @@ -17,68 +17,68 @@ under the License. --> <#if person?exists> - <h1>${uiLabelMap.PartyEditPersonalInformation}</h1> + <h2>${uiLabelMap.PartyEditPersonalInformation}</h2> <form method="post" action="<@ofbizUrl>updatePerson/${donePage}</@ofbizUrl>" name="editpersonform"> <#else> - <h1>${uiLabelMap.PartyAddNewPersonalInformation}</h1> + <h2>${uiLabelMap.PartyAddNewPersonalInformation}</h2> <form method="post" action="<@ofbizUrl>createPerson/${donePage}</@ofbizUrl>" name="editpersonform"> </#if> +<div> + <a href='<@ofbizUrl>authview/${donePage}</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editpersonform.submit()" class="button">${uiLabelMap.CommonSave}</a> - <a href='<@ofbizUrl>authview/${donePage}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonGoBack}</a> - <a href="javascript:document.editpersonform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> - -<input type="hidden" name="partyId" value="${person.partyId?if_exists}"> -<table width="90%" border="0" cellpadding="2" cellspacing="0"> - <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonTitle}</div></td> - <td width="74%"> - <select name="personalTitle" class="selectBox"> - <#if personData.personalTitle?has_content > - <option>${personData.personalTitle}</option> - <option value="${personData.personalTitle}"> -- </option> - <#else> - <option value="">${uiLabelMap.CommonSelectOne}</option> - </#if> - <option>${uiLabelMap.CommonTitleMr}</option> - <option>${uiLabelMap.CommonTitleMrs}</option> - <option>${uiLabelMap.CommonTitleMs}</option> - <option>${uiLabelMap.CommonTitleDr}</option> - </select> - </td> - </tr> - <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyFirstName}</div></td> - <td width="74%"> + <input type="hidden" name="partyId" value="${person.partyId?if_exists}" /> + <table width="90%" border="0" cellpadding="2" cellspacing="0"> + <tr> + <td align="right">${uiLabelMap.CommonTitle}</td> + <td> + <select name="personalTitle" class="selectBox"> + <#if personData.personalTitle?has_content > + <option>${personData.personalTitle}</option> + <option value="${personData.personalTitle}"> -- </option> + <#else> + <option value="">${uiLabelMap.CommonSelectOne}</option> + </#if> + <option>${uiLabelMap.CommonTitleMr}</option> + <option>${uiLabelMap.CommonTitleMrs}</option> + <option>${uiLabelMap.CommonTitleMs}</option> + <option>${uiLabelMap.CommonTitleDr}</option> + </select> + </td> + </tr> + <tr> + <td align="right">${uiLabelMap.PartyFirstName}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="30" name="firstName" value="${personData.firstName?if_exists}"/> *</td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyMiddleInitial}</div></td> - <td width="74%"> - <input type="text" class='inputBox' size="4" maxlength="4" name="middleName" value="${personData.middleName?if_exists}"/> + <td align="right">${uiLabelMap.PartyMiddleInitial}</td> + <td> + <input type="text" class='inputBox' size="4" maxlength="4" name="middleName" value="${personData.middleName?if_exists}"/> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyLastName} </div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyLastName}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="30" name="lastName" value="${personData.lastName?if_exists}"/> *</td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartySuffix}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartySuffix}</td> + <td> <input type="text" class='inputBox' size="10" maxlength="30" name="suffix" value="${personData.suffix?if_exists}"/> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyNickName}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyNickName}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="60" name="nickname" value="${personData.nickname?if_exists}"/> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyGender}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyGender}</td> + <td> <select name="gender" class='selectBox'> <#if personData.gender?has_content > <option value="${personData.gender}"> @@ -95,34 +95,34 @@ </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyBirthDate}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyBirthDate}</td> + <td> <input type="text" class='inputBox' size="11" maxlength="20" name="birthDate" value="${personData.birthDate?if_exists}"/> <div class="tabletext">${uiLabelMap.CommonFormatDate}</div> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyHeight}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyHeight}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="60" name="height" value="${personData.height?if_exists}"/> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyWeight}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyWeight}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="60" name="weight" value="${personData.weight?if_exists}"/> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyMaidenName}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyMaidenName}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="60" name="mothersMaidenName" value="${personData.mothersMaidenName?if_exists}"/> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyMaritalStatus}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyMaritalStatus}</td> + <td> <select name="maritalStatus" class='selectBox'> <#if personData.maritalStatus?has_content> <option value="${personData.maritalStatus}"> @@ -141,38 +141,39 @@ </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartySocialSecurityNumber}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartySocialSecurityNumber}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="60" name="socialSecurityNumber" value="${personData.socialSecurityNumber?if_exists}"/> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyPassportNumber}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyPassportNumber}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="60" name="passportNumber" value="${personData.passportNumber?if_exists}"/> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyPassportExpireDate}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyPassportExpireDate}</td> + <td> <input type="text" class='inputBox' size="11" maxlength="20" name="passportExpireDate" value="${personData.passportExpireDate?if_exists}"/> <div class="tabletext">${uiLabelMap.CommonFormatDate}</div> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyTotalYearsWorkExperience}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.PartyTotalYearsWorkExperience}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="60" name="totalYearsWorkExperience" value="${personData.totalYearsWorkExperience?if_exists}"/> </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonComment}</div></td> - <td width="74%"> + <td align="right">${uiLabelMap.CommonComment}</td> + <td> <input type="text" class='inputBox' size="30" maxlength="60" name="comments" value="${personData.comments?if_exists}"/> </td> </tr> </table> +</div> </form> - <a href='<@ofbizUrl>authview/${donePage}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonGoBack}</a> - <a href="javascript:document.editpersonform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> +<a href='<@ofbizUrl>authview/${donePage}</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> +<a href="javascript:document.editpersonform.submit()" class="button">${uiLabelMap.CommonSave}</a> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=806206&r1=806205&r2=806206&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Thu Aug 20 15:12:57 2009 @@ -18,7 +18,8 @@ --> <#if getUsername> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> + //<![CDATA[ lastFocusedName = null; function setLastFocused(formElement) { lastFocusedName = formElement.name; @@ -55,6 +56,7 @@ document.getElementById("customerState").style.display = "none"; } } + //]]> </script> </#if> @@ -92,7 +94,7 @@ </#macro> <form method="post" action="<@ofbizUrl>createcustomer${previousParams}</@ofbizUrl>" name="newuserform"> - <input type="hidden" name="emailProductStoreId" value="${productStoreId}"/> + <#---------------------------------------------------------------------- If you need to include a brief explanation of the form, or certain @@ -110,7 +112,7 @@ <fieldset class="col"> <legend>${uiLabelMap.PartyFullName}</legend> - + <input type="hidden" name="emailProductStoreId" value="${productStoreId}"/> <#---------------------------------------------------------------------- Each input row should be enclosed in a <div></div> with a class name of "form-row". This will ensure than each input field clears the one @@ -133,7 +135,7 @@ <div class="form-row"> <label for="USER_TITLE">${uiLabelMap.CommonTitle}</label> <@fieldErrors fieldName="USER_TITLE"/> - <select name="USER_TITLE"> + <select name="USER_TITLE" id="USER_TITLE"> <#if requestParameters.USER_TITLE?has_content > <option>${requestParameters.USER_TITLE}</option> <option value="${requestParameters.USER_TITLE}"> -- </option> @@ -150,25 +152,25 @@ <div class="form-row"> <label for="USER_FIRST_NAME">${uiLabelMap.PartyFirstName}*</label> <@fieldErrors fieldName="USER_FIRST_NAME"/> - <input type="text" name="USER_FIRST_NAME" value="${requestParameters.USER_FIRST_NAME?if_exists}"> + <input type="text" name="USER_FIRST_NAME" id="USER_FIRST_NAME" value="${requestParameters.USER_FIRST_NAME?if_exists}" /> </div> <div class="form-row"> <label for="USER_MIDDLE_NAME">${uiLabelMap.PartyMiddleInitial}</label> <@fieldErrors fieldName="USER_MIDDLE_NAME"/> - <input type="text" name="USER_MIDDLE_NAME" value="${requestParameters.USER_MIDDLE_NAME?if_exists}"> + <input type="text" name="USER_MIDDLE_NAME" id="USER_MIDDLE_NAME" value="${requestParameters.USER_MIDDLE_NAME?if_exists}" /> </div> <div class="form-row"> <label for="USER_LAST_NAME">${uiLabelMap.PartyLastName}*</label> <@fieldErrors fieldName="USER_LAST_NAME"/> - <input type="text" name="USER_LAST_NAME" value="${requestParameters.USER_LAST_NAME?if_exists}"> + <input type="text" name="USER_LAST_NAME" id="USER_LAST_NAME" value="${requestParameters.USER_LAST_NAME?if_exists}" /> </div> <div class="form-row"> <label for="USER_SUFFIX">${uiLabelMap.PartySuffix}</label> <@fieldErrors fieldName="USER_SUFFIX"/> - <input type="text" class='inputBox' name="USER_SUFFIX" value="${requestParameters.USER_SUFFIX?if_exists}"> + <input type="text" class='inputBox' name="USER_SUFFIX" id="USER_SUFFIX" value="${requestParameters.USER_SUFFIX?if_exists}" /> </div> </fieldset> @@ -178,31 +180,31 @@ <div class="form-row"> <label for="CUSTOMER_ADDRESS1">${uiLabelMap.PartyAddressLine1}*</label> <@fieldErrors fieldName="CUSTOMER_ADDRESS1"/> - <input type="text" name="CUSTOMER_ADDRESS1" value="${requestParameters.CUSTOMER_ADDRESS1?if_exists}"> + <input type="text" name="CUSTOMER_ADDRESS1" id="CUSTOMER_ADDRESS1" value="${requestParameters.CUSTOMER_ADDRESS1?if_exists}" /> </div> <div class="form-row"> <label for="CUSTOMER_ADDRESS2">${uiLabelMap.PartyAddressLine2}</label> <@fieldErrors fieldName="CUSTOMER_ADDRESS2"/> - <input type="text" name="CUSTOMER_ADDRESS2" value="${requestParameters.CUSTOMER_ADDRESS2?if_exists}"> + <input type="text" name="CUSTOMER_ADDRESS2" id="CUSTOMER_ADDRESS2" value="${requestParameters.CUSTOMER_ADDRESS2?if_exists}" /> </div> <div class="form-row"> <label for="CUSTOMER_CITY">${uiLabelMap.PartyCity}*</label> <@fieldErrors fieldName="CUSTOMER_CITY"/> - <input type="text" name="CUSTOMER_CITY" value="${requestParameters.CUSTOMER_CITY?if_exists}"> + <input type="text" name="CUSTOMER_CITY" id="CUSTOMER_CITY" value="${requestParameters.CUSTOMER_CITY?if_exists}" /> </div> <div class="form-row"> <label for="CUSTOMER_POSTAL_CODE">${uiLabelMap.PartyZipCode}*</label> <@fieldErrors fieldName="CUSTOMER_POSTAL_CODE"/> - <input type="text" name="CUSTOMER_POSTAL_CODE" value="${requestParameters.CUSTOMER_POSTAL_CODE?if_exists}"> + <input type="text" name="CUSTOMER_POSTAL_CODE" id="CUSTOMER_POSTAL_CODE" value="${requestParameters.CUSTOMER_POSTAL_CODE?if_exists}" /> </div> <div class="form-row"> - <label for="CUSTOMER_COUNTRY">${uiLabelMap.PartyCountry}*</label> + <label for="customerCountry">${uiLabelMap.PartyCountry}*</label> <@fieldErrors fieldName="CUSTOMER_COUNTRY"/> - <select name="CUSTOMER_COUNTRY" onClick="hideShowUsaStates();" id="customerCountry"> + <select name="CUSTOMER_COUNTRY" onclick="hideShowUsaStates();" id="customerCountry"> <#if requestParameters.CUSTOMER_COUNTRY?exists> <option value='${requestParameters.CUSTOMER_COUNTRY}'>${selectedCountryName?default(requestParameters.CUSTOMER_COUNTRY)}</option> </#if> @@ -211,7 +213,7 @@ </div> <div class="form-row"> - <label for="CUSTOMER_STATE">${uiLabelMap.PartyState}*</label> + <label for="customerState">${uiLabelMap.PartyState}*</label> <@fieldErrors fieldName="CUSTOMER_STATE"/> <select name="CUSTOMER_STATE" id="customerState"> <#if requestParameters.CUSTOMER_STATE?exists> @@ -224,7 +226,7 @@ <div class="form-row"> <label for="CUSTOMER_ADDRESS_ALLOW_SOL">${uiLabelMap.PartyAllowAddressSolicitation}</label> - <select name="CUSTOMER_ADDRESS_ALLOW_SOL"> + <select name="CUSTOMER_ADDRESS_ALLOW_SOL" id="CUSTOMER_ADDRESS_ALLOW_SOL"> <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> <option>--</option> @@ -251,10 +253,10 @@ <tbody> <tr> <th scope="row">${uiLabelMap.PartyHomePhone}</th> - <td><input type="text" name="CUSTOMER_HOME_COUNTRY" size=5 value="${requestParameters.CUSTOMER_HOME_COUNTRY?if_exists}"></td> - <td><input type="text" name="CUSTOMER_HOME_AREA" size=5 value="${requestParameters.CUSTOMER_HOME_AREA?if_exists}"></td> - <td><input type="text" name="CUSTOMER_HOME_CONTACT" value="${requestParameters.CUSTOMER_HOME_CONTACT?if_exists}"></td> - <td><input type="text" name="CUSTOMER_HOME_EXT" size=6 value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}"></td> + <td><input type="text" name="CUSTOMER_HOME_COUNTRY" size="5" value="${requestParameters.CUSTOMER_HOME_COUNTRY?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_HOME_AREA" size="5" value="${requestParameters.CUSTOMER_HOME_AREA?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_HOME_CONTACT" value="${requestParameters.CUSTOMER_HOME_CONTACT?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_HOME_EXT" size="6" value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}"/></td> <td> <select name="CUSTOMER_HOME_ALLOW_SOL"> <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -267,10 +269,10 @@ </tr> <tr> <th scope="row">${uiLabelMap.PartyBusinessPhone}</th> - <td><input type="text" name="CUSTOMER_WORK_COUNTRY" size=5 value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}"></td> - <td><input type="text" name="CUSTOMER_WORK_AREA" size=5 value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}"></td> - <td><input type="text" name="CUSTOMER_WORK_CONTACT" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}"></td> - <td><input type="text" name="CUSTOMER_WORK_EXT" size=6 value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}"></td> + <td><input type="text" name="CUSTOMER_WORK_COUNTRY" size="5" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_WORK_AREA" size="5" value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_WORK_CONTACT" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_WORK_EXT" size="6" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" /></td> <td> <select name="CUSTOMER_WORK_ALLOW_SOL"> <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -283,9 +285,9 @@ </tr> <tr> <th scope="row">${uiLabelMap.PartyFaxNumber}</th> - <td><input type="text" name="CUSTOMER_FAX_COUNTRY" size=5 value="${requestParameters.CUSTOMER_FAX_COUNTRY?if_exists}"></td> - <td><input type="text" name="CUSTOMER_FAX_AREA" size=5 value="${requestParameters.CUSTOMER_FAX_AREA?if_exists}"></td> - <td><input type="text" name="CUSTOMER_FAX_CONTACT" value="${requestParameters.CUSTOMER_FAX_CONTACT?if_exists}"></td> + <td><input type="text" name="CUSTOMER_FAX_COUNTRY" size="5" value="${requestParameters.CUSTOMER_FAX_COUNTRY?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_FAX_AREA" size="5" value="${requestParameters.CUSTOMER_FAX_AREA?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_FAX_CONTACT" value="${requestParameters.CUSTOMER_FAX_CONTACT?if_exists}" /></td> <td></td> <td> <select name="CUSTOMER_FAX_ALLOW_SOL"> @@ -299,9 +301,9 @@ </tr> <tr> <th scope="row">${uiLabelMap.PartyMobilePhone}</th> - <td><input type="text" name="CUSTOMER_MOBILE_COUNTRY" size=5 value="${requestParameters.CUSTOMER_MOBILE_COUNTRY?if_exists}"></td> - <td><input type="text" name="CUSTOMER_MOBILE_AREA" size=5 value="${requestParameters.CUSTOMER_MOBILE_AREA?if_exists}"></td> - <td><input type="text" name="CUSTOMER_MOBILE_CONTACT" value="${requestParameters.CUSTOMER_MOBILE_CONTACT?if_exists}"></td> + <td><input type="text" name="CUSTOMER_MOBILE_COUNTRY" size="5" value="${requestParameters.CUSTOMER_MOBILE_COUNTRY?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_MOBILE_AREA" size="5" value="${requestParameters.CUSTOMER_MOBILE_AREA?if_exists}" /></td> + <td><input type="text" name="CUSTOMER_MOBILE_CONTACT" value="${requestParameters.CUSTOMER_MOBILE_CONTACT?if_exists}" /></td> <td></td> <td> <select name="CUSTOMER_MOBILE_ALLOW_SOL"> @@ -322,11 +324,11 @@ <div class="form-row"> <label for= "CUSTOMER_EMAIL">${uiLabelMap.PartyEmailAddress}*</label> <@fieldErrors fieldName="CUSTOMER_EMAIL"/> - <input type="text" name="CUSTOMER_EMAIL" value="${requestParameters.CUSTOMER_EMAIL?if_exists}" onchange="changeEmail()" onkeyup="changeEmail()"> + <input type="text" name="CUSTOMER_EMAIL" id="CUSTOMER_EMAIL" value="${requestParameters.CUSTOMER_EMAIL?if_exists}" onchange="changeEmail()" onkeyup="changeEmail()" /> </div> <div class="form-row"> <label for="CUSTOMER_EMAIL_ALLOW_SOL">${uiLabelMap.PartyAllowSolicitation}</label> - <select name="CUSTOMER_EMAIL_ALLOW_SOL"> + <select name="CUSTOMER_EMAIL_ALLOW_SOL" id="CUSTOMER_EMAIL_ALLOW_SOL"> <#if (((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> <#if (((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> <option></option> @@ -342,13 +344,13 @@ <@fieldErrors fieldName="USERNAME"/> <div class="form-row inline"> <label for="UNUSEEMAIL"> - <input type="checkbox" class="checkbox" name="UNUSEEMAIL" value="on" onClick="setEmailUsername();" onFocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress} + <input type="checkbox" class="checkbox" name="UNUSEEMAIL" id="UNUSEEMAIL" value="on" onclick="setEmailUsername();" onfocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress} </label> </div> <div class="form-row"> <label for="USERNAME">${uiLabelMap.CommonUsername}*</label> - <input type="text" name="USERNAME" value="${requestParameters.USERNAME?if_exists}" onFocus="clickUsername();" onchange="changeEmail();"/> + <input type="text" name="USERNAME" id="USERNAME" value="${requestParameters.USERNAME?if_exists}" onfocus="clickUsername();" onchange="changeEmail();"/> </div> </#if> </fieldset> @@ -359,19 +361,19 @@ <div class="form-row"> <label for="PASSWORD">${uiLabelMap.CommonPassword}*</label> <@fieldErrors fieldName="PASSWORD"/> - <input type="password" name="PASSWORD" onFocus="setLastFocused(this);"/> + <input type="password" name="PASSWORD" id="PASSWORD" onfocus="setLastFocused(this);"/> </div> <div class="form-row"> <label for="CONFIRM_PASSWORD">${uiLabelMap.PartyRepeatPassword}*</label> <@fieldErrors fieldName="CONFIRM_PASSWORD"/> - <input type="password" class='inputBox' name="CONFIRM_PASSWORD" value="" maxlength="50"/> + <input type="password" class='inputBox' name="CONFIRM_PASSWORD" id="CONFIRM_PASSWORD" value="" maxlength="50"/> </div> <div class="form-row"> <label for="PASSWORD_HINT">${uiLabelMap.PartyPasswordHint}</label> <@fieldErrors fieldName="PASSWORD_HINT"/> - <input type="text" class='inputBox' name="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" maxlength="100"/> + <input type="text" class='inputBox' name="PASSWORD_HINT" id="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" maxlength="100"/> </div> <#else/> <div class="form-row"> @@ -392,6 +394,8 @@ <a href="<@ofbizUrl>checkLogin/main</@ofbizUrl>" class="button reset">${uiLabelMap.CommonBack}</a> </div> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> + //<![CDATA[ hideShowUsaStates(); + //]]> </script> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |