Author: jleroux
Date: Sun Sep 29 08:12:37 2019
New Revision: 1867701
URL:
http://svn.apache.org/viewvc?rev=1867701&view=revLog:
Improved: Make Create Menu tab bar for Calendar consistent
(OFBIZ-8193)
Adds a create Calendar tab bar in the main decorator to maintain the consistency
throughout the tab bar of Calendar. Also a button in EditCalendar.ftl
Thanks: Avnindra Sharma for the report and patch, Pierre Smits for testing
Modified:
ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditCalendar.ftl
ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditCalendar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditCalendar.ftl?rev=1867701&r1=1867700&r2=1867701&view=diff==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditCalendar.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditCalendar.ftl Sun Sep 29 08:12:37 2019
@@ -26,7 +26,6 @@ under the License.
<br class="clear"/>
</div>
<div class="screenlet-body">
- <div class="button-bar"><a href="<@ofbizUrl>EditCalendar</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a></div>
<form name="calendarform" method="post" action="<@ofbizUrl>UpdateCalendar</@ofbizUrl>">
<input type="hidden" name="calendarId" value="${techDataCalendar.calendarId}" />
<#else>
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?rev=1867701&r1=1867700&r2=1867701&view=diff==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Sun Sep 29 08:12:37 2019
@@ -28,6 +28,10 @@ under the License.
<section>
<widgets>
<include-menu name="CalendarTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <container style="button-bar">
+ <link style="buttontext" target="EditCalendar" text="${uiLabelMap.ManufacturingNewCalendar}"/>
+ <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/>
+ </container>
<decorator-section-include name="body"/>
</widgets>
</section>
@@ -77,9 +81,6 @@ under the License.
<decorator-screen name="CommonCalendarDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleFindCalendar}">
- <container style="button-bar">
- <link style="buttontext" target="EditCalendar" text="${uiLabelMap.ManufacturingNewCalendar}"/>
- </container>
<include-form name="ListTechDataCalendars" location="component://manufacturing/widget/manufacturing/CalendarForms.xml"/>
</screenlet>
</decorator-section>
@@ -103,9 +104,6 @@ under the License.
<decorator-screen name="CommonCalendarDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleListCalendarWeek}">
- <container style="button-bar">
- <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/>
- </container>
<include-form name="ListCalendarWeek" location="component://manufacturing/widget/manufacturing/CalendarForms.xml"/>
</screenlet>
</decorator-section>
Locked
