This is an automated email from the ASF dual-hosted git repository.
jleroux 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 98d87c5d3 Improved: Example - Move from hard-coded menu location to
parameterized (OFBIZ-12967) (#100)
98d87c5d3 is described below
commit 98d87c5d3a65c40dd0aac4b5d2a29644e3f641b3
Author: Pierre Smits <[email protected]>
AuthorDate: Thu Mar 28 09:39:48 2024 +0100
Improved: Example - Move from hard-coded menu location to parameterized
(OFBIZ-12967) (#100)
Move the menu location in the various example screens from hard-coded to
parameterized.
modified:
- CommonScreens.xml
- ExampleScreens.xml
---
example/widget/example/CommonScreens.xml | 12 ++++++------
example/widget/example/ExampleScreens.xml | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/example/widget/example/CommonScreens.xml
b/example/widget/example/CommonScreens.xml
index 3f2c18d6a..132e632f2 100644
--- a/example/widget/example/CommonScreens.xml
+++ b/example/widget/example/CommonScreens.xml
@@ -41,7 +41,7 @@ under the License.
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.ExampleCompanySubtitle" global="true"/>
<set field="activeApp" value="example" global="true"/>
<set field="applicationMenuName" value="ExampleAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://example/widget/example/ExampleMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="applicationTitle"
from-field="uiLabelMap.ExampleApplication" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_example"/>
</actions>
@@ -118,7 +118,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="EditExample"
location="component://example/widget/example/ExampleMenus.xml"/>
+ <include-menu name="EditExample"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -198,7 +198,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="EditExampleFeature"
location="component://example/widget/example/ExampleMenus.xml"/>
+ <include-menu name="EditExampleFeature"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -252,7 +252,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="ExampleGeoLocation"
location="component://example/widget/example/ExampleMenus.xml"/>
+ <include-menu name="ExampleGeoLocation"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<container style="clear" />
@@ -276,7 +276,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="ExampleGeoLocation"
location="component://example/widget/example/ExampleMenus.xml"/>
+ <include-menu name="ExampleGeoLocation"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<container style="clear" />
@@ -300,7 +300,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="ExampleCharts"
location="component://example/widget/example/ExampleMenus.xml"/>
+ <include-menu name="ExampleCharts"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<container style="clear" />
diff --git a/example/widget/example/ExampleScreens.xml
b/example/widget/example/ExampleScreens.xml
index 2ad3ec917..15ca3019d 100644
--- a/example/widget/example/ExampleScreens.xml
+++ b/example/widget/example/ExampleScreens.xml
@@ -275,7 +275,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="ExampleGeoLocation"
location="component://example/widget/example/ExampleMenus.xml"/>
+ <include-menu name="ExampleGeoLocation"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -349,7 +349,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="ExampleGeoLocation"
location="component://example/widget/example/ExampleMenus.xml"/>
+ <include-menu name="ExampleGeoLocation"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -463,7 +463,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="ExampleGeoLocation"
location="component://example/widget/example/ExampleMenus.xml"/>
+ <include-menu name="ExampleGeoLocation"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
