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 54033bc8f Improved: EBAYStore - Move from hard-coded menu location to
parameterized (OFBIZ-12960) (#99)
54033bc8f is described below
commit 54033bc8f1bf17b5aaf37caee6babb05c6916a88
Author: Pierre Smits <[email protected]>
AuthorDate: Wed Mar 27 19:21:57 2024 +0100
Improved: EBAYStore - Move from hard-coded menu location to parameterized
(OFBIZ-12960) (#99)
Move the menu location in the various ebaystore screens from hard-coded to
parameterized.
modified:
- CommonScreens.xml
- EbayAccountScreens.xml
- EbaySellingManagerScreens.xml
- EbayStoreScreens.xml
---
ebaystore/widget/CommonScreens.xml | 8 ++++----
ebaystore/widget/EbayAccountScreens.xml | 8 ++++----
ebaystore/widget/EbaySellingManagerScreens.xml | 4 ++--
ebaystore/widget/EbayStoreScreens.xml | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ebaystore/widget/CommonScreens.xml
b/ebaystore/widget/CommonScreens.xml
index fc88df36c..d6b02e5a4 100644
--- a/ebaystore/widget/CommonScreens.xml
+++ b/ebaystore/widget/CommonScreens.xml
@@ -31,7 +31,7 @@
<set field="layoutSettings.companyName"
from-field="uiLabelMap.EbayStoreCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.EbayStoreApplication" global="true"/>
<set field="applicationMenuName" value="EbayStoreAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://ebaystore/widget/EbayStoreMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="applicationTitle"
from-field="uiLabelMap.EbayStoreApplication" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_ebay_store"/>
</actions>
@@ -73,7 +73,7 @@
<widgets>
<include-form
name="EbayAccountSelection"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
<label
text="${uiLabelMap.EbayAccount} : ${person.firstName} ${person.lastName}"
style="h1"></label>
- <include-menu
name="EbayStoreFunctionTabBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu
name="EbayStoreFunctionTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</container>
@@ -131,7 +131,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="EbaySellingManagerTabBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu name="EbaySellingManagerTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</widgets>
</section>
@@ -150,7 +150,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="EbayAccountTabBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu name="EbayAccountTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</widgets>
</section>
diff --git a/ebaystore/widget/EbayAccountScreens.xml
b/ebaystore/widget/EbayAccountScreens.xml
index 8b92ffe2f..3bd0f66e3 100644
--- a/ebaystore/widget/EbayAccountScreens.xml
+++ b/ebaystore/widget/EbayAccountScreens.xml
@@ -56,7 +56,7 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.EbayFeedback}">
- <include-menu name="EbayFeedbackTabBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu name="EbayFeedbackTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</screenlet>
</widgets>
@@ -118,7 +118,7 @@
<decorator-section name="body">
<screenlet>
<screenlet title="${uiLabelMap.EbayLeaveFeedback}">
- <include-menu name="EbayFeedbackSubTabBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu name="EbayFeedbackSubTabBar"
location="${parameters.mainMenuLocation}"/>
<platform-specific>
<html><html-template multi-block="true"
location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
</platform-specific>
@@ -146,7 +146,7 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.EbayFeedback}">
- <include-menu name="EbayFeedbackTabBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu name="EbayFeedbackTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</screenlet>
</widgets>
@@ -206,7 +206,7 @@
<decorator-section name="body">
<screenlet>
<screenlet title="${uiLabelMap.EbayLeaveFeedback}">
- <include-menu name="EbayFeedbackSubTabBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu name="EbayFeedbackSubTabBar"
location="${parameters.mainMenuLocation}"/>
<platform-specific>
<html><html-template multi-block="true"
location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
</platform-specific>
diff --git a/ebaystore/widget/EbaySellingManagerScreens.xml
b/ebaystore/widget/EbaySellingManagerScreens.xml
index 045113671..05f173cab 100644
--- a/ebaystore/widget/EbaySellingManagerScreens.xml
+++ b/ebaystore/widget/EbaySellingManagerScreens.xml
@@ -717,7 +717,7 @@
<widgets/>
</section>
<screenlet title="Order Listings (Import
single Transactions)">
- <include-menu name="EbayOrderSubBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu name="EbayOrderSubBar"
location="${parameters.mainMenuLocation}"/>
<include-form
name="FindEbayStoreOrders"
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
<include-form name="TransactionList"
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
</screenlet>
@@ -748,7 +748,7 @@
<widgets/>
</section>
<screenlet title="Order Listings (Import
many transactions)">
- <include-menu name="EbayOrderSubBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu name="EbayOrderSubBar"
location="${parameters.mainMenuLocation}"/>
<include-form
name="FindEbayStoreOrders"
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
<include-form name="OrderList"
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
</screenlet>
diff --git a/ebaystore/widget/EbayStoreScreens.xml
b/ebaystore/widget/EbayStoreScreens.xml
index 18a23ad4f..86a5bbd0c 100644
--- a/ebaystore/widget/EbayStoreScreens.xml
+++ b/ebaystore/widget/EbayStoreScreens.xml
@@ -30,7 +30,7 @@ under the License.
<widgets>
<decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EbaySubTabBar"
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu name="EbaySubTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet title="Ebay Accounts">
<include-form name="EbayAccountList"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
</screenlet>
