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-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1785a60d67 Improved: WorkEffort - Move from hard-code menu location to
parameterized (OFBIZ-12946) (#731)
1785a60d67 is described below
commit 1785a60d67380e83502d2278d7d5916813d920f0
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Sun Mar 17 18:07:53 2024 +0100
Improved: WorkEffort - Move from hard-code menu location to parameterized
(OFBIZ-12946) (#731)
Move the menu location in the various workeffort screens from hard-coded to
parameterized.
modified:
- CalendarScreens.xml
- CommonScreens.xml
- TimesheetScreens.xml
- WorkEffortForms.xml
- WorkEffortScreens.xml
---
applications/workeffort/widget/CalendarScreens.xml | 8 ++++----
applications/workeffort/widget/CommonScreens.xml | 14 +++++++-------
applications/workeffort/widget/CustRequestScreens.xml | 2 +-
applications/workeffort/widget/TimesheetScreens.xml | 2 +-
applications/workeffort/widget/WorkEffortForms.xml | 4 ++--
applications/workeffort/widget/WorkEffortScreens.xml | 12 ++++++------
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/applications/workeffort/widget/CalendarScreens.xml
b/applications/workeffort/widget/CalendarScreens.xml
index 67b6e98b69..a0bbae7abd 100644
--- a/applications/workeffort/widget/CalendarScreens.xml
+++ b/applications/workeffort/widget/CalendarScreens.xml
@@ -51,7 +51,7 @@ under the License.
<include-screen name="eventDetail"/>
<container style="bothclear">
<screenlet title="${uiLabelMap.WorkEffortDayView}:
${groovy:org.apache.ofbiz.base.util.UtilDateTime.timeStampToString(start,
"EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day"
padded="false">
- <include-menu name="Day"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="Day"
location="${parameters.mainMenuLocation}"/>
<platform-specific>
<html><html-template
location="component://workeffort/template/calendar/Day.ftl"/></html>
</platform-specific>
@@ -73,7 +73,7 @@ under the License.
<include-screen name="eventDetail"/>
<container style="bothclear">
<screenlet title="${uiLabelMap.WorkEffortWeekView}:
${uiLabelMap.CommonWeek}
${groovy:org.apache.ofbiz.base.util.UtilDateTime.timeStampToString(start,
"w", timeZone, locale)}" navigation-menu-name="Week" padded="false">
- <include-menu name="Week"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="Week"
location="${parameters.mainMenuLocation}"/>
<platform-specific>
<html><html-template
location="component://workeffort/template/calendar/Week.ftl"/></html>
</platform-specific>
@@ -92,7 +92,7 @@ under the License.
<include-screen name="eventDetail"/>
<container style="bothclear">
<screenlet title="${uiLabelMap.WorkEffortMonthView}:
${groovy:org.apache.ofbiz.base.util.UtilDateTime.timeStampToString(start,
"MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month"
padded="false">
- <include-menu name="Month"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="Month"
location="${parameters.mainMenuLocation}"/>
<platform-specific>
<html><html-template
location="component://workeffort/template/calendar/Month.ftl"/></html>
</platform-specific>
@@ -111,7 +111,7 @@ under the License.
<include-screen name="eventDetail"/>
<container style="bothclear">
<screenlet
title="${uiLabelMap.WorkEffortCalendarUpComingEventsView}"
navigation-menu-name="Upcoming">
- <include-menu name="Upcoming"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="Upcoming"
location="${parameters.mainMenuLocation}"/>
<platform-specific>
<html><html-template
location="component://workeffort/template/calendar/Upcoming.ftl"/></html>
</platform-specific>
diff --git a/applications/workeffort/widget/CommonScreens.xml
b/applications/workeffort/widget/CommonScreens.xml
index 3f364c6d91..dbcb67e480 100644
--- a/applications/workeffort/widget/CommonScreens.xml
+++ b/applications/workeffort/widget/CommonScreens.xml
@@ -42,7 +42,7 @@ under the License.
<!-- <set field="layoutSettings.headerRightBackgroundUrl"
value="" global="true"/> -->
<set field="activeApp" value="workeffort" global="true"/>
<set field="applicationMenuName" value="WorkEffortAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://workeffort/widget/WorkEffortMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_core_business_applications"/>
<set field="applicationTitle"
from-field="uiLabelMap.WorkEffortManagerApplication" global="true"/>
</actions>
@@ -70,7 +70,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<and>
@@ -79,7 +79,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="WorkEffortTabBar"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="WorkEffortTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -131,7 +131,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -169,7 +169,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -221,7 +221,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<platform-specific>
@@ -242,7 +242,7 @@ under the License.
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="WorkEffortShortcutAppBar"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="WorkEffortShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/workeffort/widget/CustRequestScreens.xml
b/applications/workeffort/widget/CustRequestScreens.xml
index d8d30789be..2edac0d408 100644
--- a/applications/workeffort/widget/CustRequestScreens.xml
+++ b/applications/workeffort/widget/CustRequestScreens.xml
@@ -37,7 +37,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<screenlet
title="${uiLabelMap.WorkEffortMyRequestList}">
diff --git a/applications/workeffort/widget/TimesheetScreens.xml
b/applications/workeffort/widget/TimesheetScreens.xml
index 40e713beab..8115c70cd3 100644
--- a/applications/workeffort/widget/TimesheetScreens.xml
+++ b/applications/workeffort/widget/TimesheetScreens.xml
@@ -44,7 +44,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<screenlet
title="${uiLabelMap.WorkEffortMyCurrentTimesheets}">
diff --git a/applications/workeffort/widget/WorkEffortForms.xml
b/applications/workeffort/widget/WorkEffortForms.xml
index 67aabb3222..ff983ce5e7 100644
--- a/applications/workeffort/widget/WorkEffortForms.xml
+++ b/applications/workeffort/widget/WorkEffortForms.xml
@@ -451,13 +451,13 @@ under the License.
</field>
-->
<field name="deleteLink" title=" ">
- <include-menu name="ListWorkEffortMenuBar"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="ListWorkEffortMenuBar"
location="${parameters.mainMenuLocation}"/>
</field>
</grid>
<grid name="FoundWorkEfforts" extends="ListWorkEfforts"
paginate-target="FoundWorkEfforts">
<field name="deleteLink" title=" ">
- <include-menu name="FoundWorkEffortInLineBar"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="FoundWorkEffortInLineBar"
location="${parameters.mainMenuLocation}"/>
</field>
</grid>
diff --git a/applications/workeffort/widget/WorkEffortScreens.xml
b/applications/workeffort/widget/WorkEffortScreens.xml
index 092910e186..3a5697f682 100644
--- a/applications/workeffort/widget/WorkEffortScreens.xml
+++ b/applications/workeffort/widget/WorkEffortScreens.xml
@@ -36,7 +36,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -71,7 +71,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -158,7 +158,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<include-screen name="FindWorkEfforts"
location="component://workeffort/widget/workeffort/WorkEffortCpd.xml"/>
@@ -674,13 +674,13 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<not><if-empty field="workEffort"/></not>
</condition>
<widgets>
- <include-menu name="ICalendarTabBar"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="ICalendarTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -719,7 +719,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
