[ofbiz-plugins] branch trunk updated: Improved: Apply multi-block attr to each application (OFBIZ-11706)
Locked
[ofbiz-plugins] 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-plugins.git The following commit(s) were added to refs/heads/trunk by this push: new ca5e6b4 Improved: Apply multi-block attr to each application (OFBIZ-11706) ca5e6b4 is described below commit ca5e6b45f12daa3855303563df5a56f242ada647 Author: James Yong <[hidden email]> AuthorDate: Sat May 16 13:37:43 2020 +0800 Improved: Apply multi-block attr to each application (OFBIZ-11706) For remaining plugin applications. --- ebay/template/find/EbayAdvancedSearch.ftl | 2 -- ebay/widget/EbayScreens.xml | 6 +++--- ebaystore/widget/EbayAccountScreens.xml | 4 ++-- ebaystore/widget/EbayStoreScreens.xml | 6 +++--- ecommerce/widget/CommonScreens.xml | 4 ++-- ecommerce/widget/OrderScreens.xml | 6 +++--- example/widget/example/FormWidgetExampleScreens.xml | 4 ++-- myportal/template/RegisterPerson.ftl | 2 -- myportal/widget/CommonScreens.xml | 4 ++-- pricat/template/pricat/viewExcelImportLog.ftl | 2 -- pricat/widget/CommonScreens.xml | 2 +- projectmgr/widget/ProjectScreens.xml | 4 ++-- scrum/widget/scrumScreens.xml | 16 ++++++++-------- webpos/widget/CartScreens.xml | 4 ++-- webpos/widget/CatalogScreens.xml | 2 +- webpos/widget/CommonScreens.xml | 4 ++-- webpos/widget/SearchScreens.xml | 4 ++-- webpos/widget/ShortcutsScreens.xml | 2 +- 18 files changed, 36 insertions(+), 42 deletions(-) diff --git a/ebay/template/find/EbayAdvancedSearch.ftl b/ebay/template/find/EbayAdvancedSearch.ftl index 6fd4d57..f48e668 100644 --- a/ebay/template/find/EbayAdvancedSearch.ftl +++ b/ebay/template/find/EbayAdvancedSearch.ftl @@ -18,7 +18,6 @@ under the License. --> <script type="application/javascript"> - //<![CDATA[ function selectChange(formId, elementId) { if (elementId.id == 'searchProductStoreId') { document.getElementById('searchCatalogId')[document.getElementById('searchCatalogId') @@ -54,7 +53,6 @@ under the License. } } } - //]]> </script> <div class="screenlet"> <div class="screenlet-title-bar"> diff --git a/ebay/widget/EbayScreens.xml b/ebay/widget/EbayScreens.xml index 19197bd..68ee737 100644 --- a/ebay/widget/EbayScreens.xml +++ b/ebay/widget/EbayScreens.xml @@ -37,7 +37,7 @@ under the License. <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://ebay/template/find/EbayAdvancedSearch.ftl"/></html> + <html><html-template multi-block="true" location="component://ebay/template/find/EbayAdvancedSearch.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -59,7 +59,7 @@ under the License. <html><html-template location="component://ebay/template/find/EbayKeywordSearch.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://ebay/template/find/EbayExportLink.ftl"/></html> + <html><html-template multi-block="true" location="component://ebay/template/find/EbayExportLink.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -84,7 +84,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEbayProductsExportToEbay}"> <platform-specific> - <html><html-template location="component://ebay/template/find/ProductsExportToEbay.ftl"/></html> + <html><html-template multi-block="true" location="component://ebay/template/find/ProductsExportToEbay.ftl"/></html> </platform-specific> </screenlet> </decorator-section> diff --git a/ebaystore/widget/EbayAccountScreens.xml b/ebaystore/widget/EbayAccountScreens.xml index 36be5ee..b727458 100644 --- a/ebaystore/widget/EbayAccountScreens.xml +++ b/ebaystore/widget/EbayAccountScreens.xml @@ -118,7 +118,7 @@ <screenlet title="${uiLabelMap.EbayLeaveFeedback}"> <include-menu name="EbayFeedbackSubTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> <platform-specific> - <html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html> + <html><html-template multi-block="true" location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html> </platform-specific> </screenlet> </screenlet> @@ -206,7 +206,7 @@ <screenlet title="${uiLabelMap.EbayLeaveFeedback}"> <include-menu name="EbayFeedbackSubTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> <platform-specific> - <html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html> + <html><html-template multi-block="true" location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html> </platform-specific> </screenlet> </screenlet> diff --git a/ebaystore/widget/EbayStoreScreens.xml b/ebaystore/widget/EbayStoreScreens.xml index f815ac0..cfe088b 100644 --- a/ebaystore/widget/EbayStoreScreens.xml +++ b/ebaystore/widget/EbayStoreScreens.xml @@ -51,7 +51,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.EbayStoreSetting}"> <platform-specific> - <html><html-template location="component://ebaystore/template/store/StoreSetting.ftl"/></html> + <html><html-template multi-block="true" location="component://ebaystore/template/store/StoreSetting.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -238,7 +238,7 @@ under the License. <html><html-template location="component://ebay/template/find/EbayKeywordSearch.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://ebay/template/find/ebayExportLink.ftl"/></html> + <html><html-template multi-block="true" location="component://ebay/template/find/ebayExportLink.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -268,7 +268,7 @@ under the License. <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://ebaystore/template/store/ProductSearchExport.ftl"/></html> + <html><html-template multi-block="true" location="component://ebaystore/template/store/ProductSearchExport.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/ecommerce/widget/CommonScreens.xml b/ecommerce/widget/CommonScreens.xml index 54777ce..27ebd17 100644 --- a/ecommerce/widget/CommonScreens.xml +++ b/ecommerce/widget/CommonScreens.xml @@ -81,7 +81,7 @@ under the License. </section> <container id="div3" style="${bodyStyle} order-lg-2 order-1"> <!-- render messages --> - <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> <decorator-section-include name="body"/> </container> <section> @@ -292,7 +292,7 @@ under the License. <widgets> <platform-specific><html><html-template multi-block="true" location="component://ecommerce/template/includes/HeaderHead.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://common-theme/template/includes/OpenHtmlBody.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> <decorator-section-include name="body"/> diff --git a/ecommerce/widget/OrderScreens.xml b/ecommerce/widget/OrderScreens.xml index 34d322b..dc59726 100644 --- a/ecommerce/widget/OrderScreens.xml +++ b/ecommerce/widget/OrderScreens.xml @@ -546,7 +546,7 @@ under the License. <script location="component://ecommerce/groovyScripts/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://ecommerce/template/order/CcInfo.ftl"/></html></platform-specific> </widgets> </section> @@ -566,7 +566,7 @@ under the License. <script location="component://ecommerce/groovyScripts/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://ecommerce/template/order/EftInfo.ftl"/></html></platform-specific> </widgets> </section> @@ -586,7 +586,7 @@ under the License. <script location="component://ecommerce/groovyScripts/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://ecommerce/template/order/GcInfo.ftl"/></html></platform-specific> </widgets> </section> diff --git a/example/widget/example/FormWidgetExampleScreens.xml b/example/widget/example/FormWidgetExampleScreens.xml index b73fd03..f81073b 100644 --- a/example/widget/example/FormWidgetExampleScreens.xml +++ b/example/widget/example/FormWidgetExampleScreens.xml @@ -77,8 +77,8 @@ under the License. <set field="asm_sortable" value="false"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific> - <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/SetDependentDropdownValuesJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <include-form name="DropDownFieldsExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> <include-form name="DropDownMultipleFieldExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> </widgets> diff --git a/myportal/template/RegisterPerson.ftl b/myportal/template/RegisterPerson.ftl index 2ebf149..c727235 100644 --- a/myportal/template/RegisterPerson.ftl +++ b/myportal/template/RegisterPerson.ftl @@ -99,14 +99,12 @@ under the License. <td><div><img id="captchaImage" src="<@ofbizUrl>captcha.jpg?captchaCodeId=captchaImage&unique=${nowTimestamp.getTime()}</@ofbizUrl>" alt="" /></div></td> </tr> <script type="application/javascript"> - <!-- function reloadCaptcha(fieldName) { var captchaUri = "<@ofbizUrl>captcha.jpg?captchaCodeId=" + fieldName + "&unique=_PLACEHOLDER_</@ofbizUrl>"; var unique = Date.now(); captchaUri = captchaUri.replace("_PLACEHOLDER_", unique); document.getElementById(fieldName).src = captchaUri; } - //--> </script> <tr> <td class="label"> </td> diff --git a/myportal/widget/CommonScreens.xml b/myportal/widget/CommonScreens.xml index b1b4963..897d84a 100644 --- a/myportal/widget/CommonScreens.xml +++ b/myportal/widget/CommonScreens.xml @@ -158,7 +158,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://myportal/template/Login.ftl"/></html> + <html><html-template multi-block="true" location="component://myportal/template/Login.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -190,7 +190,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://myportal/template/RegisterPerson.ftl"/></html> + <html><html-template multi-block="true" location="component://myportal/template/RegisterPerson.ftl"/></html> </platform-specific> </widgets> </section> diff --git a/pricat/template/pricat/viewExcelImportLog.ftl b/pricat/template/pricat/viewExcelImportLog.ftl index ed03f3e..7306e72 100644 --- a/pricat/template/pricat/viewExcelImportLog.ftl +++ b/pricat/template/pricat/viewExcelImportLog.ftl @@ -31,9 +31,7 @@ under the License. </div> <script> -<!-- jQuery(document).ready( function() { jQuery("#htmlreport").html("${StringUtil.wrapString(logFileContent!)}"); }); -//--> </script> diff --git a/pricat/widget/CommonScreens.xml b/pricat/widget/CommonScreens.xml index 3411486..a9485a6 100644 --- a/pricat/widget/CommonScreens.xml +++ b/pricat/widget/CommonScreens.xml @@ -74,7 +74,7 @@ under the License. <widgets> <decorator-screen name="main-decorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://pricat/template/pricat/viewExcelImportLog.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://pricat/template/pricat/viewExcelImportLog.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> diff --git a/projectmgr/widget/ProjectScreens.xml b/projectmgr/widget/ProjectScreens.xml index 02ca9cd..383572c 100644 --- a/projectmgr/widget/ProjectScreens.xml +++ b/projectmgr/widget/ProjectScreens.xml @@ -426,7 +426,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleProjectGanttChart}"> <platform-specific> - <html><html-template location="component://projectmgr/template/project/GanttChart.ftl"/></html> + <html><html-template multi-block="true" location="component://projectmgr/template/project/GanttChart.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -1037,7 +1037,7 @@ under the License. <container style="clear"/> <screenlet title="${uiLabelMap.PageTitleProjectGanttChart}"> <platform-specific> - <html><html-template location="component://projectmgr/template/project/GanttChart.ftl"/></html> + <html><html-template multi-block="true" location="component://projectmgr/template/project/GanttChart.ftl"/></html> </platform-specific> </screenlet> </widgets> diff --git a/scrum/widget/scrumScreens.xml b/scrum/widget/scrumScreens.xml index 9b73e8f..2533b24 100644 --- a/scrum/widget/scrumScreens.xml +++ b/scrum/widget/scrumScreens.xml @@ -148,7 +148,7 @@ under the License. <container style="body"> <screenlet title="${uiLabelMap.ScrumBurnDownChart}" id="BDChart" collapsible="true" initially-collapsed="false"> <platform-specific> - <html><html-template location="component://scrum/template/includes/BurnDown.ftl"/></html> + <html><html-template multi-block="true" location="component://scrum/template/includes/BurnDown.ftl"/></html> </platform-specific> </screenlet> </container> @@ -1687,7 +1687,7 @@ under the License. </screenlet> <screenlet title="${uiLabelMap.ScrumBacklogsStatusChart}"> <platform-specific> - <html><html-template location="component://scrum/template/includes/PieChart.ftl"/></html> + <html><html-template multi-block="true" location="component://scrum/template/includes/PieChart.ftl"/></html> </platform-specific> </screenlet> <screenlet title="${uiLabelMap.ScrumRevisions}"> @@ -2744,12 +2744,12 @@ under the License. <screenlet id="projectAndSprintStatistics" title="${uiLabelMap.ScrumProjectAndSprintInformationChart}" collapsible="true"> <container style="lefthalf"> <platform-specific> - <html><html-template location="component://scrum/template/includes/ProjectByStatusChart.ftl"/></html> + <html><html-template multi-block="true" location="component://scrum/template/includes/ProjectByStatusChart.ftl"/></html> </platform-specific> </container> <container style="righthalf"> <platform-specific> - <html><html-template location="component://scrum/template/includes/ProjectAndSprintChart.ftl"/></html> + <html><html-template multi-block="true" location="component://scrum/template/includes/ProjectAndSprintChart.ftl"/></html> </platform-specific> </container> </screenlet> @@ -2757,12 +2757,12 @@ under the License. <screenlet id="backlogStatistics" title="${uiLabelMap.ScrumBacklogInformationChart}" collapsible="true"> <container style="lefthalf"> <platform-specific> - <html><html-template location="component://scrum/template/includes/BacklogByTypeChart.ftl"/></html> + <html><html-template multi-block="true" location="component://scrum/template/includes/BacklogByTypeChart.ftl"/></html> </platform-specific> </container> <container style="righthalf"> <platform-specific> - <html><html-template location="component://scrum/template/includes/BacklogByStatusChart.ftl"/></html> + <html><html-template multi-block="true" location="component://scrum/template/includes/BacklogByStatusChart.ftl"/></html> </platform-specific> </container> </screenlet> @@ -2770,12 +2770,12 @@ under the License. <screenlet id="taskStatistics" title="${uiLabelMap.ScrumTaskInformationChart}" collapsible="true"> <container style="lefthalf"> <platform-specific> - <html><html-template location="component://scrum/template/includes/TaskByTypeChart.ftl"/></html> + <html><html-template multi-block="true" location="component://scrum/template/includes/TaskByTypeChart.ftl"/></html> </platform-specific> </container> <container style="righthalf"> <platform-specific> - <html><html-template location="component://scrum/template/includes/TaskByStatusChart.ftl"/></html> + <html><html-template multi-block="true" location="component://scrum/template/includes/TaskByStatusChart.ftl"/></html> </platform-specific> </container> </screenlet> diff --git a/webpos/widget/CartScreens.xml b/webpos/widget/CartScreens.xml index 9bb10dc..c9b83fd 100644 --- a/webpos/widget/CartScreens.xml +++ b/webpos/widget/CartScreens.xml @@ -47,7 +47,7 @@ under the License. </actions> <widgets> <container> - <platform-specific><html><html-template location="component://webpos/template/cart/ShowCart.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://webpos/template/cart/ShowCart.ftl"/></html></platform-specific> </container> </widgets> </section> @@ -79,7 +79,7 @@ under the License. </actions> <widgets> <container> - <platform-specific><html><html-template location="component://webpos/template/cart/ShowCartItemSelected.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://webpos/template/cart/ShowCartItemSelected.ftl"/></html></platform-specific> </container> </widgets> </section> diff --git a/webpos/widget/CatalogScreens.xml b/webpos/widget/CatalogScreens.xml index cb3a89e..0cd7243 100644 --- a/webpos/widget/CatalogScreens.xml +++ b/webpos/widget/CatalogScreens.xml @@ -68,7 +68,7 @@ under the License. </actions> <widgets> <container> - <platform-specific><html><html-template location="component://webpos/template/catalog/CategoryDetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://webpos/template/catalog/CategoryDetail.ftl"/></html></platform-specific> </container> </widgets> </section> diff --git a/webpos/widget/CommonScreens.xml b/webpos/widget/CommonScreens.xml index 1c417d6..230a414 100644 --- a/webpos/widget/CommonScreens.xml +++ b/webpos/widget/CommonScreens.xml @@ -241,7 +241,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://webpos/template/Login.ftl"/></html> + <html><html-template multi-block="true" location="component://webpos/template/Login.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -260,7 +260,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://webpos/template/RequirePasswordChange.ftl"/></html> + <html><html-template multi-block="true" location="component://webpos/template/RequirePasswordChange.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/webpos/widget/SearchScreens.xml b/webpos/widget/SearchScreens.xml index 1aca354..1732984 100644 --- a/webpos/widget/SearchScreens.xml +++ b/webpos/widget/SearchScreens.xml @@ -26,7 +26,7 @@ under the License. <widgets> <screenlet title="${uiLabelMap.ProductProductSearch}"> <container id="SearchProducts"> - <platform-specific><html><html-template location="component://webpos/template/search/SearchProducts.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://webpos/template/search/SearchProducts.ftl"/></html></platform-specific> </container> </screenlet> </widgets> @@ -65,7 +65,7 @@ under the License. </actions> <widgets> <container> - <platform-specific><html><html-template location="component://webpos/template/search/CustomerAddress.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://webpos/template/search/CustomerAddress.ftl"/></html></platform-specific> </container> </widgets> </section> diff --git a/webpos/widget/ShortcutsScreens.xml b/webpos/widget/ShortcutsScreens.xml index 6a09bae..aa763c9 100644 --- a/webpos/widget/ShortcutsScreens.xml +++ b/webpos/widget/ShortcutsScreens.xml @@ -46,7 +46,7 @@ under the License. </actions> <widgets> <container> - <platform-specific><html><html-template location="component://webpos/template/shortcuts/Shortcuts.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://webpos/template/shortcuts/Shortcuts.ftl"/></html></platform-specific> </container> </widgets> </section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |