Author: buscob
Date: Sat Oct 24 08:54:33 2009
New Revision: 829325
URL: http://svn.apache.org/viewvc?rev=829325&view=rev
Log:
Part of OFBIZ-3067 - Menus and form widget files location
Assetmaint, Oagis and Projectmgr components
Renamed assetmaint/widget/Menus.xml to assetmaint/widget/AssetmaintMenus.xml
Renamed oagis/widget/Menus.xml to oagis/widget/OagisMenus.xml
Renamed projectmgr/widget/Menus.xml to projectmgr/widget/ProjectMenus.xml
Added:
ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintMenus.xml
- copied unchanged from r829314,
ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
ofbiz/trunk/specialpurpose/oagis/widget/OagisMenus.xml
- copied unchanged from r829314,
ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectMenus.xml
- copied unchanged from r829314,
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
Removed:
ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
Modified:
ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=829325&r1=829324&r2=829325&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sat Oct
24 08:54:33 2009
@@ -33,7 +33,7 @@
<section>
<condition><not><if-empty
field="maintHistSeqId"/></not></condition>
<widgets>
- <include-menu name="FixedAssetMaintTabBar"
location="component://assetmaint/widget/Menus.xml"/>
+ <include-menu name="FixedAssetMaintTabBar"
location="component://assetmaint/widget/AssetmaintMenus.xml"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=829325&r1=829324&r2=829325&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Sat Oct 24
08:54:33 2009
@@ -37,7 +37,7 @@
then the global layoutSettings.commonHeaderImageUrl
(specified in GlobalDecorator) will be used. -->
<!--<set field="layoutSettings.headerImageUrl"
value="/images/ofbiz_logo.gif" global="true"/>-->
<set field="applicationMenuName" value="AssetMaintAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://assetmaint/widget/Menus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="component://assetmaint/widget/AssetmaintMenus.xml" global="true"/>
<set field="applicationTitle"
value="${uiLabelMap.AssetMaintApplication}"/>
</actions>
<widgets>
@@ -56,7 +56,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="FacilityTabBar"
location="component://assetmaint/widget/Menus.xml"/>
+ <include-menu name="FacilityTabBar"
location="component://assetmaint/widget/AssetmaintMenus.xml"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -104,7 +104,7 @@
<not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
- <include-menu name="FixedAssetTabBar"
location="component://assetmaint/widget/Menus.xml"/>
+ <include-menu name="FixedAssetTabBar"
location="component://assetmaint/widget/AssetmaintMenus.xml"/>
</widgets>
</section>
<decorator-section-include name="pre-body"/>
Modified: ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml?rev=829325&r1=829324&r2=829325&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml Sat Oct 24
08:54:33 2009
@@ -33,7 +33,7 @@
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.OagisCompanySubtitle" global="true"/>
<set field="activeApp" value="oagis" global="true"/>
<set field="applicationMenuName" value="OagisAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://oagis/widget/Menus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="component://oagis/widget/OagisMenus.xml" global="true"/>
<set field="applicationTitle"
value="${uiLabelMap.OagisApplication}" global="true"/>
</actions>
<widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=829325&r1=829324&r2=829325&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sat Oct 24
08:54:33 2009
@@ -45,7 +45,7 @@
<set field="activeApp" value="projectmgr" global="true"/>
<set field="applicationMenuName" value="ProjectMgrAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://projectmgr/widget/Menus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="component://projectmgr/widget/ProjectMenus.xml" global="true"/>
<set field="applicationTitle"
value="${uiLabelMap.ProjectMgrApplication}" global="true"/>
<set field="my" value="My" global="true"/>
</actions>
@@ -79,8 +79,8 @@
</not>
</condition>
<widgets>
- <include-menu name="ProjectTabBar"
location="component://projectmgr/widget/Menus.xml"/>
- <include-menu name="ProjectSubTabBar"
location="component://projectmgr/widget/Menus.xml"/>
+ <include-menu name="ProjectTabBar"
location="component://projectmgr/widget/ProjectMenus.xml"/>
+ <include-menu name="ProjectSubTabBar"
location="component://projectmgr/widget/ProjectMenus.xml"/>
<container style="clear"/>
<label style="h1"
text="${uiLabelMap.ProjectMgrProjectCurrent}:
${project.workEffortName}[${project.workEffortId}]"/>
</widgets>
@@ -117,8 +117,8 @@
<not><if-empty
field="workEffort"/></not>
</condition>
<widgets>
- <include-menu name="TaskTabBar"
location="component://projectmgr/widget/Menus.xml"/>
- <include-menu name="TaskSubTabBar"
location="component://projectmgr/widget/Menus.xml"/>
+ <include-menu name="TaskTabBar"
location="component://projectmgr/widget/ProjectMenus.xml"/>
+ <include-menu name="TaskSubTabBar"
location="component://projectmgr/widget/ProjectMenus.xml"/>
<container style="clear"/>
<label style="h1"
text="${uiLabelMap.ProjectMgrTaskCurrent}:
${workEffort.workEffortName}[${workEffort.workEffortId}]
${uiLabelMap.ProjectMgrPhaseName}: ${phaseName}
${uiLabelMap.ProjectMgrProjectName}: ${projectName}"/>
<link style="h1" text="[${projectId}]"
target="projectView">
@@ -205,8 +205,8 @@
<if-has-permission permission="PROJECTMGR"
action="_VIEW"/>
</condition>
<widgets>
- <!--include-menu name="TimesheetTabBar"
location="component://projectmgr/widget/Menus.xml"/-->
- <include-menu name="TimesheetSubTabBar"
location="component://projectmgr/widget/Menus.xml"/>
+ <!--include-menu name="TimesheetTabBar"
location="component://projectmgr/widget/ProjectMenus.xml"/-->
+ <include-menu name="TimesheetSubTabBar"
location="component://projectmgr/widget/ProjectMenus.xml"/>
<section>
<condition>
<not>
@@ -241,7 +241,7 @@
<if-has-permission permission="PROJECTMGR"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="MyTimeSubTabBar"
location="component://projectmgr/widget/Menus.xml"/>
+ <include-menu name="MyTimeSubTabBar"
location="component://projectmgr/widget/ProjectMenus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -313,7 +313,7 @@
<section>
<condition><not><if-empty
field="partyId"/></not></condition>
<widgets>
- <include-menu
location="component://projectmgr/widget/Menus.xml" name="ResourceTabBar"/>
+ <include-menu
location="component://projectmgr/widget/ProjectMenus.xml"
name="ResourceTabBar"/>
<container>
<section>
<widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=829325&r1=829324&r2=829325&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Oct 24
08:54:33 2009
@@ -65,7 +65,7 @@
</section>
<decorator-screen name="CommonProjectDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="ProjectSubTabBar"
location="component://projectmgr/widget/Menus.xml"/>
+ <include-menu name="ProjectSubTabBar"
location="component://projectmgr/widget/ProjectMenus.xml"/>
<container style="clear"/>
<screenlet name="findProject" collapsible="true"
title="${uiLabelMap.PageTitleFindProject}">
<include-form name="FindProject"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=829325&r1=829324&r2=829325&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sat Oct
24 08:54:33 2009
@@ -219,7 +219,7 @@
<fail-widgets>
<screenlet
title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr}
${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber}
${uiLabelMap.CommonFrom}
${bsh:timesheet.get("fromDate").toString().substring(0,10)}
${uiLabelMap.CommonTo}
${bsh:timesheet.get("thruDate").toString().substring(0,10)}"
navigation-menu-name="TimesheetBar">
- <include-menu name="TimesheetBar"
location="component://projectmgr/widget/Menus.xml"/>
+ <include-menu name="TimesheetBar"
location="component://projectmgr/widget/ProjectMenus.xml"/>
<include-form name="EditWeekTimesheet"
location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
</screenlet>
</fail-widgets>
