svn commit: r931691 [1/3] - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: buscob
Date: Wed Apr 7 21:15:53 2010 New Revision: 931691 URL: http://svn.apache.org/viewvc?rev=931691&view=rev Log: A patch from Blas Rodriguez Somoza OFBIZ-3607 - XHTML validation errors (order) XHTML validation errors * Unclosed INPUT * attributes without values (checked, selected, disabled, etc) * attribute values without " * Uppercase tags or attributes. * Unencoded ampersands in urls. Other errors: findOrders.ftl Wrong markup on line 470. Unrecognized onsubmit attribute in input tag <input type='submit' value='${uiLabelMap.CommonFind}' onsubmit="javascript:lookupOrders(true);"/> Wrong markup on line 478. div must be before if and not after. Look at line 138 the if begins with <div><table> it should end with </table></div> </table> </#if> </div> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl Wed Apr 7 21:15:53 2010 @@ -32,7 +32,7 @@ under the License. <#if shoppingCart.getOrderPartyId() == "_NA_" || (shoppingCart.size() = 0)> <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li> <#else> - <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&finalizeReqCustInfo=false&finalizeReqShipInfo=false&finalizeReqOptions=false&finalizeReqPayInfo=false</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li> + <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&finalizeReqCustInfo=false&finalizeReqShipInfo=false&finalizeReqOptions=false&finalizeReqPayInfo=false</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li> </#if> <#else> <#if shoppingCart.size() = 0> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Wed Apr 7 21:15:53 2010 @@ -55,7 +55,7 @@ under the License. <#assign shipGroupItems = shoppingCart.getShipGroupItems(shipGroupIndex)> <#assign shoppingCartItems = shipGroupItems.keySet().iterator()> <form method="post" action="<@ofbizUrl>assignItemToShipGroups</@ofbizUrl>" name="assignitemtoshipgroup${shipGroupIndex}"> - <input type="hidden" name="_useRowSubmit" value="N"> + <input type="hidden" name="_useRowSubmit" value="N" /> <#assign rowCount = 0> <#list shoppingCartItems as shoppingCartItem> <#assign cartLineIndex = shoppingCart.getItemIndex(shoppingCartItem)> @@ -96,7 +96,7 @@ under the License. </tr> </#if> </table> - <input type="hidden" name="_rowCount" value="${rowCount}"> + <input type="hidden" name="_rowCount" value="${rowCount}" /> </form> </#list> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl Wed Apr 7 21:15:53 2010 @@ -47,10 +47,10 @@ under the License. <#if shippingAddress.toName?exists> <tr> - <td valign="top" nowrap> - <input type="radio" name="shipping_contact_mech_id" value="${partyContactMechPurpose.contactMechId}"> + <td valign="top" nowrap="nowrap"> + <input type="radio" name="shipping_contact_mech_id" value="${partyContactMechPurpose.contactMechId}" /> </td> - <td nowrap> </td> + <td nowrap="nowrap"> </td> <td width="100%"> <div> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br /></#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Wed Apr 7 21:15:53 2010 @@ -20,9 +20,9 @@ under the License. <script language="JavaScript" type="text/javascript"> function shipBillAddr() { if (document.checkoutsetupform.useShipAddr.checked) { - window.location = "<@ofbizUrl>setBilling?createNew=Y&finalizeMode=payment&paymentMethodType=${paymentMethodType?if_exists}&useShipAddr=Y</@ofbizUrl>"; + window.location = "<@ofbizUrl>setBilling?createNew=Y&finalizeMode=payment&paymentMethodType=${paymentMethodType?if_exists}&useShipAddr=Y</@ofbizUrl>"; } else { - window.location = "<@ofbizUrl>setBilling?createNew=Y&finalizeMode=payment&paymentMethodType=${paymentMethodType?if_exists}</@ofbizUrl>"; + window.location = "<@ofbizUrl>setBilling?createNew=Y&finalizeMode=payment&paymentMethodType=${paymentMethodType?if_exists}</@ofbizUrl>"; } } @@ -126,7 +126,7 @@ function makeExpDate() { <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if> </label> </td> - <td align="right"><a href="/partymgr/control/editeftaccount?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> + <td align="right"><a href="/partymgr/control/editeftaccount?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> </tr> <tr><td colspan="2"><hr /></td></tr> </#if> @@ -508,24 +508,24 @@ function makeExpDate() { <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if !requestParameters.createNew?exists> <tr> - <td width='1%' nowrap><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/></td> - <td width='50%'nowrap><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td> + <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && 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> </tr> <tr><td colspan="2"><hr /></td></tr> <tr> - <td width="1%" nowrap><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/></td> - <td width="50%"nowrap><div>${uiLabelMap.OrderCOD}</div></td> + <td width="1%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists && 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> </tr> <tr><td colspan="2"><hr /></td></tr> </#if> <tr> - <td width='1%' nowrap><input type="radio" name="paymentMethodTypeAndId" value="CC" onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/> - <td width='50%' nowrap><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td> + <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> </tr> <tr><td colspan="2"><hr /></td></tr> <tr> - <td width='1%' nowrap><input type="radio" name="paymentMethodTypeAndId" value="EFT" onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/> - <td width='50%' nowrap><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td> + <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> </tr> </table> </form> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl Wed Apr 7 21:15:53 2010 @@ -91,7 +91,7 @@ function gwAll(e) { function quicklookup_popup(element) { target = element; // note: global var target comes from fieldlookup.js var searchTerm = element.value; - var obj_lookupwindow = window.open('LookupProduct?productId_op=like&productId_ic=Y&productId=' + searchTerm,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); + var obj_lookupwindow = window.open('LookupProduct?productId_op=like&productId_ic=Y&productId=' + searchTerm,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); obj_lookupwindow.opener = window; obj_lookupwindow.focus(); } Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl Wed Apr 7 21:15:53 2010 @@ -38,7 +38,7 @@ under the License. <option value="${productPromo.productPromoId}">${productPromo.promoName?if_exists}</option> </#list> </select> - <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderDoPromotions}"> + <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderDoPromotions}" /> </form> </div> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl Wed Apr 7 21:15:53 2010 @@ -25,8 +25,8 @@ under the License. <div class="screenlet-body"> <div> <form method="post" action="<@ofbizUrl>addpromocode<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addpromocodeform" style="margin: 0;"> - <input type="text" size="15" name="productPromoCodeId" value=""> - <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}"> + <input type="text" size="15" name="productPromoCodeId" value="" /> + <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}" /> <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())?if_exists> <#if productPromoCodeIds?has_content> ${uiLabelMap.OrderEnteredPromoCodes}: Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Wed Apr 7 21:15:53 2010 @@ -143,8 +143,8 @@ under the License. <td align="right"><div>${uiLabelMap.CommonComment} :</div></td> <td> <div> - <input type="text" size="25" name="itemComment" value="${defaultComment?if_exists}"> - <input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment?exists>checked</#if>> + <input type="text" size="25" name="itemComment" value="${defaultComment?if_exists}" /> + <input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment?exists>checked</#if> /> ${uiLabelMap.OrderUseDefaultComment} </div> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Wed Apr 7 21:15:53 2010 @@ -63,7 +63,7 @@ under the License. <td align="right"><div><b>${uiLabelMap.CommonUnitPrice}</b></div></td> <td align="right"><div><b>${uiLabelMap.OrderAdjustments}</b></div></td> <td align="right"><div><b>${uiLabelMap.OrderItemTotal}</b></div></td> - <td align="center"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);"></td> + <td align="center"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);" /></td> </tr> <#assign itemsFromList = false> @@ -109,7 +109,7 @@ under the License. <#if cartLine.getAttribute("surveyResponses")?has_content> <br />Surveys: <#list cartLine.getAttribute("surveyResponses") as surveyResponseId> - <a href="/content/control/ViewSurveyResponses?surveyResponseId=${surveyResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${surveyResponseId}</a> + <a href="/content/control/ViewSurveyResponses?surveyResponseId=${surveyResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${surveyResponseId}</a> </#list> </#if> </div> @@ -242,14 +242,14 @@ under the License. <#list cartLine.getAlternativeOptionProductIds() as alternativeOptionProductId> <#assign alternativeOptionProduct = delegator.findByPrimaryKeyCache("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", alternativeOptionProductId))> <#assign alternativeOptionName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(alternativeOptionProduct, "PRODUCT_NAME", locale, dispatcher)?if_exists> - <div><a href="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>" class="buttontext">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></div> + <div><a href="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>" class="buttontext">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></div> </#list> </#if> </td> <#-- gift wrap option --> <#assign showNoGiftWrapOptions = false> - <td nowrap align="right"> + <td nowrap="nowrap" align="right"> <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP?if_exists> <#assign selectedOption = cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")?if_exists> <#if giftWrapOption?has_content> @@ -268,7 +268,7 @@ under the License. </#if> </td> <#-- end gift wrap option --> - <td nowrap align="center"> + <td nowrap="nowrap" align="center"> <div> <#if cartLine.getIsPromo() || cartLine.getShoppingListId()?exists> ${cartLine.getQuantity()?string.number} @@ -280,7 +280,7 @@ under the License. </#if> </div> </td> - <td nowrap align="right"> + <td nowrap="nowrap" align="right"> <div> <#if cartLine.getIsPromo() || (shoppingCart.getOrderType() == "SALES_ORDER" && !security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))> <@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=currencyUomId/> @@ -294,29 +294,29 @@ under the License. </#if> </div> </td> - <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=currencyUomId/></div></td> - <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=currencyUomId/></div></td> - <td nowrap align="center"><div><#if !cartLine.getIsPromo()><input type="checkbox" name="selectedItem" value="${cartLineIndex}" onclick="javascript:checkToggle(this);"><#else> </#if></div></td> + <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=currencyUomId/></div></td> + <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=currencyUomId/></div></td> + <td nowrap="nowrap" align="center"><div><#if !cartLine.getIsPromo()><input type="checkbox" name="selectedItem" value="${cartLineIndex}" onclick="javascript:checkToggle(this);"/><#else> </#if></div></td> </tr> </#list> <#if shoppingCart.getAdjustments()?has_content> <tr><td colspan="7"><hr /></td></tr> <tr> - <td colspan="4" nowrap align="right"><div>${uiLabelMap.OrderSubTotal}:</div></td> - <td nowrap align="right"><div><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=currencyUomId/></div></td> + <td colspan="4" nowrap="nowrap" align="right"><div>${uiLabelMap.OrderSubTotal}:</div></td> + <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=currencyUomId/></div></td> <td> </td> </tr> <#list shoppingCart.getAdjustments() as cartAdjustment> <#assign adjustmentType = cartAdjustment.getRelatedOneCache("OrderAdjustmentType")> <tr> - <td colspan="4" nowrap align="right"> + <td colspan="4" nowrap="nowrap" align="right"> <div> <i>Adjustment</i> - ${adjustmentType.get("description",locale)?if_exists} <#if cartAdjustment.productPromoId?has_content><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></#if>: </div> </td> - <td nowrap align="right"><div><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) isoCode=currencyUomId/></div></td> + <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) isoCode=currencyUomId/></div></td> <td> </td> </tr> </#list> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Wed Apr 7 21:15:53 2010 @@ -21,11 +21,11 @@ under the License. <h1>${uiLabelMap.ProductAdvancedSearchInCategory}</h1> <br /> <form name="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="VIEW_SIZE" value="10"> + <input type="hidden" name="VIEW_SIZE" value="10" /> <table border="0" wdith="100%"> - <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}"> + <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}" /> <#if searchCategory?has_content> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}" /> <tr> <td align="right" valign="middle"> <div>${uiLabelMap.ProductCategory}:</div> @@ -33,8 +33,8 @@ under the License. <td valign="middle"> <div> <b>"${(searchCategory.description)?if_exists}"</b>${uiLabelMap.ProductIncludeSubCategories} - ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked> - ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"> + ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /> + ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N" /> </div> </td> </tr> @@ -45,9 +45,9 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"> - ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked</#if>> - ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked</#if>> + <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}" /> + ${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> /> </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> - ${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N"> + ${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked="checked" /> + ${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N" /> </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> - ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N"> + ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked" /> + ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N" /> </div> </td> </tr> @@ -147,7 +147,7 @@ under the License. <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> <div> <b>${uiLabelMap.CommonSearch} #${searchOptions_index + 1}</b> - <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSearch}</a> + <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSearch}</a> <a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine}</a> </div> <#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Wed Apr 7 21:15:53 2010 @@ -308,17 +308,17 @@ function getConfigDetails(event) { </select> </div> </#list> - <input type='hidden' name="product_id" value='${product.productId}'> - <input type='hidden' name="add_product_id" value='NULL'> + <input type='hidden' name="product_id" value='${product.productId}' /> + <input type='hidden' name="add_product_id" value='NULL' /> <#else> - <input type='hidden' name="product_id" value='${product.productId}'> - <input type='hidden' name="add_product_id" value='NULL'> + <input type='hidden' name="product_id" value='${product.productId}' /> + <input type='hidden' name="add_product_id" value='NULL' /> <div class='tabletext'><b>${uiLabelMap.ProductItemOutOfStock}.</b></div> <#assign inStock = false> </#if> <#else> - <input type='hidden' name="product_id" value='${product.productId}'> - <input type='hidden' name="add_product_id" value='${product.productId}'> + <input type='hidden' name="product_id" value='${product.productId}' /> + <input type='hidden' name="add_product_id" value='${product.productId}' /> <#if productNotAvailable?exists> <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)> <#if isStoreInventoryRequired> @@ -349,18 +349,18 @@ function getConfigDetails(event) { </#if> <div id="add_amount" class="${hiddenStyle}"> <span style="white-space: nowrap;"><b>Amount:</b></span> - <input type="text" size="5" name="add_amount" value=""> + <input type="text" size="5" name="add_amount" value="" /> </div> <#if !configwrapper.isCompleted()> <div>[${uiLabelMap.EcommerceProductNotConfigured}] - <input type="text" size="5" name="quantity" value="0" disabled></div> + <input type="text" size="5" name="quantity" value="0" disabled="disabled" /></div> <#else> <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a> - <input type="text" size="5" name="quantity" value="1" > + <input type="text" size="5" name="quantity" value="1" /> </#if> </#if> <#if requestParameters.category_id?exists> - <input type='hidden' name='category_id' value='${requestParameters.category_id}'> + <input type='hidden' name='category_id' value='${requestParameters.category_id}' /> </#if> </#if> </form> @@ -368,9 +368,9 @@ function getConfigDetails(event) { <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous"> <hr /> <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> - <input type="hidden" name="productId" value="${product.productId}"> - <input type="hidden" name="product_id" value="${product.productId}"> - <input type="hidden" name="configId" value="${configId?if_exists}"> + <input type="hidden" name="productId" value="${product.productId}" /> + <input type="hidden" name="product_id" value="${product.productId}" /> + <input type="hidden" name="configId" value="${configId?if_exists}" /> <select name="shoppingListId"> <#if shoppingLists?has_content> <#list shoppingLists as shoppingList> @@ -381,7 +381,7 @@ function getConfigDetails(event) { <option value="">${uiLabelMap.OrderNewShoppingList}</option> </select> - <input type="text" size="5" name="quantity" value="1"> + <input type="text" size="5" name="quantity" value="1" /> <a href="javascript:document.addToShoppingList.submit();" class="buttontext">[${uiLabelMap.OrderAddToShoppingList}]</a> </form> <#else> <br /> @@ -446,11 +446,11 @@ function getConfigDetails(event) { <tr> <td colspan="2"> <form name="configform" id="configFormId" method="post" action="<@ofbizUrl>product<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> - <input type='hidden' name='add_product_id' value='${product.productId}'> - <input type='hidden' name='add_category_id' value=''> - <input type='hidden' name='quantity' value='1'> + <input type='hidden' name='add_product_id' value='${product.productId}' /> + <input type='hidden' name='add_category_id' value='' /> + <input type='hidden' name='quantity' value='1' /> - <input type='hidden' name='product_id' value='${product.productId}'> + <input type='hidden' name='product_id' value='${product.productId}' /> <table > <tr> <td> @@ -490,7 +490,7 @@ function getConfigDetails(event) { <#assign optionCounter = 0> <#list options as option> <div>${option.description} <#if !option.isAvailable()> (*)</#if></div> - <div>${uiLabelMap.CommonComments}: <input type='text' name='comments_${counter}_${optionCounter}' id='comments_${counter}_${optionCounter}' value='${option.comments?if_exists}' ></div> + <div>${uiLabelMap.CommonComments}: <input type='text' name='comments_${counter}_${optionCounter}' id='comments_${counter}_${optionCounter}' value='${option.comments?if_exists}' /></div> <#assign optionCounter = optionCounter + 1> </#list> <#else> @@ -506,7 +506,7 @@ function getConfigDetails(event) { <#if renderSingleChoiceWithRadioButtons?exists && "Y" == renderSingleChoiceWithRadioButtons> <#-- This is the radio button implementation --> <#if !question.isMandatory()> - <div><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked</#if>'> No option</div> + <div><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked</#if>' /> No option</div> </#if> <#assign optionComment = ""> <#assign optionCounter = 0> @@ -523,7 +523,7 @@ function getConfigDetails(event) { <#-- Render virtual compoennts --> <#if option.hasVirtualComponent()> <div > - <input type='radio' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');"> + <input type='radio' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');" /> ${option.description} <#if !option.isAvailable()> (*)</#if> <#assign components = option.getComponents()> <#list components as component> @@ -538,7 +538,7 @@ function getConfigDetails(event) { </div> <#else> <div> - <input type="radio" name='${counter}' value='${optionCounter}' <#if option.isSelected() || (!question.isSelected() && optionCounter == 0 && question.isMandatory())>checked</#if>> + <input type="radio" name='${counter}' value='${optionCounter}' <#if option.isSelected() || (!question.isSelected() && optionCounter == 0 && question.isMandatory())>checked="checked"</#if> /> ${option.description} <#if (shownPrice > 0)>+<@ofbizCurrency amount=shownPrice isoCode=price.currencyUsed/> </#if> <#if (shownPrice < 0)>-<@ofbizCurrency amount=(-1*shownPrice) isoCode=price.currencyUsed/> </#if> @@ -587,7 +587,7 @@ function getConfigDetails(event) { <#-- Render virtual compoennts --> <#if option.hasVirtualComponent()> <div > - <input type='CHECKBOX' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');"> + <input type='CHECKBOX' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');" /> ${option.description} <#if !option.isAvailable()> (*)</#if> <#assign components = option.getComponents()> <#list components as component> @@ -602,11 +602,11 @@ function getConfigDetails(event) { </div> <#else> <div> - <input type='CHECKBOX' name='${counter}' value='${optionCounter}' <#if option.isSelected()>checked</#if>> + <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> </div> </#if> - <div>${uiLabelMap.CommonComments}: <input type="text" name='comments_${counter}_${optionCounter}' id='comments_${counter}_${optionCounter}' value='${option.comments?if_exists}'></div> + <div>${uiLabelMap.CommonComments}: <input type="text" name='comments_${counter}_${optionCounter}' id='comments_${counter}_${optionCounter}' value='${option.comments?if_exists}' /></div> <#assign optionCounter = optionCounter + 1> </#list> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl Wed Apr 7 21:15:53 2010 @@ -21,7 +21,7 @@ under the License. <br /> <ul> <#list searchConstraintStrings as searchConstraintString> - <li><a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</li> + <li><a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a>&nbsp;${searchConstraintString}</li> </#list> </ul> <br /> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Wed Apr 7 21:15:53 2010 @@ -86,7 +86,7 @@ ${virtualJavaScript?if_exists} return; } else { if (isVirtual(document.addform.add_product_id.value)) { - document.location = '<@ofbizUrl>product?category_id=${categoryId?if_exists}&product_id=</@ofbizUrl>' + document.addform.add_product_id.value; + document.location = '<@ofbizUrl>product?category_id=${categoryId?if_exists}&product_id=</@ofbizUrl>' + document.addform.add_product_id.value; return; } else { document.addform.submit(); @@ -505,12 +505,12 @@ ${virtualJavaScript?if_exists} </div> <#if product.productTypeId?if_exists == "ASSET_USAGE"> <table width="100%"><tr> - <td nowrap align="right">Start Date<br />(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal_notime(document.addform.reservStart, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td> - <td nowrap align="right">End Date<br />(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr> + <td nowrap="nowrap" align="right">Start Date<br />(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal_notime(document.addform.reservStart, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td> + <td nowrap="nowrap" align="right">End Date<br />(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr> <tr> - <#--td nowrap align="right">Number<br />of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap> </td--> - <td nowrap align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td> - <td nowrap align="right">Number of rooms</td><td><input type="text" size="5" name="quantity" value="1"/></td></tr></table> + <#--td nowrap="nowrap" align="right">Number<br />of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap> </td--> + <td nowrap="nowrap" align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td> + <td nowrap="nowrap" align="right">Number of rooms</td><td><input type="text" size="5" name="quantity" value="1"/></td></tr></table> <#else/> <input type="text" size="5" name="quantity" value="1"<#if product.isVirtual?if_exists?upper_case == "Y"> disabled="disabled"</#if>/> </#if> @@ -541,7 +541,7 @@ ${virtualJavaScript?if_exists} </select> <#if product.productTypeId?if_exists == "ASSET_USAGE"> - <table><tr><td> </td><td align="right">${uiLabelMap.CommonStartDate} (yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStartStr" ></td><td>Number of days</td><td><input type="text" size="4" name="reservLength"></td><td> </td><td align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="1"></td><td align="right">Qty </td><td><input type="text" size="5" name="quantity" value="1"></td></tr></table> + <table><tr><td> </td><td align="right">${uiLabelMap.CommonStartDate} (yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStartStr" /></td><td>Number of days</td><td><input type="text" size="4" name="reservLength" /></td><td> </td><td align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="1" /></td><td align="right">Qty </td><td><input type="text" size="5" name="quantity" value="1" /></td></tr></table> <#else> <input type="text" size="5" name="quantity" value="1"/> <input type="hidden" name="reservStartStr" value= ""/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Wed Apr 7 21:15:53 2010 @@ -59,7 +59,7 @@ under the License. <br /> <center> <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform" style='margin: 0;'> - <input type='hidden' name='category_id' value='${categoryId}'> + <input type='hidden' name='category_id' value='${categoryId}' /> <div align="right"> <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddAllToCart}</span></a> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl Wed Apr 7 21:15:53 2010 @@ -53,9 +53,9 @@ under the License. <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div> <#-- check to see if the product is a virtual product --> <#elseif product.isVirtual?default("N") == "Y"> - <a href="<@ofbizUrl>product?<#if categoryId?exists>category_id=${categoryId}&</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a> + <a href="<@ofbizUrl>product?<#if categoryId?exists>category_id=${categoryId}&</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a> <#else> - <input type="text" size="5" name="quantity_${product.productId}" value=""> + <input type="text" size="5" name="quantity_${product.productId}" value="" /> </#if> </td> <#else> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Wed Apr 7 21:15:53 2010 @@ -50,10 +50,10 @@ under the License. <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom"> <tr> <td > </td> - <td width=300 align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.ProductProductStore}</div></td> + <td width="300" align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.ProductProductStore}</div></td> <td > </td> <td valign='middle'> - <div class='tabletext' valign='top'> + <div class='tabletext'> <select name="productStoreId"<#if sessionAttributes.orderMode?exists> disabled</#if>> <#assign currentStore = shoppingCartProductStore> <#if defaultProductStore?has_content> @@ -71,10 +71,10 @@ under the License. <tr><td colspan="4"> </td></tr> <tr> <td> </td> - <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.OrderSalesChannel}</div></td> + <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.OrderSalesChannel}</div></td> <td> </td> <td valign='middle'> - <div class='tabletext' valign='top'> + <div class='tabletext'> <select name="salesChannelEnumId"> <#assign currentChannel = shoppingCartChannelType> <#if defaultSalesChannel?has_content> @@ -97,10 +97,10 @@ under the License. </#if> <tr> <td> </td> - <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartyUserLoginId}</div></td> + <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyUserLoginId}</div></td> <td> </td> <td valign='middle'> - <div class='tabletext' valign='top'> + <div class='tabletext'> <input type="text" name="userLoginId" value="${parameters.userLogin.userLoginId}"/> <a href="javascript:call_fieldlookup2(document.salesentryform.userLoginId,'LookupUserLoginAndPartyDetails');"> <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/> @@ -110,10 +110,10 @@ under the License. </tr> <tr> <td> </td> - <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.OrderCustomer}</div></td> + <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.OrderCustomer}</div></td> <td> </td> <td valign='middle'> - <div class='tabletext' valign='top'> + <div class='tabletext'> <input type='text' class='inputBox' name='partyId' value='${thisPartyId?if_exists}'/> <a href="javascript:call_fieldlookup2(document.salesentryform.partyId,'LookupCustomerName');"> <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/> @@ -152,10 +152,10 @@ under the License. </#if> <tr> <td> </td> - <td width=300 align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.OrderOrderEntryInternalOrganization}</div></td> + <td width="300" align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.OrderOrderEntryInternalOrganization}</div></td> <td> </td> <td valign='middle'> - <div class='tabletext' valign='top'> + <div class='tabletext'> <select name="billToCustomerPartyId"<#if sessionAttributes.orderMode?default("") == "SALES_ORDER"> disabled</#if>> <#list organizations as organization> <#assign organizationName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(organization, true)/> @@ -170,10 +170,10 @@ under the License. <tr><td colspan="4"> </td></tr> <tr> <td> </td> - <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartyUserLoginId}</div></td> + <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyUserLoginId}</div></td> <td> </td> <td valign='middle'> - <div class='tabletext' valign='top'> + <div class='tabletext'> <input type='text' class='inputBox' name='userLoginId' value='${parameters.userLogin.userLoginId}'/> <a href="javascript:call_fieldlookup2(document.poentryform.userLoginId,'LookupUserLoginAndPartyDetails');"> <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/> @@ -183,10 +183,10 @@ under the License. </tr> <tr> <td> </td> - <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartySupplier}</div></td> + <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartySupplier}</div></td> <td> </td> <td valign='middle'> - <div class='tabletext' valign='top'> + <div class='tabletext'> <select name="supplierPartyId"<#if sessionAttributes.orderMode?default("") == "SALES_ORDER"> disabled</#if>> <option value="">${uiLabelMap.OrderSelectSupplier}</option> <#list suppliers as supplier> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Wed Apr 7 21:15:53 2010 @@ -29,31 +29,31 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "NA") { // new address - form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION</@ofbizUrl>"; form.submit(); } else if (mode == "EA") { // edit address - form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&contactMechId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&contactMechId="+value+"</@ofbizUrl>"; form.submit(); } else if (mode == "NC") { // new credit card - form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>"; form.submit(); } else if (mode == "EC") { // edit credit card - form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } else if (mode == "GC") { // edit gift card - form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } else if (mode == "NE") { // new eft account - form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>"; form.submit(); } else if (mode == "EE") { // edit eft account - form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } else if (mode == "SP") { // split payment Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Wed Apr 7 21:15:53 2010 @@ -30,11 +30,11 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "NA") { // new address - form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutshippingaddress</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutshippingaddress</@ofbizUrl>"; form.submit(); } else if (mode == "EA") { // edit address - form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&contactMechId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&contactMechId="+value+"</@ofbizUrl>"; form.submit(); } } @@ -77,10 +77,10 @@ function toggleBillingAccount(box) { <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> <#assign checkThisAddress = (shippingContactMech_index == 0 && !cart.getShippingContactMechId()?has_content) || (cart.getShippingContactMechId()?default("") == shippingAddress.contactMechId)/> <tr> - <td valign="top" width="1%" nowrap> - <input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}"<#if checkThisAddress> checked</#if>> + <td valign="top" width="1%" nowrap="nowrap"> + <input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}"<#if checkThisAddress> checked="checked"</#if> /> </td> - <td valign="top" width="99%" nowrap> + <td valign="top" width="99%" nowrap="nowrap"> <div> <#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> @@ -104,7 +104,7 @@ function toggleBillingAccount(box) { <#if agreements.size()!=1> <tr> <td> </td> - <td align='left' valign='top' nowrap> + <td align='left' valign='top' nowrap="nowrap"> <div class='tableheadtext'> ${uiLabelMap.OrderSelectAgreement} </div> @@ -122,7 +122,7 @@ function toggleBillingAccount(box) { </tr> <#else> <#list agreements as agreement> - <input type="radio" name="agreementId" value="${agreement.agreementId?if_exists}"<#if checkThisAddress> checked</#if>>${agreement.description?if_exists} will be used for this order. + <input type="radio" name="agreementId" value="${agreement.agreementId?if_exists}"<#if checkThisAddress> checked="checked"</#if> />${agreement.description?if_exists} will be used for this order. </#list> </#if> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Wed Apr 7 21:15:53 2010 @@ -21,8 +21,8 @@ under the License. <div class="screenlet-body"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom"> <form name="checkoutsetupform" method="post" action="<@ofbizUrl>createCustomer</@ofbizUrl>"> - <input type="hidden" name="finalizeMode" value="cust"> - <input type="hidden" name="finalizeReqNewShipAddress" value="true"> + <input type="hidden" name="finalizeMode" value="cust" /> + <input type="hidden" name="finalizeReqNewShipAddress" value="true" /> <tr> <td> <table width="100%" border="0" cellpadding="1" cellspacing="0"> @@ -107,7 +107,7 @@ under the License. <td width="26%" align="right"><div>${uiLabelMap.PartyEmailAddress}<BR>${uiLabelMap.OrderAllowSolicitation}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" name="emailAddress" value="" size="60" maxlength="255"> + <input type="text" name="emailAddress" value="" size="60" maxlength="255" /> <BR> <select name="emailSol"> <#if (((requestParameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Wed Apr 7 21:15:53 2010 @@ -78,7 +78,7 @@ under the License. <tr> <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</#if> id='${shipGroupIndex?default("0")}_shipping_method_${shippingMethod}'> + <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}"> @@ -101,7 +101,7 @@ under the License. <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0> <tr> <td width='1%' valign="top"> - <input type='radio' name='${shipGroupIndex?default("0")}_shipping_method' value="Default" checked> + <input type='radio' name='${shipGroupIndex?default("0")}_shipping_method' value="Default" checked="checked" /> </td> <td valign="top"> <div class='tabletext'>${uiLabelMap.FacilityNoOtherShippingMethods}</div> @@ -109,7 +109,7 @@ under the License. </tr> </#if> <#else> - <input type='hidden' name='${shipGroupIndex?default("0")}_shipping_method' value="NO_SHIPPING@_NA_"> + <input type='hidden' name='${shipGroupIndex?default("0")}_shipping_method' value="NO_SHIPPING@_NA_" /> </#if> <tr> <td colspan='2'> @@ -118,7 +118,7 @@ under the License. </tr> <tr> <td valign="top"> - <input type='radio' <#if cart.getMaySplit(shipGroupIndex)?default("N") == "N">checked</#if> name='${shipGroupIndex?default("0")}_may_split' value='false'> + <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> @@ -126,7 +126,7 @@ under the License. </tr> <tr> <td valign="top"> - <input <#if cart.getMaySplit(shipGroupIndex)?default("N") == "Y">checked</#if> type='radio' name='${shipGroupIndex?default("0")}_may_split' value='true'> + <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> @@ -170,15 +170,15 @@ under the License. </tr> <#if cart.getOrderType() == 'PURCHASE_ORDER'> - <input type="hidden" name="${shipGroupIndex?default('0')}_is_gift" value="false"> + <input type="hidden" name="${shipGroupIndex?default('0')}_is_gift" value="false" /> <#else> <#if (productStore.showCheckoutGiftOptions)?default('Y') != 'N'> <tr> <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 class="tabletext">${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 class="tabletext">${uiLabelMap.CommonNo}</span> + <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('Y') == 'Y'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="true" /><span class="tabletext">${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 class="tabletext">${uiLabelMap.CommonNo}</span> </div> </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Wed Apr 7 21:15:53 2010 @@ -56,20 +56,20 @@ under the License. </td> <td align="right" valign="top"> - <div nowrap>${orderItem.quantity?string.number}</div> + <div nowrap="nowrap">${orderItem.quantity?string.number}</div> </td> <td align="right" valign="top"> - <div nowrap><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/></div> + <div nowrap="nowrap"><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/></div> </td> <td align="right" valign="top"> - <div nowrap><@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentsTotal(orderItem) isoCode=currencyUomId/></div> + <div nowrap="nowrap"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentsTotal(orderItem) isoCode=currencyUomId/></div> </td> - <td align="right" valign="top" nowrap> + <td align="right" valign="top" nowrap="nowrap"> <div><@ofbizCurrency amount=localOrderReadHelper.getOrderItemSubTotal(orderItem) isoCode=currencyUomId/></div> </td> <#if maySelectItems?default(false)> <td> - <input name="item_id" value="${orderItem.orderItemSeqId}" type="checkbox"> + <input name="item_id" value="${orderItem.orderItemSeqId}" type="checkbox" /> </td> </#if> </#if> @@ -130,27 +130,27 @@ under the License. <tr><td colspan="8"><hr /></td></tr> <tr> <td align="right" colspan="4"><div><b>${uiLabelMap.OrderSubTotal}</b></div></td> - <td align="right" nowrap><div> <#if orderSubTotal?exists><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></#if></div></td> + <td align="right" nowrap="nowrap"><div> <#if orderSubTotal?exists><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></#if></div></td> </tr> <#list headerAdjustmentsToShow?if_exists as orderHeaderAdjustment> <tr> <td align="right" colspan="4"><div><b>${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}</b></div></td> - <td align="right" nowrap><div><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></div></td> + <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></div></td> </tr> </#list> <tr> <td align="right" colspan="4"><div><b>${uiLabelMap.FacilityShippingAndHandling}</b></div></td> - <td align="right" nowrap><div><#if orderShippingTotal?exists><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></#if></div></td> + <td align="right" nowrap="nowrap"><div><#if orderShippingTotal?exists><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></#if></div></td> </tr> <tr> <td align="right" colspan="4"><div><b>${uiLabelMap.OrderSalesTax}</b></div></td> - <td align="right" nowrap><div><#if orderTaxTotal?exists><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></#if></div></td> + <td align="right" nowrap="nowrap"><div><#if orderTaxTotal?exists><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></#if></div></td> </tr> <tr><td colspan=2></td><td colspan="8"><hr /></td></tr> <tr> <td align="right" colspan="4"><div><b>${uiLabelMap.OrderGrandTotal}</b></div></td> - <td align="right" nowrap> + <td align="right" nowrap="nowrap"> <div><#if orderGrandTotal?exists><@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/></#if></div> </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl Wed Apr 7 21:15:53 2010 @@ -64,9 +64,9 @@ under the License. <td valign="top" width="80%"> <div> <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}<br /></#if> - <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> + <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> ${creditCard.firstNameOnCard} - <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> + <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> ${creditCard.lastNameOnCard} <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> <br /> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Wed Apr 7 21:15:53 2010 @@ -35,7 +35,7 @@ under the License. <input type='hidden' name='hasAgreements' value='Y'/> <tr> <td> </td> - <td align='right' valign='top' nowrap> + <td align='right' valign='top' nowrap="nowrap"> <div class='tableheadtext'> ${uiLabelMap.OrderSelectAgreement} </div> @@ -57,7 +57,7 @@ under the License. <#if agreementRoles?exists> <tr> <td> </td> - <td align='right' valign='top' nowrap> + <td align='right' valign='top' nowrap="nowrap"> <div class='tableheadtext'> ${uiLabelMap.OrderSelectAgreementRoles} </div> @@ -91,7 +91,7 @@ under the License. <tr> <td> </td> - <td align='right' valign='middle' class='tableheadtext' nowrap> + <td align='right' valign='middle' class='tableheadtext' nowrap="nowrap"> ${uiLabelMap.OrderOrderName} </td> <td> </td> @@ -103,19 +103,19 @@ under the License. <#if cart.getOrderType() != "PURCHASE_ORDER"> <tr> <td> </td> - <td align='right' valign='middle' class='tableheadtext' nowrap> + <td align='right' valign='middle' class='tableheadtext' nowrap="nowrap"> ${uiLabelMap.OrderPONumber} </td> <td> </td> <td align='left'> - <input type="text" class='inputBox' name="correspondingPoId" size="15"> + <input type="text" class='inputBox' name="correspondingPoId" size="15" /> </td> </tr> </#if> <tr> <td> </td> - <td align='right' valign='middle' nowrap> + <td align='right' valign='middle' nowrap="nowrap"> <div class='tableheadtext'> <#if agreements?exists>${uiLabelMap.OrderSelectCurrencyOr} <#else>${uiLabelMap.OrderSelectCurrency} @@ -165,7 +165,7 @@ under the License. <tr> <td> </td> - <td align='right' valign='top' nowrap> + <td align='right' valign='top' nowrap="nowrap"> <div class='tableheadtext'> ${uiLabelMap.OrderShipAfterDateDefault} </div> @@ -180,7 +180,7 @@ under the License. <tr> <td> </td> - <td align='right' valign='top' nowrap> + <td align='right' valign='top' nowrap="nowrap"> <div class='tableheadtext'> ${uiLabelMap.OrderShipBeforeDateDefault} </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl Wed Apr 7 21:15:53 2010 @@ -18,9 +18,9 @@ under the License. --> <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)> -<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> - <TR> - <TD width='100%'> +<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> + <tr> + <td width='100%'> <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'> <tr> <td valign="middle" align="center"> @@ -28,10 +28,10 @@ under the License. </td> </tr> </table> - </TD> - </TR> - <TR> - <TD width='100%'> + </td> + </tr> + <tr> + <td width='100%'> <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> <tr> <td align="center"> @@ -41,7 +41,7 @@ under the License. <div class='tabletext'><a href="${customerDetailLink}${partyId}" class="buttontext">${partyGroup.groupName?if_exists}</a></div> </#if> <form method="post" action="<@ofbizUrl>orderentry</@ofbizUrl>" name="setpartyform"> - <div><input type="text" name="partyId" size='10' value="${partyId?if_exists}"></div> + <div><input type="text" name="partyId" size='10' value="${partyId?if_exists}" /></div> <div> <a href="javascript:document.setpartyform.submit();" class="buttontext">${uiLabelMap.CommonSet}</a> | <a href="/partymgr/control/findparty" class="buttontext">${uiLabelMap.CommonFind}</a><#if partyId?default("_NA_") != "_NA_" && partyId?default("_NA_") != ""> | <a href="${customerDetailLink}${partyId}" class="buttontext">${uiLabelMap.CommonView}</a></#if> </div> @@ -49,9 +49,9 @@ under the License. </td> </tr> </table> - </TD> - </TR> -</TABLE> + </td> + </tr> +</table> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl Wed Apr 7 21:15:53 2010 @@ -43,7 +43,7 @@ under the License. <td align="center">${orderTerm.termDays?if_exists}</td> <td nowrap="nowrap">${orderTerm.textValue?if_exists}</td> <td align="right"> - <a href="<@ofbizUrl>setOrderTerm?termIndex=${orderTerm_index}&createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>setOrderTerm?termIndex=${orderTerm_index}&createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a> <a href="<@ofbizUrl>removeCartOrderTerm?termIndex=${orderTerm_index}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Wed Apr 7 21:15:53 2010 @@ -35,7 +35,7 @@ under the License. <table border="0" cellspacing="0" cellpadding="0" class="boxbottom"> <tr> <td align="right"> - <input type="radio" id="additionalPartyType_Person" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?exists && additionalPartyType == "Person")> checked="checked"</#if>> + <input type="radio" id="additionalPartyType_Person" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?exists && additionalPartyType == "Person")> checked="checked"</#if> /> </td> <td> <label for="additionalPartyType_Person">${uiLabelMap.CommonPerson}</label> @@ -43,7 +43,7 @@ under the License. </tr> <tr> <td align="right"> - <input type="radio" id="additionalPartyType_Group" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?exists && additionalPartyType == "Group"> checked="checked"</#if>> + <input type="radio" id="additionalPartyType_Group" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?exists && additionalPartyType == "Group"> checked="checked"</#if> /> </td> <td> <label for="additionalPartyType_Group">${uiLabelMap.CommonGroup}</label> @@ -51,7 +51,7 @@ under the License. </tr> <tr> <td align="right"> - <input type="radio" id="additionalPartyType_None" name="additionalPartyType" value="None" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if !additionalPartyType?exists> checked="checked"</#if>> + <input type="radio" id="additionalPartyType_None" name="additionalPartyType" value="None" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if !additionalPartyType?exists> checked="checked"</#if> /> </td> <td> <label for="additionalPartyType_None">${uiLabelMap.OrderPartyDontWish}</label> @@ -83,7 +83,7 @@ under the License. <div>${uiLabelMap.CommonIdentifier} :</div> </td> <td> - <input type="text" name="additionalPartyId" value="${additionalPartyId?if_exists}" onchange="javascript:document.quickAddPartyForm.submit()"> + <input type="text" name="additionalPartyId" value="${additionalPartyId?if_exists}" onchange="javascript:document.quickAddPartyForm.submit()" /> </td> <td> <a href="javascript:document.quickAddPartyForm.additionalPartyId.focus();call_fieldlookup2(document.quickAddPartyForm.additionalPartyId, '${lookupPartyView}');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"></a> @@ -122,8 +122,8 @@ under the License. </td> <td> </td> <td> - <input type="hidden" name="additionalPartyId" value="${additionalPartyId}"> - <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"> + <input type="hidden" name="additionalPartyId" value="${additionalPartyId}" /> + <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd} "/> </td> </tr> </form> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |