OFBiz › OFBiz - Commits

svn commit: r1743794 - in /ofbiz/trunk/applications: humanres/widget/ workeffort/template/ workeffort/template/calendar/ workeffort/template/task/ workeffort/widget/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
Deepak Dixit-5
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1743794 - in /ofbiz/trunk/applications: humanres/widget/ workeffort/template/ workeffort/template/calendar/ workeffort/template/task/ workeffort/widget/

Deepak Dixit-5
Author: deepak
Date: Sat May 14 08:12:32 2016
New Revision: 1743794

URL: http://svn.apache.org/viewvc?rev=1743794&view=rev
Log:
(OFBIZ-7021) Renamed workeffort component ftl file name from lower case to upper case pattern.

Added:
    ofbiz/trunk/applications/workeffort/template/Main.ftl
      - copied unchanged from r1743788, ofbiz/trunk/applications/workeffort/template/main.ftl
    ofbiz/trunk/applications/workeffort/template/calendar/CalendarEventContent.ftl
      - copied unchanged from r1743788, ofbiz/trunk/applications/workeffort/template/calendar/calendarEventContent.ftl
    ofbiz/trunk/applications/workeffort/template/calendar/Day.ftl
      - copied unchanged from r1743788, ofbiz/trunk/applications/workeffort/template/calendar/day.ftl
    ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl
      - copied unchanged from r1743788, ofbiz/trunk/applications/workeffort/template/calendar/month.ftl
    ofbiz/trunk/applications/workeffort/template/calendar/Upcoming.ftl
      - copied unchanged from r1743788, ofbiz/trunk/applications/workeffort/template/calendar/upcoming.ftl
    ofbiz/trunk/applications/workeffort/template/calendar/Week.ftl
      - copied unchanged from r1743788, ofbiz/trunk/applications/workeffort/template/calendar/week.ftl
    ofbiz/trunk/applications/workeffort/template/task/MyTasks.ftl
      - copied unchanged from r1743788, ofbiz/trunk/applications/workeffort/template/task/mytasks.ftl
Removed:
    ofbiz/trunk/applications/workeffort/template/calendar/calendarEventContent.ftl
    ofbiz/trunk/applications/workeffort/template/calendar/day.ftl
    ofbiz/trunk/applications/workeffort/template/calendar/month.ftl
    ofbiz/trunk/applications/workeffort/template/calendar/upcoming.ftl
    ofbiz/trunk/applications/workeffort/template/calendar/week.ftl
    ofbiz/trunk/applications/workeffort/template/main.ftl
    ofbiz/trunk/applications/workeffort/template/task/mytasks.ftl
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=1743794&r1=1743793&r2=1743794&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Sat May 14 08:12:32 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/template/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/template/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/template/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/template/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=1743794&r1=1743793&r2=1743794&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Sat May 14 08:12:32 2016
@@ -53,7 +53,7 @@ under the License.
                         <screenlet title="${uiLabelMap.WorkEffortDayView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, &quot;EEEE MMMM d, yyyy&quot;, 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/template/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, &quot;w&quot;, 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/template/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, &quot;MMMM yyyy&quot;, 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/template/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/template/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/template/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=1743794&r1=1743793&r2=1743794&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Sat May 14 08:12:32 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/template/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=1743794&r1=1743793&r2=1743794&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Sat May 14 08:12:32 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/template/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>


Free forum by Nabble Edit this page