svn commit: r1751342 - in /ofbiz/trunk/applications/orde
Locked
svn commit: r1751342 - in /ofbiz/trunk/applications/orde
 
|
Author: diveshdutta
Date: Mon Jul 4 16:50:38 2016 New Revision: 1751342 URL: http://svn.apache.org/viewvc?rev=1751342&view=rev Log: [OFBIZ-7580] Order Component: Checkbox and Radio buttons should get selected on clicking upon their labels. Thanks Mohammad Kathawala for your patch. Modified: ofbiz/trunk/applications/order/template/entry/BillSettings.ftl ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl ofbiz/trunk/applications/order/template/entry/CheckoutPayment.ftl ofbiz/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl ofbiz/trunk/applications/order/template/entry/OptionSettings.ftl ofbiz/trunk/applications/order/template/entry/ShipSettings.ftl ofbiz/trunk/applications/order/template/entry/cart/ShowCart.ftl ofbiz/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl ofbiz/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl ofbiz/trunk/applications/order/template/order/AppendOrderItem.ftl ofbiz/trunk/applications/order/template/order/FindOrders.ftl ofbiz/trunk/applications/order/template/order/OrderInfo.ftl ofbiz/trunk/applications/order/template/order/OrderList.ftl ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl ofbiz/trunk/applications/order/template/return/QuickReturn.ftl ofbiz/trunk/applications/order/template/return/ReturnItemInc.ftl Modified: ofbiz/trunk/applications/order/template/entry/BillSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/BillSettings.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/BillSettings.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/BillSettings.ftl Mon Jul 4 16:50:38 2016 @@ -77,15 +77,17 @@ function makeExpDate() { </#if> <tr> <td> + <label for="checkOutPaymentId_EXT_OFFLINE"> <input type="radio" id="checkOutPaymentId_EXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/> - <label for="checkOutPaymentId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label> + ${uiLabelMap.OrderPaymentOfflineCheckMoney}</label> </td> </tr> <tr><td colspan="3"><hr /></td></tr> <tr> <td> + <label for="checkOutPaymentId_EXT_COD"> <input type="radio" id="checkOutPaymentId_EXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if>/> - <label for="checkOutPaymentId_EXT_COD">${uiLabelMap.OrderCOD}</label> + ${uiLabelMap.OrderCOD}</label> </td> </tr> <tr><td colspan="3"><hr /></td></tr> @@ -95,8 +97,8 @@ function makeExpDate() { <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)> <tr> <td> - <input type="radio" id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/> <label for="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}"> + <input type="radio" id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/> CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if> </label> @@ -110,8 +112,8 @@ function makeExpDate() { <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> <tr> <td> - <input type="radio" id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/> <label for="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}"> + <input type="radio" id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/> EFT: ${eftAccount.bankName!}: ${eftAccount.accountNumber!} <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if> </label> @@ -163,11 +165,11 @@ function makeExpDate() { <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if cart.getShippingContactMechId()??> <tr> - <td width="26%" align="right"= valign="top"> + <td align="right"= valign="top"> + <label> <input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr??>checked="checked"</#if>/> - </td> - <td colspan="2" valign="center"> - <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div> + ${uiLabelMap.FacilityBillingAddressSameShipping} + </label> </td> </tr> <tr> @@ -475,24 +477,20 @@ function makeExpDate() { <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if "Y" != requestParameters.createNew?default("")> <tr> - <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td> - <td width='50%' nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td> + <td nowrap="nowrap"><label><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/> ${uiLabelMap.OrderPaymentOfflineCheckMoney}</label></td> </tr> <tr><td colspan="2"><hr /></td></tr> <tr> - <td width="1%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td> - <td width="50%" nowrap="nowrap"><div>${uiLabelMap.OrderCOD}</div></td> + <td width="1%" nowrap="nowrap"><label><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/> ${uiLabelMap.OrderCOD}</label></td> </tr> <tr><td colspan="2"><hr /></td></tr> </#if> <tr> - <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="CC" onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/> - <td width='50%' nowrap="nowrap"><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td> + <td width='1%' nowrap="nowrap"><label><input type="radio" name="paymentMethodTypeAndId" value="CC" onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</label></td> </tr> <tr><td colspan="2"><hr /></td></tr> <tr> - <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EFT" onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/> - <td width='50%' nowrap="nowrap"><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td> + <td width='1%' nowrap="nowrap"><label><input type="radio" name="paymentMethodTypeAndId" value="EFT" onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/>${uiLabelMap.AccountingAHCElectronicCheck}</label></td> </tr> </table> </form> Modified: ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl Mon Jul 4 16:50:38 2016 @@ -123,11 +123,10 @@ function submitForm(form, mode, value) { <#list shippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> <tr> - <td valign="top" width="1%"> + <td valign="top"> + <label> <input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}" onclick="javascript:submitForm(document.checkoutInfoForm, 'SA', null);"<#if shoppingCart.getShippingContactMechId()?default("") == shippingAddress.contactMechId> checked="checked"</#if>/> - </td> - <td valign="top" width="99%"> - <div> + <span> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br /></#if> <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> @@ -137,7 +136,8 @@ function submitForm(form, mode, value) { <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> <a href="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a> - </div> + </span> + </label> </td> </tr> <#if shippingContactMech_has_next> @@ -172,27 +172,27 @@ function submitForm(form, mode, value) { <#list carrierShipmentMethodList as carrierShipmentMethod> <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> <tr> - <td width="1%" valign="top"> - <input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/> - </td> <td valign="top"> - <div> + <label> + <input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/> + <span> <#if shoppingCart.getShippingContactMechId()??> <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)> </#if> <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!} <#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if> - </div> + </span> + </label> </td> </tr> </#list> <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0> <tr> - <td width="1%" valign="top"> - <input type="radio" name="shipping_method" value="Default" checked="checked"/> - </td> <td valign="top"> - <div>${uiLabelMap.OrderUseDefault}.</div> + <label> + <input type="radio" name="shipping_method" value="Default" checked="checked"/> + ${uiLabelMap.OrderUseDefault}. + </label> </td> </tr> </#if> @@ -204,18 +204,18 @@ function submitForm(form, mode, value) { </tr> <tr> <td valign="top"> + <label> <input type="radio" <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if> name="may_split" value="false"/> - </td> - <td valign="top"> - <div>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div> + ${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}. + </label> </td> </tr> <tr> <td valign="top"> + <label> <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if> type="radio" name="may_split" value="true"/> - </td> - <td valign="top"> - <div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div> + ${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}. + </label> </td> </tr> <tr><td colspan="2"><hr /></td></tr> @@ -241,8 +241,8 @@ function submitForm(form, mode, value) { <td colspan="2"> <div> <span class="h2"><b>${uiLabelMap.OrderIsThisGift}</b></span> - <input type="radio" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"><span>${uiLabelMap.CommonYes}</span> - <input type="radio" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"><span>${uiLabelMap.CommonNo}</span> + <label><input type="radio" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"><span>${uiLabelMap.CommonYes}</span></label> + <label><input type="radio" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"><span>${uiLabelMap.CommonNo}</span></label> </div> </td> </tr> @@ -320,32 +320,40 @@ function submitForm(form, mode, value) { <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??> <tr> <td> + <label> <input type="radio" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if>/> <span>${uiLabelMap.OrderMoneyOrder}</span> + </label> </td> </tr> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_COD??> <tr> <td> + <label> <input type="radio" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if>/> <span>${uiLabelMap.OrderCOD}</span> + </label> </td> </tr> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??> <tr> <td> + <label> <input type="radio" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if>/> <span>${uiLabelMap.AccountingPayWithWorldPay}</span> + </label> </td> </tr> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??> <tr> <td> + <label> <input type="radio" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if>/> <span>${uiLabelMap.AccountingPayWithPayPal}</span> + </label> </td> </tr> </#if> @@ -355,8 +363,10 @@ function submitForm(form, mode, value) { <#list finAccounts as finAccount> <tr> <td> + <label> <input type="radio" name="checkOutPaymentId" value="FIN_ACCOUNT|${finAccount.finAccountId}" <#if "FIN_ACCOUNT" == checkOutPaymentId>checked="checked"</#if>/> <span>${uiLabelMap.AccountingFinAccount} #${finAccount.finAccountId}</span> + </label> </td> </tr> </#list> @@ -376,8 +386,10 @@ function submitForm(form, mode, value) { <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)> <tr> <td> + <label> <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/> <span>CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</span> + </label> <a href="javascript:submitForm(document.checkoutInfoForm, 'EC', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a> <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if> ${uiLabelMap.OrderCardSecurityCode} <input type="text" size="5" maxlength="10" name="securityCode_${paymentMethod.paymentMethodId}" value=""/> @@ -389,8 +401,10 @@ function submitForm(form, mode, value) { <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> <tr> <td> + <label> <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/> <span>${uiLabelMap.AccountingEFTAccount}: ${eftAccount.bankName!}: ${eftAccount.accountNumber!}</span> + </label> <a href="javascript:submitForm(document.checkoutInfoForm, 'EE', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a> <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if> </td> @@ -418,8 +432,10 @@ function submitForm(form, mode, value) { <tr> <td> + <label> <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/> <span>${uiLabelMap.AccountingGift}: ${giftCardNumber}</span> + </label> <a href="javascript:submitForm(document.checkoutInfoForm, 'EG', '${paymentMethod.paymentMethodId}');" class="buttontext">[${uiLabelMap.CommonUpdate}]</a> <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if> </td> @@ -460,8 +476,10 @@ function submitForm(form, mode, value) { <tr><td colspan="2"><hr /></td></tr> <tr> <td> + <label> <input type="checkbox" name="addGiftCard" value="Y"/> <span>${uiLabelMap.AccountingUseGiftCardNotOnFile}</span> + </label> </td> </tr> <tr> Modified: ofbiz/trunk/applications/order/template/entry/CheckoutPayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/CheckoutPayment.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/CheckoutPayment.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/CheckoutPayment.ftl Mon Jul 4 16:50:38 2016 @@ -109,32 +109,37 @@ var issuerId = ""; <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??> </div> <div> + <label for="checkOutPaymentId_OFFLINE"> <input type="radio" id="checkOutPaymentId_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if> /> - <label for="checkOutPaymentId_OFFLINE">${uiLabelMap.OrderMoneyOrder}</label> + ${uiLabelMap.OrderMoneyOrder}</label> </div> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_COD??> <div> + <label for="checkOutPaymentId_COD"> <input type="radio" id="checkOutPaymentId_COD" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if> /> - <label for="checkOutPaymentId_COD">${uiLabelMap.OrderCOD}</label> + ${uiLabelMap.OrderCOD}</label> </div> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??> <div> + <label for="checkOutPaymentId_WORLDPAY"> <input type="radio" id="checkOutPaymentId_WORLDPAY" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if> /> - <label for="checkOutPaymentId_WORLDPAY">${uiLabelMap.AccountingPayWithWorldPay}</label> + ${uiLabelMap.AccountingPayWithWorldPay}</label> </div> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??> <div> + <label for="checkOutPaymentId_PAYPAL"> <input type="radio" id="checkOutPaymentId_PAYPAL" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if> /> - <label for="checkOutPaymentId_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label> + ${uiLabelMap.AccountingPayWithPayPal}</label> </div> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_IDEAL??> <div> + <label for="checkOutPaymentId_IDEAL"> <input type="radio" id="checkOutPaymentId_IDEAL" name="checkOutPaymentId" value="EXT_IDEAL" <#if "EXT_IDEAL" == checkOutPaymentId>checked="checked"</#if> /> - <label for="checkOutPaymentId_IDEAL">${uiLabelMap.AccountingPayWithiDEAL}</label> + ${uiLabelMap.AccountingPayWithiDEAL}</label> </div> <div id="issuers"> @@ -197,8 +202,9 @@ var issuerId = ""; <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??> <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false) /> <div> + <label for="checkOutPayment_${paymentMethod.paymentMethodId}"> <input type="radio" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if> /> - <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingEFTAccount}:${eftAccount.bankName!}: ${eftAccount.accountNumber!}</label> + ${uiLabelMap.AccountingEFTAccount}:${eftAccount.bankName!}: ${eftAccount.accountNumber!}</label> <#if paymentMethod.description?has_content><p>(${paymentMethod.description})</p></#if> <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EE', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a> </div> Modified: ofbiz/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl Mon Jul 4 16:50:38 2016 @@ -78,11 +78,10 @@ function toggleBillingAccount(box) { <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> <#assign checkThisAddress = (shippingContactMech_index == 0 && !cart.getShippingContactMechId()?has_content) || (cart.getShippingContactMechId()?default("") == shippingAddress.contactMechId)/> <tr> - <td valign="top" width="1%" nowrap="nowrap"> + <td valign="top" nowrap="nowrap"> + <label> <input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}"<#if checkThisAddress> checked="checked"</#if> /> - </td> - <td valign="top" width="99%" nowrap="nowrap"> - <div> + <span> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br /></#if> <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> @@ -92,7 +91,8 @@ function toggleBillingAccount(box) { <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> <a href="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a> - </div> + </span> + </label> </td> </tr> <tr><td colspan="2"><hr /></td></tr> @@ -123,7 +123,7 @@ function toggleBillingAccount(box) { </tr> <#else> <#list agreements as agreement> - <input type="radio" name="agreementId" value="${agreement.agreementId!}"<#if checkThisAddress> checked="checked"</#if> />${agreement.description!} will be used for this order. + <label><input type="radio" name="agreementId" value="${agreement.agreementId!}"<#if checkThisAddress> checked="checked"</#if> />${agreement.description!} will be used for this order.</label> </#list> </#if> </#if> Modified: ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl Mon Jul 4 16:50:38 2016 @@ -34,7 +34,7 @@ under the License. <span>${uiLabelMap.CommonId}: </span><input type="text" name="partyTaxId" size="12" maxlength="40"/> <#if productStore.showTaxIsExempt?default("Y") == "Y"> - <span>${uiLabelMap.PartyTaxIsExempt} </span><input type="checkbox" name="isExempt" value="Y"/> + <label><span>${uiLabelMap.PartyTaxIsExempt} </span><input type="checkbox" name="isExempt" value="Y"/></label> <#else> <input type="hidden" name="isExempt" value="N"/> </#if> Modified: ofbiz/trunk/applications/order/template/entry/OptionSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/OptionSettings.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/OptionSettings.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/OptionSettings.ftl Mon Jul 4 16:50:38 2016 @@ -78,8 +78,6 @@ under the License. <td width='1%' valign="top" > <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> <input type='radio' name='${shipGroupIndex?default("0")}_shipping_method' value='${shippingMethod}'<#if shippingMethod == chosenShippingMethod?default("N@A")> checked="checked"</#if> id='${shipGroupIndex?default("0")}_shipping_method_${shippingMethod}' /> - </td> - <td valign="top"> <label for="${shipGroupIndex?default("0")}_shipping_method_${shippingMethod}"> <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!} <#if cart.getShippingContactMechId(shipGroupIndex)??> @@ -99,11 +97,11 @@ under the License. </#list> <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0> <tr> - <td width='1%' valign="top"> - <input type='radio' name='${shipGroupIndex?default("0")}_shipping_method' value="Default" checked="checked" /> - </td> <td valign="top"> - <div class='tabletext'>${uiLabelMap.FacilityNoOtherShippingMethods}</div> + <label> + <input type='radio' name='${shipGroupIndex?default("0")}_shipping_method' value="Default" checked="checked" /> + ${uiLabelMap.FacilityNoOtherShippingMethods} + </label> </td> </tr> </#if> @@ -127,18 +125,18 @@ under the License. </tr> <tr> <td valign="top"> + <label> <input type='radio' <#if cart.getMaySplit(shipGroupIndex)?default("N") == "N">checked="checked"</#if> name='${shipGroupIndex?default("0")}_may_split' value='false' /> - </td> - <td valign="top"> - <div>${uiLabelMap.FacilityWaitEntireOrderReady}</div> + ${uiLabelMap.FacilityWaitEntireOrderReady} + </label> </td> </tr> <tr> <td valign="top"> + <label> <input <#if cart.getMaySplit(shipGroupIndex)?default("N") == "Y">checked="checked"</#if> type='radio' name='${shipGroupIndex?default("0")}_may_split' value='true' /> - </td> - <td valign="top"> - <div>${uiLabelMap.FacilityShipAvailable}</div> + ${uiLabelMap.FacilityShipAvailable} + </label> </td> </tr> <tr> @@ -184,8 +182,8 @@ under the License. <td colspan="2"> <div> <span class="h2"><b>${uiLabelMap.OrderIsThisGift}</b></span> - <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('Y') == 'Y'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="true" /><span>${uiLabelMap.CommonYes}</span> - <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('N') == 'N'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="false" /><span>${uiLabelMap.CommonNo}</span> + <label><input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('Y') == 'Y'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="true" /><span>${uiLabelMap.CommonYes}</span></label> + <label><input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('N') == 'N'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="false" /><span>${uiLabelMap.CommonNo}</span></label> </div> </td> </tr> Modified: ofbiz/trunk/applications/order/template/entry/ShipSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/ShipSettings.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/ShipSettings.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/ShipSettings.ftl Mon Jul 4 16:50:38 2016 @@ -79,11 +79,9 @@ under the License. <#elseif i == 0 && !shipToPartyShippingContactMechList?has_content> <#assign checked='checked' /> </#if> + <label> <input type="radio" id="shipToSameParty" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}_@_${facility.facilityId}" ${checked}/> - </td> - <td nowrap="nowrap"> </td> - <td valign="top" width="100%" nowrap="nowrap"> - <div> + <span> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> @@ -92,8 +90,10 @@ under the License. <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> - </div> + </span> + </label> </td> + <td nowrap="nowrap"> </td> <td> <div><a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&contactMechId=${shippingAddress.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div> </td> @@ -127,11 +127,9 @@ under the License. <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> <tr> <td valign="top" nowrap="nowrap"> + <label> <input type="radio" id="shipToOtherParty" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"s/> - </td> - <td nowrap="nowrap"> </td> - <td valign="top" width="100%" nowrap="nowrap"> - <div> + <span> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> @@ -140,8 +138,10 @@ under the License. <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> - </div> + </span> + </label> </td> + <td nowrap="nowrap"> </td> <td> <div><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div> </td> @@ -221,10 +221,9 @@ under the License. </#if> <tr> <td valign="top" width="1%" nowrap="nowrap"> + <label> <input type="radio" id="shipToSameParty" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" ${checkedValue} /> - </td> - <td valign="top" width="99%" nowrap="nowrap"> - <div> + <span> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> @@ -233,7 +232,8 @@ under the License. <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> - </div> + </span> + </label> </td> <td> <div><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div> @@ -253,10 +253,9 @@ under the License. <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> <tr> <td valign="top" width="1%" nowrap="nowrap"> + <label> <input type="radio" id="shipToOtherParty" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/> - </td> - <td valign="top" width="99%" nowrap="nowrap"> - <div> + <span> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> @@ -265,7 +264,8 @@ under the License. <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> - </div> + </span> + </label> </td> <td> </td> </tr> Modified: ofbiz/trunk/applications/order/template/entry/cart/ShowCart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/ShowCart.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/cart/ShowCart.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/cart/ShowCart.ftl Mon Jul 4 16:50:38 2016 @@ -110,8 +110,10 @@ under the License. <#assign value = defaultDesiredDeliveryDate> </#if> <@htmlTemplate.renderDateTimeField name="itemDesiredDeliveryDate" value="${value!''}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <label> <input type="checkbox" name="useAsDefaultDesiredDeliveryDate" value="true"<#if useAsDefaultDesiredDeliveryDate??> checked="checked"</#if>/> ${uiLabelMap.OrderUseDefaultDesiredDeliveryDate} + </label> </div> </td> </tr> @@ -151,8 +153,10 @@ under the License. <td> <div> <input type="text" size="25" name="itemComment" value="${defaultComment!}" /> + <label> <input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment??>checked="checked"</#if> /> ${uiLabelMap.OrderUseDefaultComment} + </label> </div> </td> </tr> Modified: ofbiz/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl Mon Jul 4 16:50:38 2016 @@ -33,8 +33,8 @@ under the License. <td valign="middle"> <div> <b>"${(searchCategory.description)!}"</b>${uiLabelMap.ProductIncludeSubCategories} - ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /> - ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N" /> + <label>${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /></label> + <label>${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N" /></label> </div> </td> </tr> @@ -46,8 +46,8 @@ under the License. <td valign="middle"> <div> <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}" /> - ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /> - ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if> /> + <label>${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /></label> + <label>${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if> /></label> </div> </td> </tr> @@ -103,8 +103,8 @@ under the License. <option value="SortProductPrice:DEFAULT_PRICE">${uiLabelMap.ProductDefaultPrice}</option> <option value="SortProductPrice:AVERAGE_COST">${uiLabelMap.ProductAverageCost}</option> </select> - ${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked="checked" /> - ${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N" /> + <label>${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked="checked" /></label> + <label>${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N" /></label> </div> </td> </tr> @@ -119,8 +119,8 @@ under the License. </#list> <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> <div> - ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked" /> - ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N" /> + <label>${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked" /></label> + <label>${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N" /></label> </div> </td> </tr> Modified: ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl Mon Jul 4 16:50:38 2016 @@ -494,7 +494,7 @@ function getConfigDetails() { <#if renderSingleChoiceWithRadioButtons?? && "Y" == renderSingleChoiceWithRadioButtons> <#-- This is the radio button implementation --> <#if !question.isMandatory()> - <div><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked="checked"</#if>' /> No option</div> + <div><label><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked="checked"</#if>' /> No option</label></div> </#if> <#assign optionComment = ""> <#assign optionCounter = 0> @@ -511,8 +511,10 @@ function getConfigDetails() { <#-- Render virtual compoennts --> <#if option.hasVirtualComponent()> <div > + <label> <input type='radio' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');" /> ${option.description} <#if !option.isAvailable()> (*)</#if> + </label> <#assign components = option.getComponents()> <#list components as component> <#if (option.isVirtualComponent(component))> @@ -526,8 +528,10 @@ function getConfigDetails() { </div> <#else> <div> + <label> <input type="radio" name='${counter}' value='${optionCounter}' <#if option.isSelected() || (!question.isSelected() && optionCounter == 0 && question.isMandatory())>checked="checked"</#if> /> ${option.description} + </label> <#if (shownPrice > 0)>+<@ofbizCurrency amount=shownPrice isoCode=price.currencyUsed/> </#if> <#if (shownPrice < 0)>-<@ofbizCurrency amount=(-1*shownPrice) isoCode=price.currencyUsed/> </#if> <#if !option.isAvailable()>(*)</#if> @@ -575,8 +579,10 @@ function getConfigDetails() { <#-- Render virtual compoennts --> <#if option.hasVirtualComponent()> <div > + <label> <input type='CHECKBOX' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');" /> ${option.description} <#if !option.isAvailable()> (*)</#if> + </label> <#assign components = option.getComponents()> <#list components as component> <#if (option.isVirtualComponent(component))> @@ -590,8 +596,10 @@ function getConfigDetails() { </div> <#else> <div> + <label> <input type='CHECKBOX' name='${counter}' value='${optionCounter}' <#if option.isSelected()>checked="checked"</#if> /> ${option.description} +<@ofbizCurrency amount=option.price isoCode=price.currencyUsed/><#if !option.isAvailable()> (*)</#if> + </label> </div> </#if> <div>${uiLabelMap.CommonComments}: <input type="text" name='comments_${counter}_${optionCounter}' id='comments_${counter}_${optionCounter}' value='${option.comments!}' /></div> Modified: ofbiz/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl Mon Jul 4 16:50:38 2016 @@ -48,8 +48,8 @@ under the License. <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> </#if> <div> - <input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /><label for="SEARCH_OPERATOR_OR">${uiLabelMap.CommonAny}</label> - <input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if searchOperator == "AND">checked="checked"</#if> /><label for="SEARCH_OPERATOR_AND">${uiLabelMap.CommonAll}</label> + <label for="SEARCH_OPERATOR_OR"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> />${uiLabelMap.CommonAny}</label> + <label for="SEARCH_OPERATOR_AND"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if searchOperator == "AND">checked="checked"</#if> />${uiLabelMap.CommonAll}</label> <input type="submit" value="${uiLabelMap.CommonFind}" class="button" /> </div> </fieldset> Modified: ofbiz/trunk/applications/order/template/order/AppendOrderItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/AppendOrderItem.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/AppendOrderItem.ftl (original) +++ ofbiz/trunk/applications/order/template/order/AppendOrderItem.ftl Mon Jul 4 16:50:38 2016 @@ -70,7 +70,7 @@ under the License. <td class="label">${uiLabelMap.OrderPrice}</td> <td> <input type="text" size="6" name="basePrice" value="${requestParameters.price!}"/> - <input type="checkbox" name="overridePrice" value="Y"/> ${uiLabelMap.OrderOverridePrice} + <label><input type="checkbox" name="overridePrice" value="Y"/> ${uiLabelMap.OrderOverridePrice}</label> </td> </tr> <tr> Modified: ofbiz/trunk/applications/order/template/order/FindOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/FindOrders.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/FindOrders.ftl (original) +++ ofbiz/trunk/applications/order/template/order/FindOrders.ftl Mon Jul 4 16:50:38 2016 @@ -412,13 +412,13 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterInventoryProblems}</td> + <td width='25%' align='right' class='label'><label for="filterInventoryProblems">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterInventoryProblems}</label></td> <td width='5%'> </td> <td align='left'> <table class="basic-table" cellspacing='0'> <tr> <td nowrap="nowrap"> - <input type="checkbox" name="filterInventoryProblems" value="Y" + <input type="checkbox" id="filterInventoryProblems" name="filterInventoryProblems" value="Y" <#if requestParameters.filterInventoryProblems?default("N") == "Y">checked="checked"</#if> /> </td> </tr> @@ -426,13 +426,13 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPartiallyReceivedPOs}</td> + <td width='25%' align='right' class='label'><label for="filterPartiallyReceivedPOs">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPartiallyReceivedPOs}</label></td> <td width='5%'> </td> <td align='left'> <table class="basic-table" cellspacing='0'> <tr> <td nowrap="nowrap"> - <input type="checkbox" name="filterPartiallyReceivedPOs" value="Y" + <input type="checkbox" id="filterPartiallyReceivedPOs" name="filterPartiallyReceivedPOs" value="Y" <#if requestParameters.filterPartiallyReceivedPOs?default("N") == "Y">checked="checked"</#if> /> </td> </tr> @@ -440,13 +440,13 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsOpenPastTheirETA}</td> + <td width='25%' align='right' class='label'><label for="filterPOsOpenPastTheirETA">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsOpenPastTheirETA}</label></td> <td width='5%'> </td> <td align='left'> <table class="basic-table" cellspacing='0'> <tr> <td nowrap="nowrap"> - <input type="checkbox" name="filterPOsOpenPastTheirETA" value="Y" + <input type="checkbox" id="filterPOsOpenPastTheirETA" name="filterPOsOpenPastTheirETA" value="Y" <#if requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y">checked="checked"</#if> /> </td> </tr> @@ -454,13 +454,13 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsWithRejectedItems}</td> + <td width='25%' align='right' class='label'><label for="filterPOsWithRejectedItems">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsWithRejectedItems}</label></td> <td width='5%'> </td> <td align='left'> <table class="basic-table" cellspacing='0'> <tr> <td nowrap="nowrap"> - <input type="checkbox" name="filterPOsWithRejectedItems" value="Y" + <input type="checkbox" id="filterPOsWithRejectedItems" name="filterPOsWithRejectedItems" value="Y" <#if requestParameters.filterPOsWithRejectedItems?default("N") == "Y">checked="checked"</#if> /> </td> </tr> Modified: ofbiz/trunk/applications/order/template/order/OrderInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderInfo.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/OrderInfo.ftl (original) +++ ofbiz/trunk/applications/order/template/order/OrderInfo.ftl Mon Jul 4 16:50:38 2016 @@ -277,11 +277,11 @@ under the License. </tr> <#else> <tr id="isViewed"> - <td class="label">${uiLabelMap.OrderMarkViewed}</td> + <td class="label"><label for="checkViewed">${uiLabelMap.OrderMarkViewed}</label></td> <td width="5%"></td> <td valign="top" width="80%"> <form id="orderViewed" action=""> - <input type="checkbox" name="checkViewed" onclick="javascript:markOrderViewed();"/> + <input type="checkbox" id="checkViewed" name="checkViewed" onclick="javascript:markOrderViewed();"/> <input type="hidden" name="orderId" value="${orderId!}"/> <input type="hidden" name="isViewed" value="Y"/> </form> Modified: ofbiz/trunk/applications/order/template/order/OrderList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderList.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/OrderList.ftl (original) +++ ofbiz/trunk/applications/order/template/order/OrderList.ftl Mon Jul 4 16:50:38 2016 @@ -69,15 +69,15 @@ under the License. <td> </td> <td nowrap="nowrap"> <div> - <input type="checkbox" name="viewall" value="Y" onclick="javascript:setCheckboxes()" <#if state.hasAllStatus()>checked="checked"</#if> />${uiLabelMap.CommonAll} - <input type="checkbox" name="viewcreated" value="Y" <#if state.hasStatus('viewcreated')>checked="checked"</#if> />${uiLabelMap.CommonCreated} - <input type="checkbox" name="viewprocessing" value="Y" <#if state.hasStatus('viewprocessing')>checked="checked"</#if> />${uiLabelMap.CommonProcessing} - <input type="checkbox" name="viewapproved" value="Y" <#if state.hasStatus('viewapproved')>checked="checked"</#if> />${uiLabelMap.CommonApproved} - <input type="checkbox" name="viewhold" value="Y" <#if state.hasStatus('viewhold')>checked="checked"</#if> />${uiLabelMap.CommonHeld} - <input type="checkbox" name="viewcompleted" value="Y" <#if state.hasStatus('viewcompleted')>checked="checked"</#if> />${uiLabelMap.CommonCompleted} + <label><input type="checkbox" name="viewall" value="Y" onclick="javascript:setCheckboxes()" <#if state.hasAllStatus()>checked="checked"</#if> />${uiLabelMap.CommonAll}</label> + <label><input type="checkbox" name="viewcreated" value="Y" <#if state.hasStatus('viewcreated')>checked="checked"</#if> />${uiLabelMap.CommonCreated}</label> + <label><input type="checkbox" name="viewprocessing" value="Y" <#if state.hasStatus('viewprocessing')>checked="checked"</#if> />${uiLabelMap.CommonProcessing}</label> + <label><input type="checkbox" name="viewapproved" value="Y" <#if state.hasStatus('viewapproved')>checked="checked"</#if> />${uiLabelMap.CommonApproved}</label> + <label><input type="checkbox" name="viewhold" value="Y" <#if state.hasStatus('viewhold')>checked="checked"</#if> />${uiLabelMap.CommonHeld}</label> + <label><input type="checkbox" name="viewcompleted" value="Y" <#if state.hasStatus('viewcompleted')>checked="checked"</#if> />${uiLabelMap.CommonCompleted}</label> <#--input type="checkbox" name="viewsent" value="Y" <#if state.hasStatus('viewsent')>checked="checked"</#if> />${uiLabelMap.CommonSent}--> - <input type="checkbox" name="viewrejected" value="Y" <#if state.hasStatus('viewrejected')>checked="checked"</#if> />${uiLabelMap.CommonRejected} - <input type="checkbox" name="viewcancelled" value="Y" <#if state.hasStatus('viewcancelled')>checked="checked"</#if> />${uiLabelMap.CommonCancelled} + <label><input type="checkbox" name="viewrejected" value="Y" <#if state.hasStatus('viewrejected')>checked="checked"</#if> />${uiLabelMap.CommonRejected}</label> + <label><input type="checkbox" name="viewcancelled" value="Y" <#if state.hasStatus('viewcancelled')>checked="checked"</#if> />${uiLabelMap.CommonCancelled}</label> </div> </td> </tr> @@ -86,10 +86,10 @@ under the License. <td> </td> <td nowrap="nowrap"> <div> - <input type="checkbox" name="view_SALES_ORDER" value="Y" <#if state.hasType('view_SALES_ORDER')>checked="checked"</#if>/> - ${descr_SALES_ORDER} - <input type="checkbox" name="view_PURCHASE_ORDER" value="Y" <#if state.hasType('view_PURCHASE_ORDER')>checked="checked"</#if>/> - ${descr_PURCHASE_ORDER} + <label><input type="checkbox" name="view_SALES_ORDER" value="Y" <#if state.hasType('view_SALES_ORDER')>checked="checked"</#if>/> + ${descr_SALES_ORDER}</label> + <label><input type="checkbox" name="view_PURCHASE_ORDER" value="Y" <#if state.hasType('view_PURCHASE_ORDER')>checked="checked"</#if>/> + ${descr_PURCHASE_ORDER}</label> </div> </td> </tr> @@ -98,12 +98,14 @@ under the License. <td> </td> <td nowrap="nowrap"> <div> + <label> <input type="checkbox" name="filterInventoryProblems" value="Y" <#if state.hasFilter('filterInventoryProblems')>checked="checked"</#if>/> - ${uiLabelMap.OrderFilterInventoryProblems} + ${uiLabelMap.OrderFilterInventoryProblems}</label> + <label> <input type="checkbox" name="filterAuthProblems" value="Y" <#if state.hasFilter('filterAuthProblems')>checked="checked"</#if>/> - ${uiLabelMap.OrderFilterAuthProblems} + ${uiLabelMap.OrderFilterAuthProblems}</label> </div> </td> </tr> @@ -112,15 +114,16 @@ under the License. <td> </td> <td nowrap="nowrap"> <div> + <label> <input type="checkbox" name="filterPartiallyReceivedPOs" value="Y" <#if state.hasFilter('filterPartiallyReceivedPOs')>checked="checked"</#if>/> - ${uiLabelMap.OrderFilterPartiallyReceivedPOs} - <input type="checkbox" name="filterPOsOpenPastTheirETA" value="Y" + ${uiLabelMap.OrderFilterPartiallyReceivedPOs}</label> + <label><input type="checkbox" name="filterPOsOpenPastTheirETA" value="Y" <#if state.hasFilter('filterPOsOpenPastTheirETA')>checked="checked"</#if>/> - ${uiLabelMap.OrderFilterPOsOpenPastTheirETA} - <input type="checkbox" name="filterPOsWithRejectedItems" value="Y" + ${uiLabelMap.OrderFilterPOsOpenPastTheirETA}</label> + <label><input type="checkbox" name="filterPOsWithRejectedItems" value="Y" <#if state.hasFilter('filterPOsWithRejectedItems')>checked="checked"</#if>/> - ${uiLabelMap.OrderFilterPOsWithRejectedItems} + ${uiLabelMap.OrderFilterPOsWithRejectedItems}</label> </div> </td> </tr> Modified: ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl (original) +++ ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl Mon Jul 4 16:50:38 2016 @@ -560,8 +560,10 @@ under the License. <tr> <td> <#assign shipmentMethodAndAmount = shippingRate.shipmentMethodTypeId + "@" + "UPS" + "*" + shippingRate.rate> + <label> <input type='radio' name='shipmentMethodAndAmount' value='${shipmentMethodAndAmount!}' /> UPS ${shippingRate.shipmentMethodDescription!} + </label> <#if (shippingRate.rate > -1)> <@ofbizCurrency amount=shippingRate.rate isoCode=orderReadHelper.getCurrency()/> <#else> Modified: ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl (original) +++ ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl Mon Jul 4 16:50:38 2016 @@ -23,7 +23,7 @@ under the License. <input type="hidden" name="custRequestItemSeqId" value="${custRequestItem.custRequestItemSeqId}"/> <div> <span class="label">${uiLabelMap.OrderCopyCustRequestItem}</span> - ${uiLabelMap.OrderOrderQuoteItems} <input type="checkbox" name="copyLinkedQuotes" value="Y"/> + <label>${uiLabelMap.OrderOrderQuoteItems} <input type="checkbox" name="copyLinkedQuotes" value="Y"/></label> </div> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonCopy}"/> </form> Modified: ofbiz/trunk/applications/order/template/return/QuickReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/QuickReturn.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/return/QuickReturn.ftl (original) +++ ofbiz/trunk/applications/order/template/return/QuickReturn.ftl Mon Jul 4 16:50:38 2016 @@ -77,11 +77,10 @@ under the License. <#list shippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> <tr> - <td align="right" width="1%" valign="top" nowrap="nowrap"> + <td align="right" valign="top" nowrap="nowrap"> + <label> <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}" <#if (shippingContactMechList?size == 1)>checked="checked"</#if> /> - </td> - <td width="99%" valign="top" nowrap="nowrap"> - <div> + <span> <#if shippingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span></b> ${shippingAddress.attnName}<br /></#if> <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> @@ -91,7 +90,8 @@ under the License. <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> <#--<a href="<@ofbizUrl>editcontactmech?DONE_PAGE=checkoutoptions&contactMechId=${shippingAddress.contactMechId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>--> - </div> + </span> + </label> </td> </tr> </#list> Modified: ofbiz/trunk/applications/order/template/return/ReturnItemInc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/ReturnItemInc.ftl?rev=1751342&r1=1751341&r2=1751342&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/return/ReturnItemInc.ftl (original) +++ ofbiz/trunk/applications/order/template/return/ReturnItemInc.ftl Mon Jul 4 16:50:38 2016 @@ -20,8 +20,8 @@ under the License. <tr> <td colspan="7"><h3>${uiLabelMap.OrderReturnFromOrder} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3></td> <td colspan="2" align="right"> - <span>${uiLabelMap.CommonSelectAll}</span> - <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${selectAllFormName}');highlightAllRows(this, 'returnItemId_tableRow_', 'selectAllForm');"/> + <label><span>${uiLabelMap.CommonSelectAll}</span> + <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${selectAllFormName}');highlightAllRows(this, 'returnItemId_tableRow_', 'selectAllForm');"/></label> </td> </tr> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |