[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 591b044 Improved: Apply multi-block attr to each application (OFBIZ-11706) 591b044 is described below commit 591b0442c72391912957797f13c948db4e68d58a Author: James Yong <[hidden email]> AuthorDate: Fri May 15 21:25:12 2020 +0800 Improved: Apply multi-block attr to each application (OFBIZ-11706) For Webtools, Themes. --- framework/webtools/widget/EntityScreens.xml | 4 ++-- framework/webtools/widget/GeoManagementScreens.xml | 4 ++-- framework/webtools/widget/LabelManagerScreens.xml | 2 +- framework/webtools/widget/ServiceScreens.xml | 4 ++-- themes/common-theme/widget/CommonScreens.xml | 8 ++++---- themes/common-theme/widget/HelpScreens.xml | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/framework/webtools/widget/EntityScreens.xml b/framework/webtools/widget/EntityScreens.xml index d5f39e5..f03c78a 100644 --- a/framework/webtools/widget/EntityScreens.xml +++ b/framework/webtools/widget/EntityScreens.xml @@ -252,7 +252,7 @@ under the License. <decorator-screen name="CommonEntityDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://webtools/template/entity/ViewGeneric.ftl"/></html> + <html><html-template multi-block="true" location="component://webtools/template/entity/ViewGeneric.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -429,7 +429,7 @@ under the License. <decorator-screen name="CommonEntityDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet> - <platform-specific><html><html-template location="component://webtools/template/entity/CheckDb.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://webtools/template/entity/CheckDb.ftl"/></html></platform-specific> </screenlet> </decorator-section> </decorator-screen> diff --git a/framework/webtools/widget/GeoManagementScreens.xml b/framework/webtools/widget/GeoManagementScreens.xml index 97e1c37..f681089 100644 --- a/framework/webtools/widget/GeoManagementScreens.xml +++ b/framework/webtools/widget/GeoManagementScreens.xml @@ -64,7 +64,7 @@ </screenlet> <screenlet title="${uiLabelMap.CommonMap}"> <platform-specific> - <html><html-template location="component://webtools/template/geo/GeoLocation.ftl"/></html> + <html><html-template multi-block="true" location="component://webtools/template/geo/GeoLocation.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -178,7 +178,7 @@ <widgets> <decorator-screen name="CommonGeoManagementDecorator" location="${parameters.mainDecoratorLocation}"> <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> <screenlet title="${uiLabelMap.WebtoolsGeosLinkExplained}"> <include-form name="LinkGeos" location="component://webtools/widget/GeoManagementForms.xml"/> </screenlet> diff --git a/framework/webtools/widget/LabelManagerScreens.xml b/framework/webtools/widget/LabelManagerScreens.xml index f29d195..ad85324 100644 --- a/framework/webtools/widget/LabelManagerScreens.xml +++ b/framework/webtools/widget/LabelManagerScreens.xml @@ -71,7 +71,7 @@ under the License. <container style="h1"> <label text="${uiLabelMap.WebtoolsLabelManagerAddNew}"/> </container> - <platform-specific><html><html-template location="component://webtools/template/labelmanager/UpdateLabel.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://webtools/template/labelmanager/UpdateLabel.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> diff --git a/framework/webtools/widget/ServiceScreens.xml b/framework/webtools/widget/ServiceScreens.xml index 38f7266..a3545e1 100644 --- a/framework/webtools/widget/ServiceScreens.xml +++ b/framework/webtools/widget/ServiceScreens.xml @@ -58,7 +58,7 @@ under the License. <include-screen name="JobManagerLockEnable"/> <section> <widgets> - <platform-specific><html><html-template location="component://common-theme/template/includes/ServerHour24HourFormatJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/ServerHour24HourFormatJs.ftl"/></html></platform-specific> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="FindJobs" location="component://webtools/widget/ServiceForms.xml"/> @@ -195,7 +195,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleScheduleJob}"> <platform-specific> - <html><html-template location="component://webtools/template/service/SetServiceParameterSync.ftl"/></html> + <html><html-template multi-block="true" location="component://webtools/template/service/SetServiceParameterSync.ftl"/></html> </platform-specific> </screenlet> </decorator-section> diff --git a/themes/common-theme/widget/CommonScreens.xml b/themes/common-theme/widget/CommonScreens.xml index 7b281f0..b02d774 100644 --- a/themes/common-theme/widget/CommonScreens.xml +++ b/themes/common-theme/widget/CommonScreens.xml @@ -368,7 +368,7 @@ under the License. <if-compare value="layer" operator="not-equals" field="parameters.presentation"/> </condition> <widgets> - <platform-specific><html><html-template location="component://common-theme/template/includes/Lookup.ftl" /></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Lookup.ftl" /></html></platform-specific> </widgets> </section> <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> @@ -658,7 +658,7 @@ under the License. <screen name="EventMessages"> <section> <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> </widgets> </section> </screen> @@ -720,7 +720,7 @@ under the License. </actions> <widgets> <platform-specific><html><html-template location="component://common-theme/template/ViewBlocked.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> </widgets> </section> </screen> @@ -732,7 +732,7 @@ under the License. </actions> <widgets> <platform-specific> - <html><html-template location="component://common-theme/template/includes/GeoLocation.ftl"/></html> + <html><html-template multi-block="true" location="component://common-theme/template/includes/GeoLocation.ftl"/></html> </platform-specific> </widgets> </section> diff --git a/themes/common-theme/widget/HelpScreens.xml b/themes/common-theme/widget/HelpScreens.xml index abe6ba3..0c9563c 100644 --- a/themes/common-theme/widget/HelpScreens.xml +++ b/themes/common-theme/widget/HelpScreens.xml @@ -30,8 +30,8 @@ under the License. <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC" default-value="component://common-theme/template/includes/Messages.ftl"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common-theme/template/includes/Lookup.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Lookup.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="${messagesTemplateLocation}"/></html></platform-specific> <container style="contentarea"> <container id="column-container"> <!-- by default will render left-bar only if leftbarScreen value not empty --> @@ -177,7 +177,7 @@ under the License. <screenlet title="${uiLabelMap.PageTitleNavigateContent}" > <container style="left-border"> <container id="EditDocumentTree"/> - <platform-specific><html><html-template location="component://content/template/content/DisplayContentNav.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://content/template/content/DisplayContentNav.ftl"/></html></platform-specific> </container> <container style="leftonly"> <include-screen name="showDocumentHelp"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |