[OFBiz] SVN: r7762 - trunk/applications/workeffort/widget
jonesde@svn.ofbiz.org
jonesde at svn.ofbiz.org
Fri Jun 9 16:24:08 CDT 2006
Author: jonesde
Date: 2006-06-09 16:24:04 -0500 (Fri, 09 Jun 2006)
New Revision: 7762
Modified:
trunk/applications/workeffort/widget/CalendarScreens.xml
trunk/applications/workeffort/widget/CommonScreens.xml
trunk/applications/workeffort/widget/RequestScreens.xml
trunk/applications/workeffort/widget/TimesheetScreens.xml
trunk/applications/workeffort/widget/WorkEffortScreens.xml
Log:
Applied another patch from Anil Patel with decorator parameterization changes
Modified: trunk/applications/workeffort/widget/CalendarScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/CalendarScreens.xml 2006-06-09 19:45:15 UTC (rev 7761)
+++ trunk/applications/workeffort/widget/CalendarScreens.xml 2006-06-09 21:24:04 UTC (rev 7762)
@@ -25,43 +25,6 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
- <screen name="CommonCalendarDecorator">
- <section>
- <actions>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/>
- </condition>
- <actions>
- <entity-condition entity-name="Facility" list-name="allFacilities">
- <order-by field-name="facilityName"/>
- </entity-condition>
- <entity-condition entity-name="FixedAsset" list-name="allFixedAssets">
- <order-by field-name="fixedAssetId"/>
- </entity-condition>
- </actions>
- <widgets>
- <platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl"/></html>
- </platform-specific>
- <platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/eventsByForms.ftl"/></html>
- </platform-specific>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="CalendarDay">
<section>
<actions>
@@ -72,7 +35,7 @@
<script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/day.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonCalendarDecorator">
+ <decorator-screen name="CommonCalendarDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html>
@@ -92,7 +55,7 @@
<script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/week.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonCalendarDecorator">
+ <decorator-screen name="CommonCalendarDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html>
@@ -112,7 +75,7 @@
<script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/month.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonCalendarDecorator">
+ <decorator-screen name="CommonCalendarDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html>
@@ -132,7 +95,7 @@
<script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/upcoming.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonCalendarDecorator">
+ <decorator-screen name="CommonCalendarDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/upcoming.ftl"/></html>
Modified: trunk/applications/workeffort/widget/CommonScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/CommonScreens.xml 2006-06-09 19:45:15 UTC (rev 7761)
+++ trunk/applications/workeffort/widget/CommonScreens.xml 2006-06-09 21:24:04 UTC (rev 7762)
@@ -58,7 +58,7 @@
<entity-one entity-name="WorkEffort" value-name="workEffort"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator">
<decorator-section name="body">
<section>
<condition>
@@ -91,6 +91,79 @@
</section>
</screen>
+ <screen name="CommonTimesheetDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="timesheet"/>
+ <set field="timesheetId" from-field="parameters.timesheetId"/>
+ <entity-one entity-name="Timesheet" value-name="timesheet"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty field-name="timesheetId"/></not></condition>
+ <widgets>
+ <include-menu name="TimesheetTabBar" location="component://workeffort/widget/TimesheetMenus.xml"/>
+ <container><label style="head1">${uiLabelMap.TimesheetTimesheetId}: ${timesheetId}</label></container>
+ </widgets>
+ </section>
+
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonCalendarDecorator">
+ <section>
+ <actions>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/>
+ </condition>
+ <actions>
+ <entity-condition entity-name="Facility" list-name="allFacilities">
+ <order-by field-name="facilityName"/>
+ </entity-condition>
+ <entity-condition entity-name="FixedAsset" list-name="allFixedAssets">
+ <order-by field-name="fixedAssetId"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl"/></html>
+ </platform-specific>
+ <platform-specific>
+ <html><html-template location="component://workeffort/webapp/workeffort/calendar/eventsByForms.ftl"/></html>
+ </platform-specific>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="login">
<section>
<widgets>
Modified: trunk/applications/workeffort/widget/RequestScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/RequestScreens.xml 2006-06-09 19:45:15 UTC (rev 7761)
+++ trunk/applications/workeffort/widget/RequestScreens.xml 2006-06-09 21:24:04 UTC (rev 7762)
@@ -39,7 +39,7 @@
<script location="component://workeffort/webapp/workeffort/WEB-INF/actions/request/requestlist.bsh"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head1">${uiLabelMap.WorkEffortMyRequestList}</label>
Modified: trunk/applications/workeffort/widget/TimesheetScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/TimesheetScreens.xml 2006-06-09 19:45:15 UTC (rev 7761)
+++ trunk/applications/workeffort/widget/TimesheetScreens.xml 2006-06-09 21:24:04 UTC (rev 7762)
@@ -40,7 +40,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><label text="${uiLabelMap.WorkEffortMyCurrentTimesheets}" style="head2"/></container>
<container>
@@ -119,7 +119,7 @@
<set field="timesheetId" from-field="parameters.timesheetId"/>
</actions>
<widgets>
- <decorator-screen name="CommonTimesheetDecorator">
+ <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -140,41 +140,6 @@
</widgets>
</section>
</screen>
-
- <screen name="CommonTimesheetDecorator">
- <section>
- <actions>
- <set field="headerItem" value="timesheet"/>
- <set field="timesheetId" from-field="parameters.timesheetId"/>
- <entity-one entity-name="Timesheet" value-name="timesheet"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/>
- </condition>
- <widgets>
- <section>
- <condition><not><if-empty field-name="timesheetId"/></not></condition>
- <widgets>
- <include-menu name="TimesheetTabBar" location="component://workeffort/widget/TimesheetMenus.xml"/>
- <container><label style="head1">${uiLabelMap.TimesheetTimesheetId}: ${timesheetId}</label></container>
- </widgets>
- </section>
-
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="EditTimesheet">
<section>
<actions>
@@ -186,7 +151,7 @@
<entity-one entity-name="Timesheet" value-name="timesheet"/>
</actions>
<widgets>
- <decorator-screen name="CommonTimesheetDecorator">
+ <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -221,7 +186,7 @@
<entity-one entity-name="Timesheet" value-name="timesheet"/>
</actions>
<widgets>
- <decorator-screen name="CommonTimesheetDecorator">
+ <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><label style="head1">${uiLabelMap.PageTitleEditTimesheetRoles}</label></container>
<container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
@@ -243,7 +208,7 @@
<entity-one entity-name="Timesheet" value-name="timesheet"/>
</actions>
<widgets>
- <decorator-screen name="CommonTimesheetDecorator">
+ <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><label style="head1">${uiLabelMap.PageTitleEditTimesheetEntries}</label></container>
<container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
Modified: trunk/applications/workeffort/widget/WorkEffortScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortScreens.xml 2006-06-09 19:45:15 UTC (rev 7761)
+++ trunk/applications/workeffort/widget/WorkEffortScreens.xml 2006-06-09 21:24:04 UTC (rev 7762)
@@ -37,7 +37,7 @@
<service service-name="getWorkEffortAssignedTasks"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
More information about the Svn
mailing list