[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 a9843cc Improved: Apply multi-block attr to each application (OFBIZ-11706) a9843cc is described below commit a9843ccba1cdee6b87a9e4d48e87f60fcec676cb Author: James Yong <[hidden email]> AuthorDate: Fri May 15 21:01:04 2020 +0800 Improved: Apply multi-block attr to each application (OFBIZ-11706) For Product application. --- .../template/facility/BatchPrintMarkAsAccepted.ftl | 3 --- applications/product/template/find/KeywordSearchBox.ftl | 2 -- applications/product/widget/catalog/CategoryScreens.xml | 4 ++-- applications/product/widget/catalog/CommonScreens.xml | 6 +++--- applications/product/widget/catalog/ConfigScreens.xml | 2 +- applications/product/widget/catalog/FindScreens.xml | 2 +- .../product/widget/catalog/ImageManagementScreens.xml | 16 ++++++++-------- applications/product/widget/catalog/PriceScreens.xml | 2 +- applications/product/widget/catalog/ProductScreens.xml | 8 ++++---- applications/product/widget/facility/FacilityScreens.xml | 10 +++++----- applications/product/widget/facility/ShipmentScreens.xml | 8 ++++---- 11 files changed, 29 insertions(+), 34 deletions(-) diff --git a/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl b/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl index 2f6d6da..f10a7dc 100644 --- a/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl +++ b/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl @@ -33,14 +33,11 @@ under the License. --> - <script type="application/javascript"> -<!-- function markAsAccepted() { document.Labels.action = "<@ofbizUrl>BatchUpdateShipmentRouteSegments?facilityId=${parameters.facilityId}</@ofbizUrl>"; document.Labels.submit(); } -//--> </script> <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductMarkAsAccepted}" onclick="javascript:markAsAccepted()"/> diff --git a/applications/product/template/find/KeywordSearchBox.ftl b/applications/product/template/find/KeywordSearchBox.ftl index 47d304a..9e5f61f 100644 --- a/applications/product/template/find/KeywordSearchBox.ftl +++ b/applications/product/template/find/KeywordSearchBox.ftl @@ -19,7 +19,6 @@ under the License. <#if (requestAttributes.uiLabelMap)??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> <script type="application/javascript"> -//<![CDATA[ function changeCategory() { document.forms["keywordsearchform"].elements["SEARCH_CATEGORY_ID"].value=document.forms["advancedsearchform"].elements["DUMMYCAT"].value; document.forms["advancedsearchform"].elements["SEARCH_CATEGORY_ID"].value=document.forms["advancedsearchform"].elements["DUMMYCAT"].value; @@ -29,7 +28,6 @@ under the License. jQuery('#productJumpForm').attr('action', jQuery('#dummyPage').val()); jQuery('#productJumpForm').submit(); } -//]]> </script> <form name="keywordsearchform" id="keywordSearchForm" method="post" action="<@ofbizUrl>keywordsearch?VIEW_SIZE=25&PAGING=Y</@ofbizUrl>"> diff --git a/applications/product/widget/catalog/CategoryScreens.xml b/applications/product/widget/catalog/CategoryScreens.xml index 73ab671..074a944 100644 --- a/applications/product/widget/catalog/CategoryScreens.xml +++ b/applications/product/widget/catalog/CategoryScreens.xml @@ -124,7 +124,7 @@ under the License. <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/category/EditCategory.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/category/EditCategory.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -191,7 +191,7 @@ under the License. </fail-widgets> </section> <platform-specific> - <html><html-template location="component://product/template/category/EditCategory.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/category/EditCategory.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/applications/product/widget/catalog/CommonScreens.xml b/applications/product/widget/catalog/CommonScreens.xml index 77e8588..c3842fd 100644 --- a/applications/product/widget/catalog/CommonScreens.xml +++ b/applications/product/widget/catalog/CommonScreens.xml @@ -274,7 +274,7 @@ under the License. </actions> <widgets> <screenlet id="ProductKeywordsPanel" title="${uiLabelMap.ProductSearchProducts}" collapsible="true"> - <platform-specific><html><html-template location="component://product/template/find/KeywordSearchBox.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://product/template/find/KeywordSearchBox.ftl"/></html></platform-specific> </screenlet> </widgets> </section> @@ -343,7 +343,7 @@ under the License. <widgets> <screenlet id="ProductBrowseCategoriesPanel" title="${uiLabelMap.ProductBrowseCatalogeAndCategories}" collapsible="true"> <container id="EditDocumentTree"/> - <platform-specific><html><html-template location="component://product/template/category/CategoryTree.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://product/template/category/CategoryTree.ftl"/></html></platform-specific> </screenlet> </widgets> </section> @@ -360,7 +360,7 @@ under the License. <widgets> <screenlet id="ProductStoreGroupPanel" title="${uiLabelMap.ProductParentProductStoreGroups}" collapsible="true"> <container id="EditDocumentTree"/> - <platform-specific><html><html-template location="component://product/template/store/ProductStoreGroupTree.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://product/template/store/ProductStoreGroupTree.ftl"/></html></platform-specific> </screenlet> </widgets> </section> diff --git a/applications/product/widget/catalog/ConfigScreens.xml b/applications/product/widget/catalog/ConfigScreens.xml index 235b564..fea0bdf 100644 --- a/applications/product/widget/catalog/ConfigScreens.xml +++ b/applications/product/widget/catalog/ConfigScreens.xml @@ -224,7 +224,7 @@ under the License. <decorator-screen name="CommonConfigDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/config/EditProductConfigItemContent.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/config/EditProductConfigItemContent.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/applications/product/widget/catalog/FindScreens.xml b/applications/product/widget/catalog/FindScreens.xml index 3961b16..dc88b05 100644 --- a/applications/product/widget/catalog/FindScreens.xml +++ b/applications/product/widget/catalog/FindScreens.xml @@ -81,7 +81,7 @@ under the License. <decorator-screen name="CommonFindDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/find/KeywordSearch.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/find/KeywordSearch.ftl"/></html> </platform-specific> <platform-specific> <html><html-template location="component://product/template/find/KeywordSearchActions.ftl"/></html> diff --git a/applications/product/widget/catalog/ImageManagementScreens.xml b/applications/product/widget/catalog/ImageManagementScreens.xml index e09d66f..f235726 100644 --- a/applications/product/widget/catalog/ImageManagementScreens.xml +++ b/applications/product/widget/catalog/ImageManagementScreens.xml @@ -212,7 +212,7 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://product/template/imagemanagement/ShowPeopleApprove.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/imagemanagement/ShowPeopleApprove.ftl"/></html> </platform-specific> <screenlet title="${uiLabelMap.ImageManagementApprove}"> <include-form name="ImageApprove" location="component://product/widget/catalog/ImageManagementForms.xml"/> @@ -260,7 +260,7 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://product/template/imagemanagement/ShowPeopleApprove.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/imagemanagement/ShowPeopleApprove.ftl"/></html> </platform-specific> <screenlet title="${uiLabelMap.CommonApproved}"> <include-grid name="ListPeopleApproved" location="component://product/widget/catalog/ImageManagementForms.xml"/> @@ -347,7 +347,7 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://product/template/imagemanagement/ShowPeopleApprove.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/imagemanagement/ShowPeopleApprove.ftl"/></html> </platform-specific> <screenlet title="${uiLabelMap.CommonRejected}"> <include-form name="ListPeopleRejected" location="component://product/widget/catalog/ImageManagementForms.xml"/> @@ -481,7 +481,7 @@ under the License. <screenlet title="${uiLabelMap.ImageManagementImageFrames}"> <include-form name="ImageFrames" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> - <html><html-template location="component://product/template/imagemanagement/ImageFrame.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/imagemanagement/ImageFrame.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -513,7 +513,7 @@ under the License. <screenlet title="${uiLabelMap.ImageManagementImageCropping}"> <include-form name="ImageCropping" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> - <html><html-template location="component://product/template/imagemanagement/ImageCrop.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/imagemanagement/ImageCrop.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -548,7 +548,7 @@ under the License. </platform-specific> <include-form name="ImageRotating" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> - <html><html-template location="component://product/template/imagemanagement/ImageRotating.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/imagemanagement/ImageRotating.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -577,7 +577,7 @@ under the License. <screenlet title="${uiLabelMap.ImageManagementShareImage}"> <include-form name="ImageShare" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> - <html><html-template location="component://product/template/imagemanagement/ImageShare.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/imagemanagement/ImageShare.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -703,7 +703,7 @@ under the License. <widgets> <image src="${parameters.drObjectInfo}"/> <platform-specific> - <html><html-template location="component://product/template/imagemanagement/ResizeImage.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/imagemanagement/ResizeImage.ftl"/></html> </platform-specific> </widgets> </section> diff --git a/applications/product/widget/catalog/PriceScreens.xml b/applications/product/widget/catalog/PriceScreens.xml index 899855d..33cafd9 100644 --- a/applications/product/widget/catalog/PriceScreens.xml +++ b/applications/product/widget/catalog/PriceScreens.xml @@ -79,7 +79,7 @@ under the License. <widgets> <decorator-screen name="CommonPriceDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://product/template/price/SetPriceRulesCondEventJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://product/template/price/SetPriceRulesCondEventJs.ftl"/></html></platform-specific> <include-menu name="PriceRulesButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <screenlet title="${uiLabelMap.ProductPriceRuleId} [${parameters.productPriceRuleId}]"> <label style="h6" text="${uiLabelMap.ProductConditionsActionsRemoveBefore}"/> diff --git a/applications/product/widget/catalog/ProductScreens.xml b/applications/product/widget/catalog/ProductScreens.xml index 2583b5e..a52b209 100644 --- a/applications/product/widget/catalog/ProductScreens.xml +++ b/applications/product/widget/catalog/ProductScreens.xml @@ -540,7 +540,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductQuickAdmin}"> <platform-specific> - <html><html-template location="component://product/template/product/QuickAddVariants.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/product/QuickAddVariants.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -563,7 +563,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://product/template/product/EditProductQuickAdmin.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/product/EditProductQuickAdmin.ftl"/></html> </platform-specific> </widgets> </section> @@ -929,7 +929,7 @@ under the License. </screenlet> <screenlet title="${uiLabelMap.ProductOverrideSimpleFields}"> <platform-specific> - <html><html-template location="component://product/template/product/EditProductContent.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/product/EditProductContent.ftl"/></html> </platform-specific> </screenlet> <screenlet title="${uiLabelMap.ProductAddAdditionalImages}"> @@ -1318,7 +1318,7 @@ under the License. <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/product/ViewProductOrders.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/product/ViewProductOrders.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/applications/product/widget/facility/FacilityScreens.xml b/applications/product/widget/facility/FacilityScreens.xml index 356a02a..1181e0a 100644 --- a/applications/product/widget/facility/FacilityScreens.xml +++ b/applications/product/widget/facility/FacilityScreens.xml @@ -1093,7 +1093,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/inventory/ReceiveInventory.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/inventory/ReceiveInventory.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1113,7 +1113,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/returns/ReceiveReturn.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/returns/ReceiveReturn.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1264,7 +1264,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/facility/PicklistManage.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/facility/PicklistManage.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1293,7 +1293,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/facility/PickMoveStock.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/facility/PickMoveStock.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1438,7 +1438,7 @@ under the License. <screenlet title="${uiLabelMap.PageTitleLabelPrinting}"> <include-form name="Labels" location="component://product/widget/facility/FacilityForms.xml"/> <platform-specific> - <html><html-template location="component://product/template/facility/BatchPrintMarkAsAccepted.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/facility/BatchPrintMarkAsAccepted.ftl"/></html> </platform-specific> </screenlet> </decorator-section> diff --git a/applications/product/widget/facility/ShipmentScreens.xml b/applications/product/widget/facility/ShipmentScreens.xml index 25e7d94..732f08b 100644 --- a/applications/product/widget/facility/ShipmentScreens.xml +++ b/applications/product/widget/facility/ShipmentScreens.xml @@ -380,7 +380,7 @@ under the License. <decorator-screen name="CommonShipmentMainDecorator" location="${parameters.commonShipmentDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/shipment/QuickShipOrder.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/shipment/QuickShipOrder.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -400,7 +400,7 @@ under the License. <decorator-screen name="CommonShipmentMainDecorator" location="${parameters.commonShipmentDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/shipment/VerifyPick.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/shipment/VerifyPick.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -419,7 +419,7 @@ under the License. <decorator-screen name="CommonShipmentMainDecorator" location="${parameters.commonShipmentDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/shipment/PackOrder.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/shipment/PackOrder.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -568,7 +568,7 @@ under the License. <decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl"/></html> + <html><html-template multi-block="true" location="component://product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |