svn commit: r926987 [8/26] - in /ofbiz/branches/multitenant201
Locked
svn commit: r926987 [8/26] - in /ofbiz/branches/multitenant201
 
|
Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Wed Mar 24 09:23:07 2010 @@ -280,7 +280,7 @@ ${virtualJavaScript?if_exists} </tr> </#if> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <#-- Product image/name/price --> <tr> @@ -340,9 +340,9 @@ ${virtualJavaScript?if_exists} </#if> ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> <#if product.productTypeId?if_exists == "ASSET_USAGE"> - <#if product.reserv2ndPPPerc?exists && product.reserv2ndPPPerc != 0><br/><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if !product.reservNthPPPerc?exists || product.reservNthPPPerc == 0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons}</#if> <@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if> - <#if product.reservNthPPPerc?exists &&product.reservNthPPPerc != 0><br/><span class="${priceStyle}">${uiLabelMap.ProductReservNthPPPerc} <#if !product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0>${uiLabelMap.ProductReservSecond} <#else> ${uiLabelMap.ProductReservThird} </#if> ${uiLabelMap.CommonUntil} ${product.reservMaxPersons}, ${uiLabelMap.ProductEach}: <@ofbizCurrency amount=product.reservNthPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if> - <#if (!product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0) && (!product.reservNthPPPerc?exists || product.reservNthPPPerc == 0)><br/>${uiLabelMap.ProductMaximum} ${product.reservMaxPersons} ${uiLabelMap.ProductPersons}.</#if> + <#if product.reserv2ndPPPerc?exists && product.reserv2ndPPPerc != 0><br /><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if !product.reservNthPPPerc?exists || product.reservNthPPPerc == 0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons}</#if> <@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if> + <#if product.reservNthPPPerc?exists &&product.reservNthPPPerc != 0><br /><span class="${priceStyle}">${uiLabelMap.ProductReservNthPPPerc} <#if !product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0>${uiLabelMap.ProductReservSecond} <#else> ${uiLabelMap.ProductReservThird} </#if> ${uiLabelMap.CommonUntil} ${product.reservMaxPersons}, ${uiLabelMap.ProductEach}: <@ofbizCurrency amount=product.reservNthPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if> + <#if (!product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0) && (!product.reservNthPPPerc?exists || product.reservNthPPPerc == 0)><br />${uiLabelMap.ProductMaximum} ${product.reservMaxPersons} ${uiLabelMap.ProductPersons}.</#if> </#if> </b> </div> @@ -505,10 +505,10 @@ ${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 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> <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<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> <#else/> @@ -524,7 +524,7 @@ ${virtualJavaScript?if_exists} </form> <div> <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous"> - <hr/> + <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}"/> @@ -548,7 +548,7 @@ ${virtualJavaScript?if_exists} </#if> <a href="javascript:addShoplistSubmit();" class="buttontext">${uiLabelMap.OrderAddToShoppingList}</a> </form> - <#else> <br/> + <#else> <br /> ${uiLabelMap.OrderYouMust} <a href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBeLogged}</a> ${uiLabelMap.OrderToAddSelectedItemsToShoppingList}. </#if> @@ -579,7 +579,7 @@ ${virtualJavaScript?if_exists} </#if> <td align="center" valign="bottom"> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60"></a> - <br/> + <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a> </td> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Wed Mar 24 09:23:07 2010 @@ -40,9 +40,9 @@ under the License. <table> <tr valign="top"> <td> - <img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br/> - ${uiLabelMap.ProductProductId} : ${product.productId?if_exists}<br/> - ${uiLabelMap.ProductProductName} : ${product.productName?if_exists}<br/> + <img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> + ${uiLabelMap.ProductProductId} : ${product.productId?if_exists}<br /> + ${uiLabelMap.ProductProductName} : ${product.productName?if_exists}<br /> ${uiLabelMap.CommonDescription} : ${product.description?if_exists} </td> </tr> @@ -160,5 +160,5 @@ under the License. </div> </div> <#else> - ${uiLabelMap.ProductErrorProductNotFound}.<br/> + ${uiLabelMap.ProductErrorProductNotFound}.<br /> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Wed Mar 24 09:23:07 2010 @@ -56,7 +56,7 @@ under the License. </#if> <#if productCategoryMembers?exists && 0 < productCategoryMembers?size> - <br/> + <br /> <center> <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform" style='margin: 0;'> <input type='hidden' name='category_id' value='${categoryId}'> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkinits.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkinits.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkinits.ftl Wed Mar 24 09:23:07 2010 @@ -127,7 +127,7 @@ under the License. </div> </#if> </#if> -<br/> +<br /> <!-- Purchase Order Entry --> <#if security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> <#if shoppingCartOrderType != "SALES_ORDER"> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Wed Mar 24 09:23:07 2010 @@ -107,7 +107,7 @@ function submitForm(form, mode, value) { </td> </tr> <#if (shoppingCart.getTotalQuantity() > 1) && !shoppingCart.containAllWorkEffortCartItems()> <#-- no splitting when only rental items --> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2" align="center"> <a href="<@ofbizUrl>splitship</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSplitIntoMultipleShipments}</a> @@ -118,7 +118,7 @@ function submitForm(form, mode, value) { </tr> </#if> <#if shippingContactMechList?has_content> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <#list shippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> <tr> @@ -127,20 +127,20 @@ function submitForm(form, mode, value) { </td> <td valign="top" width="99%"> <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> - <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if> + <#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> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#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> + <#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> <a href="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a> </div> </td> </tr> <#if shippingContactMech_has_next> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> </#if> </#list> </#if> @@ -148,7 +148,7 @@ function submitForm(form, mode, value) { <#-- Party Tax Info --> <#-- commented out by default because the TaxAuthority drop-down is just too wide... - <hr/> + <hr /> <div> ${uiLabelMap.PartyTaxIdentification}</div> ${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")} --> @@ -195,7 +195,7 @@ function submitForm(form, mode, value) { </td> </tr> </#if> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <h2>${uiLabelMap.OrderShipAllAtOnce}?</h2> @@ -217,7 +217,7 @@ function submitForm(form, mode, value) { <div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <#else/> <input type="hidden" name="shipping_method" value="NO_SHIPPING@_NA_"/> <input type="hidden" name="may_split" value="false"/> @@ -235,7 +235,7 @@ function submitForm(form, mode, value) { </tr> <#if shipping == true> <#if productStore.showCheckoutGiftOptions?if_exists != "N" && giftEnable?if_exists != "N"> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <div> @@ -245,7 +245,7 @@ function submitForm(form, mode, value) { </div> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <h2>${uiLabelMap.OrderGiftMessage}</h2> @@ -260,7 +260,7 @@ function submitForm(form, mode, value) { <input type="hidden" name="is_gift" value="false"/> </#if> </#if> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <h2>${uiLabelMap.PartyEmailAddresses}</h2> @@ -278,7 +278,7 @@ function submitForm(form, mode, value) { </div> <div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<#if customerDetailLink?exists>${customerDetailLink}${shoppingCart.getPartyId()}" target="partymgr" <#else><@ofbizUrl>viewprofile?DONE_PAGE=quickcheckout</@ofbizUrl>"</#if> class="buttontext">${uiLabelMap.PartyProfile}</a>.</div> - <br/> + <br /> <div>${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div> <input type="text" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/> </td> @@ -309,13 +309,13 @@ function submitForm(form, mode, value) { </#if> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2" align="center"> <a href="javascript:submitForm(document.checkoutInfoForm, 'SP', '');" class="buttontext">${uiLabelMap.AccountingSplitPayment}</a> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists> <tr> <td width="1%"> @@ -356,7 +356,7 @@ function submitForm(form, mode, value) { </td> </tr> </#if> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <#-- financial accounts --> <#list finAccounts as finAccount> @@ -390,7 +390,7 @@ function submitForm(form, mode, value) { <td width="50%"> <span>CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</span> <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> + <#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=""/> </td> </tr> @@ -405,7 +405,7 @@ function submitForm(form, mode, value) { <td width="50%"> <span>${uiLabelMap.AccountingEFTAccount}: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</span> <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> + <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if> </td> </tr> </#if> @@ -436,7 +436,7 @@ function submitForm(form, mode, value) { <td width="50%"> <span>${uiLabelMap.AccountingGift}: ${giftCardNumber}</span> <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> + <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if> </td> </tr> </#if> @@ -447,7 +447,7 @@ function submitForm(form, mode, value) { <#-- special billing account functionality to allow use w/ a payment method --> <#if productStorePaymentMethodTypeIdMap.EXT_BILLACT?exists> <#if billingAccountList?has_content> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td width="1%"> <select name="billingAccountId"> @@ -476,7 +476,7 @@ function submitForm(form, mode, value) { <#-- end of special billing account functionality --> <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td width="1%"> <input type="checkbox" name="addGiftCard" value="Y"/> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Wed Mar 24 09:23:07 2010 @@ -72,7 +72,7 @@ function toggleBillingAccount(box) { </td> </tr> <#if shippingContactMechList?has_content> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <#list shippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> <#assign checkThisAddress = (shippingContactMech_index == 0 && !cart.getShippingContactMechId()?has_content) || (cart.getShippingContactMechId()?default("") == shippingAddress.contactMechId)/> @@ -82,19 +82,19 @@ function toggleBillingAccount(box) { </td> <td valign="top" width="99%" 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> - <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if> + <#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> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#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> + <#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> <a href="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a> </div> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> </#list> </#if> </table> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/custsettings.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/custsettings.ftl Wed Mar 24 09:23:07 2010 @@ -134,7 +134,7 @@ under the License. </tr> </table> </div> -<br/> +<br /> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/optionsettings.ftl Wed Mar 24 09:23:07 2010 @@ -21,7 +21,7 @@ under the License. <table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> <tr> <td width='100%'> - <br/> + <br /> <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> <tr> <td> @@ -59,7 +59,7 @@ under the License. <#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", supplierPartyId))?if_exists /> <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <h1><b>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</b><#if supplier?has_content> - ${supplier.groupName?default(supplier.partyId)}</#if></h1> @@ -208,7 +208,7 @@ under the License. </tr> </table> -<br/> +<br /> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Wed Mar 24 09:23:07 2010 @@ -31,7 +31,7 @@ under the License. ${orderName} </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> </#if> <#-- order for party --> <#if (orderForParty?exists)> @@ -44,7 +44,7 @@ under the License. ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(orderForParty, false)} [${orderForParty.partyId}] </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> </#if> <#if (cart.getPoNumber()?has_content)> <tr> @@ -56,7 +56,7 @@ under the License. ${cart.getPoNumber()} </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> </#if> <#if orderTerms?has_content> <tr> @@ -72,7 +72,7 @@ under the License. <td width="10%"><div><b>${uiLabelMap.OrderOrderTermDays}</b></div></td> <td width="45%"><div><b>${uiLabelMap.CommonDescription}</b></div></td> </tr> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> <#assign index=0/> <#list orderTerms as orderTerm> <tr> @@ -82,14 +82,14 @@ under the License. <td width="45%"><div>${orderTerm.textValue?default("")}</div></td> </tr> <#if orderTerms.size()<index> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> </#if> <#assign index=index+1/> </#list> </table> </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> </#if> <#-- tracking number --> <#if trackingNumber?has_content> @@ -103,7 +103,7 @@ under the License. <div>${trackingNumber}</div> </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> </#if> <#-- splitting preference --> <tr> @@ -120,7 +120,7 @@ under the License. </tr> <#-- shipping instructions --> <#if shippingInstructions?has_content> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> <div> <b>${uiLabelMap.OrderSpecialInstructions}</b></div> @@ -131,7 +131,7 @@ under the License. </td> </tr> </#if> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <#if orderType != "PURCHASE_ORDER" && (productStore.showCheckoutGiftOptions)?if_exists != "N"> <#-- gift settings --> <tr> @@ -146,7 +146,7 @@ under the License. </div> </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <#if giftMessage?has_content> <tr> <td align="right" valign="top" width="15%"> @@ -157,7 +157,7 @@ under the License. <div>${giftMessage}</div> </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> </#if> </#if> <#if shipAfterDate?has_content> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Wed Mar 24 09:23:07 2010 @@ -38,7 +38,7 @@ under the License. </tr> <#list orderItems?if_exists as orderItem> <#assign itemType = orderItem.getRelatedOne("OrderItemType")?if_exists> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <tr> <#if orderItem.productId?exists && orderItem.productId == "_?_"> <td colspan="1" valign="top"> @@ -127,7 +127,7 @@ under the License. <tr><td><font color="red">${uiLabelMap.checkhelpertotalsdonotmatchordertotal}</font></td></tr> </#if> - <tr><td colspan="8"><hr/></td></tr> + <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> @@ -147,7 +147,7 @@ under the License. <td align="right" 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 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> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl Wed Mar 24 09:23:07 2010 @@ -32,7 +32,7 @@ under the License. <td colspan="3" valign="top"> <div align="center"><b>${uiLabelMap.AccountingOfflinePayment}</b></div> <#if orderHeader?has_content && paymentAddress?has_content> - <div align="center"><hr/></div> + <div align="center"><hr /></div> <div align="center"><b>${uiLabelMap.AccountingPleaseSendPaymentTo}:</b></div> <#if paymentAddress.toName?has_content><div align="center">${paymentAddress.toName}</div></#if> <#if paymentAddress.attnName?has_content><div align="center"><b>${uiLabelMap.CommonAttn}:</b> ${paymentAddress.attnName}</div></#if> @@ -40,7 +40,7 @@ under the License. <#if paymentAddress.address2?has_content><div align="center">${paymentAddress.address2}</div></#if> <div align="center">${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId}</#if> ${paymentAddress.postalCode} <div align="center">${paymentAddress.countryGeoId}</div> - <div align="center"><hr/></div> + <div align="center"><hr /></div> <div align="center"><b>${uiLabelMap.OrderBeSureIncludeOrder} #</b></div> </#if> </td> @@ -63,13 +63,13 @@ under the License. <td width="5"> </td> <td valign="top" width="80%"> <div> - <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}<br/></#if> + <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}<br /></#if> <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> ${creditCard.firstNameOnCard} <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> ${creditCard.lastNameOnCard} <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> - <br/> + <br /> ${formattedCardNumber} </div> </td> @@ -83,9 +83,9 @@ under the License. <td width="5"> </td> <td valign="top" width="80%"> <div> - ${eftAccount.nameOnAccount}<br/> - <#if eftAccount.companyNameOnAccount?has_content>${eftAccount.companyNameOnAccount}<br/></#if> - Bank: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br/> + ${eftAccount.nameOnAccount}<br /> + <#if eftAccount.companyNameOnAccount?has_content>${eftAccount.companyNameOnAccount}<br /></#if> + Bank: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br /> Account #: ${eftAccount.accountNumber} </div> </td> @@ -95,7 +95,7 @@ under the License. <#-- billing account info --> <#if billingAccount?has_content> <#if outputted?default(false)> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </#if> <#assign outputted = true/> <tr> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Wed Mar 24 09:23:07 2010 @@ -56,7 +56,7 @@ standard order confirmation page and to <#if (numberOfItems > 0)> <#-- spacer goes here --> - <tr><td colspan="5"><hr/></td></tr> + <tr><td colspan="5"><hr /></td></tr> <tr> @@ -69,10 +69,10 @@ standard order confirmation page and to </#if> <#if address?exists> - <#if address.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${address.toName}<br/></#if> - <#if address.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${address.attnName}<br/></#if> - <#if address.address1?has_content>${address.address1}<br/></#if> - <#if address.address2?has_content>${address.address2}<br/></#if> + <#if address.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${address.toName}<br /></#if> + <#if address.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${address.attnName}<br /></#if> + <#if address.address1?has_content>${address.address1}<br /></#if> + <#if address.address2?has_content>${address.address2}<br /></#if> <#if address.city?has_content>${address.city}</#if> <#if address.stateProvinceGeoId?has_content> ${address.stateProvinceGeoId}</#if> <#if address.postalCode?has_content>, ${address.postalCode?if_exists}</#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl Wed Mar 24 09:23:07 2010 @@ -80,4 +80,4 @@ under the License. <p><strong>${uiLabelMap.CommonTotal}</strong>: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></p> </div> </div> -<br/> +<br /> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl Wed Mar 24 09:23:07 2010 @@ -48,4 +48,4 @@ under the License. </ul> </div> </div> -<br/> +<br /> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/shipsettings.ftl Wed Mar 24 09:23:07 2010 @@ -51,7 +51,7 @@ under the License. <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName?if_exists} [${facility.facilityId}]</div> </td> </tr> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> <#-- company postal addresses --> @@ -66,14 +66,14 @@ under the License. <td nowrap> </td> <td valign="top" width="100%" nowrap> <div> - <#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> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if> + <#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> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#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> + <#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> </td> <td> @@ -81,7 +81,7 @@ under the License. </td> </tr> <#if shippingContactMech_has_next> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> </#if> </#if> <#assign i = i + 1> @@ -123,7 +123,7 @@ under the License. <#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)?if_exists> <#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)?if_exists> <#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)?if_exists> - <hr/> + <hr /> <table width="100%" border="0" cellpadding="1" cellspacing="0"> <tr> <td colspan="3"> @@ -152,7 +152,7 @@ under the License. </td> </tr> <#if shippingContactMechList?has_content> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#assign i = 0> <#list shippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> @@ -175,14 +175,14 @@ under the License. </td> <td valign="top" width="99%" nowrap> <div> - <#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> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if> + <#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> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#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> + <#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> </td> <td> @@ -190,15 +190,15 @@ under the License. </td> </tr> <#if shippingContactMech_has_next> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </#if> <#assign i = i + 1> </#list> </#if> <#if shipToPartyShippingContactMechList?has_content> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr><td colspan="3">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#list shipToPartyShippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> <tr> @@ -207,20 +207,20 @@ under the License. </td> <td valign="top" width="99%" nowrap> <div> - <#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> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if> + <#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> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#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> + <#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> </td> <td> </td> </tr> <#if shippingContactMech_has_next> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </#if> </#list> </#if> @@ -237,7 +237,7 @@ under the License. <#-- select a party id to ship to instead --> - <br/> + <br /> <form method="post" action="setShipping" name="partyshipform"> <div class="screenlet"> <div class="screenlet-title-bar"> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/OrderListByDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/OrderListByDate.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/OrderListByDate.ftl Wed Mar 24 09:23:07 2010 @@ -62,7 +62,7 @@ under the License. <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")> <#list trackingCodes as trackingCode> <#if trackingCode?has_content> - <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br/> + <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br /> </#if> </#list> </td> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/editorderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/editorderitems.ftl Wed Mar 24 09:23:07 2010 @@ -76,7 +76,7 @@ float: right; <#list orderItemList as orderItem> <#if orderItem.productId?exists> <#-- a null product may come from a quote --> <#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)> - <tr><td colspan="8"><hr/></td></tr> + <tr><td colspan="8"><hr /></td></tr> <tr> <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists> <#assign productId = orderItem.productId?if_exists> @@ -108,7 +108,7 @@ float: right; <span class="alert">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span> </#if> </#if> - ${uiLabelMap.CommonDescription}<br/> + ${uiLabelMap.CommonDescription}<br /> <input type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription?if_exists}"/> </#if> </div> @@ -126,11 +126,11 @@ float: right; <#-- now show status details per line item --> <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")> <td> - ${uiLabelMap.CommonCurrent} ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br/> + ${uiLabelMap.CommonCurrent} ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br /> <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)> <#list orderItemStatuses as orderItemStatus> <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")> - ${orderItemStatus.statusDatetime.toString()} ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br/> + ${orderItemStatus.statusDatetime.toString()} ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br /> </#list> <#assign returns = orderItem.getRelated("ReturnItem")?if_exists> <#if returns?has_content> @@ -165,9 +165,9 @@ float: right; <#else> <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - shippedQuantity?double)> </#if> - ${uiLabelMap.OrderOrdered} ${orderItem.quantity?default(0)?string.number} <br/> - ${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} <br/> - ${uiLabelMap.OrderRemaining}: ${remainingQuantity} <br/> + ${uiLabelMap.OrderOrdered} ${orderItem.quantity?default(0)?string.number} <br /> + ${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} <br /> + ${uiLabelMap.OrderRemaining}: ${remainingQuantity} <br /> </td> <td class="align-text" valign="top" nowrap="nowrap"> <#-- check for permission to modify price --> @@ -282,7 +282,7 @@ float: right; <input type="submit" value="${uiLabelMap.OrderUpdateItems}" class="buttontext"/> </td> </tr> - <tr><td colspan="8"><hr/></td></tr> + <tr><td colspan="8"><hr /></td></tr> </table> </form> </#if> @@ -348,7 +348,7 @@ float: right; <input type="hidden" name="comments" value="Added manually by [${userLogin.userLoginId}]"/> <input type="hidden" name="orderId" value="${orderId?if_exists}"/> <table class="basic-table" cellspacing="0"> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td class="align-text" width="55%"> <span class="label">${uiLabelMap.OrderAdjustment}</span> @@ -376,7 +376,7 @@ float: right; <#-- subtotal --> <table class="basic-table" cellspacing="0"> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> <tr class="align-text"> <td width="80%"><span class="label">${uiLabelMap.OrderItemsSubTotal}</span></td> <td width="10%" nowrap="nowrap"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td> @@ -413,4 +413,4 @@ float: right; </table> </div> </div> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/findOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/findOrders.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/findOrders.ftl Wed Mar 24 09:23:07 2010 @@ -461,7 +461,7 @@ function toggleOrderIdList() { </select> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td width='25%' align='right'> </td> <td width='5%'> </td> @@ -487,7 +487,7 @@ document.lookuporder.orderId.focus(); </script> </#if> -<br/> +<br /> <div id="findOrdersList" class="screenlet"> <div class="screenlet-title-bar"> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Wed Mar 24 09:23:07 2010 @@ -74,7 +74,7 @@ under the License. <#assign contactMech = orderContactMechValueMap.contactMech> <#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType> <#--<#assign partyContactMech = orderContactMechValueMap.partyContactMech>--> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="19%"> <span class="label"> ${contactMechPurpose.get("description",locale)}</span> @@ -85,13 +85,13 @@ under the License. <#assign postalAddress = orderContactMechValueMap.postalAddress> <#if postalAddress?has_content> <div> - <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br/></#if> - <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br/></#if> - ${postalAddress.address1}<br/> - <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if> + <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br /></#if> + <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br /></#if> + ${postalAddress.address1}<br /> + <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if> ${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if> - ${postalAddress.postalCode?if_exists}<br/> - ${postalAddress.countryGeoId?if_exists}<br/> + ${postalAddress.postalCode?if_exists}<br /> + ${postalAddress.countryGeoId?if_exists}<br /> <#if !postalAddress.countryGeoId?exists || postalAddress.countryGeoId == "USA"> <#assign addr1 = postalAddress.address1?if_exists> <#if (addr1.indexOf(" ") > 0)> @@ -106,7 +106,7 @@ under the License. <input type="hidden" name="orderId" value="${orderId?if_exists}"/> <input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurpose.contactMechPurposeTypeId?if_exists}"/> <input type="hidden" name="oldContactMechId" value="${contactMech.contactMechId?if_exists}"/> - <hr/> + <hr /> <div><@partyPostalAddress postalContactMechList = postalContactMechList?if_exists contactMechPurposeTypeId = contactMechPurpose.contactMechPurposeTypeId?if_exists contactPostalAddress=postalAddress?if_exists/><input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></div> </form> </#if> @@ -151,4 +151,4 @@ under the License. </table> </div> </div> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderinfo.ftl Wed Mar 24 09:23:07 2010 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<div class="screenlet"> +<div class="screenlet order-info"> <div class="screenlet-title-bar"> <ul> <#if orderHeader.externalId?has_content> @@ -96,16 +96,16 @@ under the License. <td width="5%"> </td> <td valign="top" width="80%">${orderHeader.orderName}</td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </#if> <#-- order status history --> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderStatusHistory}</td> <td width="5%"> </td> - <td valign="top" width="80%"> - ${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)} + <td valign="top" width="80%"<#if currentStatus.statusCode?has_content> class="${currentStatus.statusCode}"</#if>> + <span class="current-status">${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)}</span> <#if orderHeaderStatuses?has_content> - <hr/> + <hr /> <#list orderHeaderStatuses as orderHeaderStatus> <#assign loopStatusItem = orderHeaderStatus.getRelatedOne("StatusItem")> <#assign userlogin = orderHeaderStatus.getRelatedOne("UserLogin")> @@ -118,27 +118,27 @@ under the License. </#if> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDateOrdered}</td> <td width="5%"> </td> <td valign="top" width="80%">${orderHeader.orderDate.toString()}</td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCurrency}</td> <td width="5%"> </td> <td valign="top" width="80%">${orderHeader.currencyUom?default("???")}</td> </tr> <#if orderHeader.internalCode?has_content> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderInternalCode}</td> <td width="5%"> </td> <td valign="top" width="80%">${orderHeader.internalCode}</td> </tr> </#if> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderSalesChannel}</td> <td width="5%"> </td> @@ -151,7 +151,7 @@ under the License. </#if> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderProductStore}</td> <td width="5%"> </td> @@ -163,7 +163,7 @@ under the License. </#if> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOriginFacility}</td> <td width="5%"> </td> @@ -175,7 +175,7 @@ under the License. </#if> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCreatedBy}</td> <td width="5%"> </td> @@ -188,7 +188,7 @@ under the License. </td> </tr> <#if orderItem.cancelBackOrderDate?exists> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</td> <td width="5%"> </td> @@ -196,7 +196,7 @@ under the License. </tr> </#if> <#if distributorId?exists> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDistributor}</td> <td width="5%"> </td> @@ -207,7 +207,7 @@ under the License. </tr> </#if> <#if affiliateId?exists> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderAffiliate}</td> <td width="5%"> </td> @@ -219,7 +219,7 @@ under the License. </tr> </#if> <#if orderContentWrapper.get("IMAGE_URL")?has_content> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderImage}</td> <td width="5%"> </td> @@ -231,7 +231,7 @@ under the License. <#if "SALES_ORDER" == orderHeader.orderTypeId> <form action="setOrderReservationPriority" method="post" name="setOrderReservationPriority"> <input type = "hidden" name="orderId" value="${orderId}"/> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_priority}</td> <td width="5%"> </td> @@ -244,7 +244,7 @@ under the License. <input type="submit" class="smallSubmit" value="${uiLabelMap.FormFieldTitle_reserveInventory}"/> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </form> </#if> <#if orderHeader.isViewed?has_content && orderHeader.isViewed == "Y"> @@ -277,4 +277,4 @@ under the License. </#if> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderitems.ftl Wed Mar 24 09:23:07 2010 @@ -55,7 +55,7 @@ under the License. <#if productId?exists> ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists} <#if (product.salesDiscontinuationDate)?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)> - <br/><span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span> + <br /><span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span> </#if> <#elseif orderItemType?exists> ${orderItemType.description} - ${orderItem.itemDescription?if_exists} @@ -129,8 +129,8 @@ under the License. <#-- now show status details per line item --> <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")> <td colspan="1" valign="top"> - <div class="screenlet order-item-status-list"><div class="screenlet-body"> - <div><span class="label">${uiLabelMap.CommonCurrent}</span> ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</div> + <div class="screenlet order-item-status-list<#if currentItemStatus.statusCode?has_content> ${currentItemStatus.statusCode}</#if>"><div class="screenlet-body"> + <div class="current-status"><span class="label">${uiLabelMap.CommonCurrent}</span> ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</div> <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)> <#list orderItemStatuses as orderItemStatus> <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")> @@ -597,7 +597,7 @@ under the License. </#list> </#if> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <#list orderHeaderAdjustments as orderHeaderAdjustment> <#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")> <#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)> @@ -615,7 +615,7 @@ under the License. </#list> <#-- subtotal --> - <tr><td colspan="1"></td><td colspan="6"><hr/></td></tr> + <tr><td colspan="1"></td><td colspan="6"><hr /></td></tr> <tr> <td align="right" colspan="5"><div><span class="label">${uiLabelMap.OrderItemsSubTotal}</span></div></td> <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></div></td> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderlist.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderlist.ftl Wed Mar 24 09:23:07 2010 @@ -126,7 +126,7 @@ under the License. </tr> <tr> <td colspan="3" align="center"> - <br/> + <br /> </td> </tr> <tr> @@ -196,7 +196,7 @@ under the License. <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")> <#list trackingCodes as trackingCode> <#if trackingCode?has_content> - <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br/> + <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br /> </#if> </#list> </td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |