You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/04/02 12:36:00 UTC
svn commit: r1737486 - in /ofbiz/trunk/applications: humanres/widget/
workeffort/template/ workeffort/template/calendar/
workeffort/template/find/ workeffort/template/task/
workeffort/template/workeffort/ workeffort/webapp/workeffort/
workeffort/webapp...
Author: deepak
Date: Sat Apr 2 10:36:00 2016
New Revision: 1737486
URL: http://svn.apache.org/viewvc?rev=1737486&view=rev
Log:
(OFBIZ-6822) Applied slightly modified patch from jira isseu, use svn mv command to move .ftl files to new location.
Added:
ofbiz/trunk/applications/workeffort/template/
ofbiz/trunk/applications/workeffort/template/calendar/
- copied from r1737472, ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/
ofbiz/trunk/applications/workeffort/template/find/
- copied from r1737472, ofbiz/trunk/applications/workeffort/webapp/workeffort/find/
ofbiz/trunk/applications/workeffort/template/main.ftl
- copied unchanged from r1737472, ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl
ofbiz/trunk/applications/workeffort/template/task/
- copied from r1737472, ofbiz/trunk/applications/workeffort/webapp/workeffort/task/
ofbiz/trunk/applications/workeffort/template/workeffort/
- copied from r1737472, ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/
Removed:
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/
ofbiz/trunk/applications/workeffort/webapp/workeffort/find/
ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/task/
ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/
Modified:
ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=1737486&r1=1737485&r2=1737486&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Sat Apr 2 10:36:00 2016
@@ -40,7 +40,7 @@
<include-menu name="Day" location="component://workeffort/widget/WorkEffortMenus.xml"/>
<include-screen name="trainingCalendarDetail"/>
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html>
+ <html><html-template location="component://workeffort/template/calendar/day.ftl"/></html>
</platform-specific>
</screenlet>
</widgets>
@@ -60,7 +60,7 @@
<include-menu name="Week" location="component://workeffort/widget/WorkEffortMenus.xml"/>
<include-screen name="trainingCalendarDetail"/>
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html>
+ <html><html-template location="component://workeffort/template/calendar/week.ftl"/></html>
</platform-specific>
</screenlet>
</widgets>
@@ -77,7 +77,7 @@
<include-menu name="Month" location="component://workeffort/widget/WorkEffortMenus.xml"/>
<include-screen name="trainingCalendarDetail"/>
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html>
+ <html><html-template location="component://workeffort/template/calendar/month.ftl"/></html>
</platform-specific>
</screenlet>
</widgets>
@@ -93,7 +93,7 @@
<screenlet title="${uiLabelMap.WorkEffortCalendarUpComingEventsView}" navigation-menu-name="Upcoming">
<include-menu name="Upcoming" location="component://workeffort/widget/WorkEffortMenus.xml"/>
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/upcoming.ftl"/></html>
+ <html><html-template location="component://workeffort/template/calendar/upcoming.ftl"/></html>
</platform-specific>
</screenlet>
</widgets>
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=1737486&r1=1737485&r2=1737486&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Sat Apr 2 10:36:00 2016
@@ -53,7 +53,7 @@ under the License.
<screenlet title="${uiLabelMap.WorkEffortDayView}: ${groovy:org.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"/>
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html>
+ <html><html-template location="component://workeffort/template/calendar/day.ftl"/></html>
</platform-specific>
</screenlet>
</container>
@@ -75,7 +75,7 @@ under the License.
<screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${groovy:org.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"/>
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html>
+ <html><html-template location="component://workeffort/template/calendar/week.ftl"/></html>
</platform-specific>
</screenlet>
</container>
@@ -94,7 +94,7 @@ under the License.
<screenlet title="${uiLabelMap.WorkEffortMonthView}: ${groovy:org.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"/>
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html>
+ <html><html-template location="component://workeffort/template/calendar/month.ftl"/></html>
</platform-specific>
</screenlet>
</container>
@@ -113,7 +113,7 @@ under the License.
<screenlet title="${uiLabelMap.WorkEffortCalendarUpComingEventsView}" navigation-menu-name="Upcoming">
<include-menu name="Upcoming" location="component://workeffort/widget/WorkEffortMenus.xml"/>
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/upcoming.ftl"/></html>
+ <html><html-template location="component://workeffort/template/calendar/upcoming.ftl"/></html>
</platform-specific>
</screenlet>
</container>
@@ -241,7 +241,7 @@ under the License.
<get-related value-field="parentWorkEffort" relation-name="WorkOrderItemFulfillment" list="parentWorkOrderItemFulfillments"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://workeffort/webapp/workeffort/calendar/calendarEventContent.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://workeffort/template/calendar/calendarEventContent.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=1737486&r1=1737485&r2=1737486&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Sat Apr 2 10:36:00 2016
@@ -186,7 +186,7 @@ under the License.
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/main.ftl"/></html>
+ <html><html-template location="component://workeffort/template/main.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=1737486&r1=1737485&r2=1737486&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Sat Apr 2 10:36:00 2016
@@ -74,7 +74,7 @@ under the License.
<if-service-permission service-name="workEffortGenericPermission" main-action="VIEW"/>
</condition>
<widgets>
- <platform-specific><html><html-template location="component://workeffort/webapp/workeffort/task/mytasks.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://workeffort/template/task/mytasks.ftl"/></html></platform-specific>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.WorkEffortViewPermissionError}</label>
@@ -122,7 +122,7 @@ under the License.
</section>
<screenlet title="${uiLabelMap.WorkEffortDuplicateWorkEffort}">
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl"/></html>
+ <html><html-template location="component://workeffort/template/workeffort/EditWorkEffortDupForm.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -680,7 +680,7 @@ under the License.
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl"/></html>
+ <html><html-template location="component://workeffort/template/find/WorkEffortSearchResults.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -698,7 +698,7 @@ under the License.
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl"/></html>
+ <html><html-template location="component://workeffort/template/find/WorkEffortSearchOptions.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -767,7 +767,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://workeffort/template/workeffort/EventReminderEmail.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -1009,7 +1009,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/workeffort/ICalendarHelp.ftl"/></html>
+ <html><html-template location="component://workeffort/template/workeffort/ICalendarHelp.ftl"/></html>
</platform-specific>
</widgets>
</section>