[ofbiz-framework] branch trunk updated: Improved: Apply multi-block attr to each application (OFBIZ-11706)
Locked
[ofbiz-framework] branch trunk updated: Improved: Apply multi-block attr to each application (OFBIZ-11706)
 
|
This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new b17fd24 Improved: Apply multi-block attr to each application (OFBIZ-11706) b17fd24 is described below commit b17fd2419aa26c459581165b9b0eb7242722034c Author: James Yong <[hidden email]> AuthorDate: Fri May 15 19:24:20 2020 +0800 Improved: Apply multi-block attr to each application (OFBIZ-11706) For Order application. --- applications/order/template/entry/BillSettings.ftl | 2 -- applications/order/template/entry/CheckoutOptions.ftl | 2 -- applications/order/template/entry/CheckoutPayment.ftl | 2 -- applications/order/template/entry/SplitShip.ftl | 2 -- .../order/template/entry/catalog/ConfigProductDetail.ftl | 4 ---- .../order/template/entry/catalog/ProductDetail.ftl | 2 -- .../order/template/entry/catalog/ProductSummary.ftl | 2 -- applications/order/template/task/OrderTaskList.ftl | 2 -- .../order/widget/ordermgr/AllocationPlanScreens.xml | 8 ++++---- .../order/widget/ordermgr/CustRequestScreens.xml | 2 +- .../order/widget/ordermgr/OrderEntryCartScreens.xml | 4 ++-- .../order/widget/ordermgr/OrderEntryCatalogScreens.xml | 14 +++++++------- .../order/widget/ordermgr/OrderEntryOrderScreens.xml | 16 ++++++++-------- applications/order/widget/ordermgr/OrderTaskScreens.xml | 2 +- applications/order/widget/ordermgr/OrderViewScreens.xml | 8 ++++---- 15 files changed, 27 insertions(+), 45 deletions(-) diff --git a/applications/order/template/entry/BillSettings.ftl b/applications/order/template/entry/BillSettings.ftl index 6a74efb..15780b7 100644 --- a/applications/order/template/entry/BillSettings.ftl +++ b/applications/order/template/entry/BillSettings.ftl @@ -18,7 +18,6 @@ under the License. --> <script type="application/javascript"> -//<![CDATA[ function shipBillAddr() { if (document.checkoutsetupform.useShipAddr.checked) { window.location = "<@ofbizUrl>setBilling?createNew=Y&finalizeMode=payment&paymentMethodType=${paymentMethodType!}&useShipAddr=Y</@ofbizUrl>"; @@ -30,7 +29,6 @@ function shipBillAddr() { function makeExpDate() { document.checkoutsetupform.expireDate.value = document.checkoutsetupform.expMonth.options[document.checkoutsetupform.expMonth.selectedIndex].value + "/" + document.checkoutsetupform.expYear.options[document.checkoutsetupform.expYear.selectedIndex].value; } -//]]> </script> <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> diff --git a/applications/order/template/entry/CheckoutOptions.ftl b/applications/order/template/entry/CheckoutOptions.ftl index 45aaf0c..74838e1 100644 --- a/applications/order/template/entry/CheckoutOptions.ftl +++ b/applications/order/template/entry/CheckoutOptions.ftl @@ -18,7 +18,6 @@ under the License. --> <script type="application/javascript"> -//<![CDATA[ function submitForm(form, mode, value) { if ("DN" == mode) { // done action; checkout @@ -70,7 +69,6 @@ function submitForm(form, mode, value) { form.submit(); } } -//]]> </script> <#assign shipping = !shoppingCart.containAllWorkEffortCartItems()> <#-- contains items which need shipping? --> diff --git a/applications/order/template/entry/CheckoutPayment.ftl b/applications/order/template/entry/CheckoutPayment.ftl index 8c2fc7e..b6c6f0f 100644 --- a/applications/order/template/entry/CheckoutPayment.ftl +++ b/applications/order/template/entry/CheckoutPayment.ftl @@ -20,7 +20,6 @@ under the License. <!-- TODO : Need formatting --> <script type="application/javascript"> -//<![CDATA[ function submitForm(form, mode, value) { if ("DN" == mode) { // done action; checkout @@ -55,7 +54,6 @@ function submitForm(form, mode, value) { form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } -//]]> </script> diff --git a/applications/order/template/entry/SplitShip.ftl b/applications/order/template/entry/SplitShip.ftl index 84efe4f..f7dd3c7 100644 --- a/applications/order/template/entry/SplitShip.ftl +++ b/applications/order/template/entry/SplitShip.ftl @@ -18,7 +18,6 @@ under the License. --> <script type="application/javascript"> -//<![CDATA[ function submitForm(form, mode, value) { if ("DN" == mode) { // done action; payment info @@ -42,7 +41,6 @@ function submitForm(form, mode, value) { form.submit(); } } -//]]> </script> <div class="screenlet"> diff --git a/applications/order/template/entry/catalog/ConfigProductDetail.ftl b/applications/order/template/entry/catalog/ConfigProductDetail.ftl index 67b8db3..8a4654f 100644 --- a/applications/order/template/entry/catalog/ConfigProductDetail.ftl +++ b/applications/order/template/entry/catalog/ConfigProductDetail.ftl @@ -24,7 +24,6 @@ under the License. <#-- virtual product javascript --> ${virtualJavaScript!} <script type="application/javascript"> -<!-- var detailImageUrl = null; function setAddProductId(name) { document.addform.add_product_id.value = name; @@ -132,11 +131,9 @@ ${virtualJavaScript!} toggleAmt(checkAmtReq(sku)); } } - //--> </script> <script type="application/javascript"> -<!-- jQuery(document).ready( function() { jQuery('#configFormId').change(getConfigDetails); @@ -166,7 +163,6 @@ function getConfigDetails() { }); } ---> </script> <div id="productdetail"> diff --git a/applications/order/template/entry/catalog/ProductDetail.ftl b/applications/order/template/entry/catalog/ProductDetail.ftl index f0ead32..7a18d56 100644 --- a/applications/order/template/entry/catalog/ProductDetail.ftl +++ b/applications/order/template/entry/catalog/ProductDetail.ftl @@ -23,7 +23,6 @@ under the License. <#-- virtual product javascript --> ${virtualJavaScript!} <script type="application/javascript"> -<!-- var detailImageUrl = null; function setAddProductId(name) { document.addform.add_product_id.value = name; @@ -278,7 +277,6 @@ ${virtualJavaScript!} } setVariantPrice(variantId); } - //--> </script> <div id="productdetail"> diff --git a/applications/order/template/entry/catalog/ProductSummary.ftl b/applications/order/template/entry/catalog/ProductSummary.ftl index e9a60e9..a563798 100644 --- a/applications/order/template/entry/catalog/ProductSummary.ftl +++ b/applications/order/template/entry/catalog/ProductSummary.ftl @@ -18,7 +18,6 @@ under the License. --> ${virtualJavaScript!} <script type="application/javascript"> -<!-- function displayProductVirtualId(variantId, virtualProductId, pForm) { if(variantId){ pForm.product_id.value = variantId; @@ -49,7 +48,6 @@ ${virtualJavaScript!} priceElem.appendChild(priceTxt); } } -//--> </script> <#if product??> <#-- variable setup --> diff --git a/applications/order/template/task/OrderTaskList.ftl b/applications/order/template/task/OrderTaskList.ftl index e61420a..56d5ae5 100644 --- a/applications/order/template/task/OrderTaskList.ftl +++ b/applications/order/template/task/OrderTaskList.ftl @@ -18,7 +18,6 @@ under the License. --> <script type="application/javascript"> -<!-- // function viewOrder(form) { if (form.taskStatus.value == "WF_NOT_STARTED") { if (form.delegate.checked) { @@ -35,7 +34,6 @@ under the License. } form.submit(); } -// --> </script> <#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)> diff --git a/applications/order/widget/ordermgr/AllocationPlanScreens.xml b/applications/order/widget/ordermgr/AllocationPlanScreens.xml index 5320542..644ed61 100644 --- a/applications/order/widget/ordermgr/AllocationPlanScreens.xml +++ b/applications/order/widget/ordermgr/AllocationPlanScreens.xml @@ -57,7 +57,7 @@ under the License. <decorator-screen name="CommonAllocationPlanDecorator" location="${parameters.commonAllocationPlanDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html> + <html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html> </platform-specific> <platform-specific> <html><html-template location="component://order/template/order/CreateAllocationPlan.ftl"/></html> @@ -127,7 +127,7 @@ under the License. </widgets> </section> <platform-specific> - <html><html-template location="component://order/template/order/ViewAllocationPlan.ftl"/></html> + <html><html-template multi-block="true" location="component://order/template/order/ViewAllocationPlan.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -160,10 +160,10 @@ under the License. </widgets> </section> <platform-specific> - <html><html-template location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html> + <html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://order/template/order/ViewAllocationPlan.ftl"/></html> + <html><html-template multi-block="true" location="component://order/template/order/ViewAllocationPlan.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/applications/order/widget/ordermgr/CustRequestScreens.xml b/applications/order/widget/ordermgr/CustRequestScreens.xml index 58bfbac..427cfe4 100644 --- a/applications/order/widget/ordermgr/CustRequestScreens.xml +++ b/applications/order/widget/ordermgr/CustRequestScreens.xml @@ -55,7 +55,7 @@ under the License. </container> </decorator-section> <decorator-section name="search-options"> - <platform-specific><html><html-template location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html></platform-specific> <include-form name="FindRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/> </decorator-section> <decorator-section name="search-results"> diff --git a/applications/order/widget/ordermgr/OrderEntryCartScreens.xml b/applications/order/widget/ordermgr/OrderEntryCartScreens.xml index 64eeb0f..d0ee84e 100644 --- a/applications/order/widget/ordermgr/OrderEntryCartScreens.xml +++ b/applications/order/widget/ordermgr/OrderEntryCartScreens.xml @@ -80,8 +80,8 @@ under the License. <widgets> <decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/template/entry/cart/Javascript.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/template/entry/cart/ShowCart.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/cart/Javascript.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/cart/ShowCart.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://order/template/entry/cart/AddItemsToShoppingList.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://order/template/entry/cart/ShowCartItems.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://order/template/entry/cart/PromoCodes.ftl"/></html></platform-specific> diff --git a/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml b/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml index ecf45f3..f75d73c 100644 --- a/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml +++ b/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml @@ -38,7 +38,7 @@ under the License. <script location="component://order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/template/entry/catalog/KeywordSearchBox.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/catalog/KeywordSearchBox.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -61,7 +61,7 @@ under the License. <script location="component://order/groovyScripts/entry/catalog/ProductSummary.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/template/entry/catalog/ProductSummary.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/catalog/ProductSummary.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -129,7 +129,7 @@ under the License. <script location="component://order/groovyScripts/entry/catalog/CategoryDetail.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/template/entry/catalog/CategoryDetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/catalog/CategoryDetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -170,7 +170,7 @@ under the License. <widgets> <include-screen name="breadcrumbs"/> <platform-specific><html><html-template location="component://order/template/entry/catalog/EditProduct.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/template/entry/catalog/ProductDetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/catalog/ProductDetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -185,7 +185,7 @@ under the License. <widgets> <include-screen name="breadcrumbs"/> <platform-specific><html><html-template location="component://order/template/entry/catalog/EditProduct.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://order/template/entry/catalog/ConfigProductDetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/catalog/ConfigProductDetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -195,7 +195,7 @@ under the License. <script location="component://order/groovyScripts/entry/catalog/InlineProductDetail.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/template/entry/catalog/InlineProductDetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/catalog/InlineProductDetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -209,7 +209,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/template/entry/catalog/KeywordSearch.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/catalog/KeywordSearch.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> diff --git a/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml b/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml index ff06e6c..3187b2f 100644 --- a/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml +++ b/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml @@ -61,7 +61,7 @@ under the License. <container> <label style="h1" text="${uiLabelMap.OrderQuickFinalizeOrder}"/> </container> - <platform-specific><html><html-template location="component://order/template/entry/CheckoutOptions.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/CheckoutOptions.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -96,7 +96,7 @@ under the License. <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/template/entry/ShipSettings.ftl"/></html> + <html><html-template multi-block="true" location="component://order/template/entry/ShipSettings.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -122,7 +122,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific> <platform-specific> <html><html-template location="component://order/template/entry/EditShipAddress.ftl"/></html> </platform-specific> @@ -188,9 +188,9 @@ under the License. <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific> <platform-specific> - <html><html-template location="component://order/template/entry/BillSettings.ftl"/></html> + <html><html-template multi-block="true" location="component://order/template/entry/BillSettings.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -217,7 +217,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <platform-specific> <html><html-template location="component://order/template/entry/SetAdditionalParty.ftl"/></html> </platform-specific> @@ -306,7 +306,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/template/entry/CheckoutPayment.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/CheckoutPayment.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -367,7 +367,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/template/entry/SplitShip.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://order/template/entry/SplitShip.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> diff --git a/applications/order/widget/ordermgr/OrderTaskScreens.xml b/applications/order/widget/ordermgr/OrderTaskScreens.xml index 3cf7acd..996b165 100644 --- a/applications/order/widget/ordermgr/OrderTaskScreens.xml +++ b/applications/order/widget/ordermgr/OrderTaskScreens.xml @@ -92,7 +92,7 @@ Also add this back to AppHeader.ftl: <decorator-screen name="CommonOrderTaskDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/template/task/OrderTaskList.ftl"/></html> + <html><html-template multi-block="true" location="component://order/template/task/OrderTaskList.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/applications/order/widget/ordermgr/OrderViewScreens.xml b/applications/order/widget/ordermgr/OrderViewScreens.xml index 04b84ce..889b615 100644 --- a/applications/order/widget/ordermgr/OrderViewScreens.xml +++ b/applications/order/widget/ordermgr/OrderViewScreens.xml @@ -186,7 +186,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://order/template/order/OrderShippingInfo.ftl"/></html> + <html><html-template multi-block="true" location="component://order/template/order/OrderShippingInfo.ftl"/></html> </platform-specific> </widgets> </section> @@ -213,7 +213,7 @@ under the License. <decorator-screen name="CommonOrderViewDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://order/template/order/OrderList.ftl"/></html> + <html><html-template multi-block="true" location="component://order/template/order/OrderList.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -237,7 +237,7 @@ under the License. <html><html-template location="component://order/template/order/EditOrderItems.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://order/template/order/AppendOrderItem.ftl"/></html> + <html><html-template multi-block="true" location="component://order/template/order/AppendOrderItem.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -264,7 +264,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderViewDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <platform-specific> <html> <html-template multi-block="true" location="component://order/template/order/FindOrders.ftl"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |