svn commit: r731376 - in /ofbiz/trunk/specialpurpose: assetmaint/widget/ mypage/widget/ projectmgr/webapp/projectmgr/project/ projectmgr/widget/ projectmgr/widget/forms/

[mrisaliti]

Author: mrisaliti
Date: Sun Jan  4 14:14:57 2009
New Revision: 731376

URL: http://svn.apache.org/viewvc?rev=731376&view=rev
Log:
A lot of cleaning into WorkEffort labels (Part of OFBIZ-1780)

Modified:
    ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl
    ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=731376&r1=731375&r2=731376&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Sun Jan  4 14:14:57 2009
@@ -32,7 +32,7 @@
         <menu-item name="EditWorkEfforts" title="${uiLabelMap.WorkEffortAllTasks}">
             <link target="EditWorkEfforts?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}&amp;workEffortId=${fixedAssetMaint.scheduleWorkEffortId}"/>
         </menu-item>
-        <menu-item name="EditWorkEffortTimeEntries" title="${uiLabelMap.TimesheetTimeEntries}">
+        <menu-item name="EditWorkEffortTimeEntries" title="${uiLabelMap.WorkEffortTimesheetTimeEntries}">
             <link target="EditWorkEffortTimeEntries?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}&amp;workEffortId=${fixedAssetMaint.scheduleWorkEffortId}"/>
         </menu-item>
         <menu-item name="EditWorkEffortNotes" title="${uiLabelMap.WorkEffortNotes}">

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=731376&r1=731375&r2=731376&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Sun Jan  4 14:14:57 2009
@@ -198,7 +198,7 @@
             </condition>
             <link target="statusToCompleteKey?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
         </menu-item>
-        <menu-item name="myTime" title="${uiLabelMap.TimesheetMyTime}"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
+        <menu-item name="myTime" title="${uiLabelMap.WorkEffortTimesheetMyTime}"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
     </menu>
     <menu name="CommSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
           menu-container-style="button-bar button-style-2">

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl?rev=731376&r1=731375&r2=731376&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl Sun Jan  4 14:14:57 2009
@@ -53,7 +53,7 @@
           </td>
         </tr>
         <tr>    
-          <td class="label" >${uiLabelMap.TimesheetRateType}</td>
+          <td class="label" >${uiLabelMap.WorkEffortTimesheetRateType}</td>
           <td>
             <#assign rateTypes = delegator.findList("RateType", null, null, null, null, false)>
             <select name="rateTypeId">
@@ -64,7 +64,7 @@
           </td>
         </tr>
         <tr>    
-          <td class="label" >${uiLabelMap.TimesheetTimesheetId}</td>
+          <td class="label" >${uiLabelMap.WorkEffortTimesheetTimesheetId}</td>
           <td>
             <input type="text" name="timesheetId" value=""/>
             <a href="javascript:call_fieldlookup2(document.editTimeEntryForm.timesheetId,'LookupTimesheet');">
@@ -73,7 +73,7 @@
           </td>
         </tr>
         <tr>    
-          <td class="label" >${uiLabelMap.TimesheetHours}</td>
+          <td class="label" >${uiLabelMap.WorkEffortTimesheetHours}</td>
           <td><input type="text" name="hours" value=""/></td>
         </tr>
         <tr>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=731376&r1=731375&r2=731376&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Jan  4 14:14:57 2009
@@ -208,7 +208,7 @@
                                         </not>
                                     </condition>
                                     <widgets>
-                                        <container><label style="h1">${uiLabelMap.TimesheetTimesheetId}: ${timesheetId} ${uiLabelMap.CommonFrom}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${timesheet.partyId}]</label></container>
+                                        <container><label style="h1">${uiLabelMap.WorkEffortTimesheetTimesheetId}: ${timesheetId} ${uiLabelMap.CommonFrom}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${timesheet.partyId}]</label></container>
                                     </widgets>
                                 </section>
                                 <decorator-section-include name="body"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=731376&r1=731375&r2=731376&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Sun Jan  4 14:14:57 2009
@@ -23,7 +23,7 @@
     <menu name="ProjectMgrAppBar" title="${uiLabelMap.ProjectMgrApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
     
         <menu-item name="mytasks" title="${uiLabelMap.WorkEffortMyTasks}"><link target="MyTasks"/></menu-item>
-        <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheet"/></menu-item>
+        <menu-item name="mytime" title="${uiLabelMap.WorkEffortTimesheetMyTime}"><link target="MyTimesheet"/></menu-item>
         <menu-item name="projects" title="${uiLabelMap.WorkEffortProjects}"><link target="FindProject"/></menu-item>
         <menu-item name="task" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask"/></menu-item>
         <menu-item name="resources" title="${uiLabelMap.ProjectMgrResources}">
@@ -32,7 +32,7 @@
             </condition>
             <link target="FindResource"/>
         </menu-item>
-        <menu-item name="timesheet" title="${uiLabelMap.Timesheet}">
+        <menu-item name="timesheet" title="${uiLabelMap.WorkEffortTimesheet}">
             <condition>
                 <if-has-permission permission="PROJECTMGR_ADMIN"/>
             </condition>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=731376&r1=731375&r2=731376&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sun Jan  4 14:14:57 2009
@@ -187,7 +187,7 @@
             <widgets>
                 <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container><link  text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
+                        <container><link  text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
                         <container style="screenlet">
                             <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTimesheetEntries}</label></container>
                             <container style="screenlet-body">
@@ -218,7 +218,7 @@
             <widgets>
                 <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container><link  text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
+                        <container><link  text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
                         <container style="screenlet">
                             <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTimesheetRoles}</label></container>
                             <container style="screenlet-body">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=731376&r1=731375&r2=731376&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Jan  4 14:14:57 2009
@@ -385,7 +385,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -421,7 +421,7 @@
                 </entity-options>        
             </drop-down>
         </field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=731376&r1=731375&r2=731376&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sun Jan  4 14:14:57 2009
@@ -66,7 +66,7 @@
         <actions>
             <set field="complete" value="${uiLabelMap.ProjectMgrToComplete}"/>
         </actions>
-        <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
+        <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${timesheetId}" target="${my}Timesheet?timesheetId=${timesheetId}"/>
         </field>
         <field name="weekNumber" title="${uiLabelMap.ProjectMgrWeekNumber}"><display/></field>
@@ -116,7 +116,7 @@
             </service>
             <set field="complete" value="${uiLabelMap.ProjectMgrToComplete}"/>
         </actions>
-        <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
+        <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${timesheetId}" target="Timesheet?timesheetId=${timesheetId}"/>
         </field>
         <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
@@ -161,7 +161,7 @@
         <field name="timesheetId"><hidden/></field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -191,7 +191,7 @@
         </actions>
         <field name="timesheetId" map-name="currentTimesheet"><hidden/></field>
         <field name="partyId" map-name="userLogin"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD" >
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -226,7 +226,7 @@
         <field name="timesheetId"><hidden/></field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down>
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>