Author: mor
Date: Wed Jun 2 11:05:53 2010
New Revision: 950492
URL: http://svn.apache.org/viewvc?rev=950492&view=rev
Log:
Parameterize the location of the screen decorator
CommonCommunicationEventDecorator & CommonMyCommunicationEventDecorator so that
it is
easier to override them with custom decorators.
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=950492&r1=950491&r2=950492&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Wed Jun 2
11:05:53 2010
@@ -166,70 +166,6 @@ under the License.
</widgets>
</section>
</screen>
- <screen name="CommonCommunicationEventDecorator">
- <section>
- <actions>
- <set field="headerItem" value="comm"/>
- <script
location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="pre-body">
- <section>
- <condition>
- <if-has-permission action="_VIEW"
permission="PARTYMGR"/>
- </condition>
- <widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommEventTabBar"/>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommSubTabBar"/>
- </widgets>
- </section>
- </decorator-section>
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission action="_VIEW"
permission="PARTYMGR"/>
- </condition>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="CommonMyCommunicationEventDecorator">
- <section>
- <actions>
- <script
location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="pre-body">
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommEventTabBar"/>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommSubTabBar"/>
- </decorator-section>
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission action="_VIEW"
permission="PARTYMGR"/>
- </condition>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="CommonRequestDecorator">
<section>
<actions/>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=950492&r1=950491&r2=950492&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
(original)
+++
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
Wed Jun 2 11:05:53 2010
@@ -19,6 +19,73 @@ under the License.
-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
+
+ <screen name="CommonCommunicationEventDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="comm"/>
+ <script
location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <if-has-permission action="_VIEW"
permission="PARTYMGR"/>
+ </condition>
+ <widgets>
+ <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommEventTabBar"/>
+ <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommSubTabBar"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission action="_VIEW"
permission="PARTYMGR"/>
+ </condition>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonMyCommunicationEventDecorator">
+ <section>
+ <actions>
+ <script
location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommEventTabBar"/>
+ <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommSubTabBar"/>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission action="_VIEW"
permission="PARTYMGR"/>
+ </condition>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="PendingCommunications">
<section>
<actions>
@@ -93,7 +160,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -219,7 +286,7 @@ under the License.
<set field="tabButtonItem" value="ListUnknownPartyComms"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -247,7 +314,7 @@ under the License.
<set field="entityName" value="CommunicationEventAndOrder"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -282,7 +349,7 @@ under the License.
<set field="entityName" value="CommunicationEventAndRole"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -319,7 +386,7 @@ under the License.
<widgets>
<section>
<widgets>
- <decorator-screen
name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen
name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<include-screen name="commOverview"/>
</decorator-section>
@@ -443,7 +510,7 @@ under the License.
<set field="contactMechIdTo"
from-field="parameters.contactMechIdTo"
default-value="${communicationEvent.contactMechIdTo}"/>
</actions>
<widgets>
- <decorator-screen
name="Common${my}CommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen
name="Common${my}CommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<include-screen name="editCommEvent"/>
</decorator-section>
@@ -459,7 +526,7 @@ under the License.
<set field="my" from-field="parameters.my"/>
</actions>
<widgets>
- <decorator-screen
name="Common${my}CommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen
name="Common${my}CommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PartyEditCustomerRequest}">
<include-form
location="component://party/widget/partymgr/CommunicationEventForms.xml"
name="EditRequestFromCommEvent"/>
@@ -486,7 +553,7 @@ under the License.
<set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="20"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyCommEventRoles}">
<include-form
location="component://party/widget/partymgr/CommunicationEventForms.xml"
name="ListCommRoles"/>
@@ -516,7 +583,7 @@ under the License.
<entity-one entity-name="CommunicationEvent"
value-field="communicationEvent"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PartyCommEventPurposes}">
<container style="button-bar">
@@ -545,7 +612,7 @@ under the License.
<entity-one entity-name="CommunicationEvent"
value-field="communicationEvent"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyCommWorkEfforts}">
<container style="button-bar">
@@ -573,7 +640,7 @@ under the License.
<entity-one entity-name="WorkEffort" value-field="workEffort"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyCommWorkEfforts}">
<include-form
location="component://party/widget/partymgr/CommunicationEventForms.xml"
name="AddCommEventWorkEffort"/>
@@ -593,7 +660,7 @@ under the License.
<set field="workEffortId"
from-field="parameters.workEffortId"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyCommWorkEfforts}">
<include-form
location="component://party/widget/partymgr/CommunicationEventForms.xml"
name="AddCommEventWorkEffort"/>
@@ -616,7 +683,7 @@ under the License.
<entity-one entity-name="CommunicationEvent"
value-field="communicationEvent"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -655,7 +722,7 @@ under the License.
<entity-one entity-name="CommunicationEvent"
value-field="communicationEvent"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -692,7 +759,7 @@ under the License.
</entity-one>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -910,7 +977,7 @@ under the License.
<entity-one entity-name="CommunicationEvent"
value-field="communicationEvent"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyCommEventOrders}">
<include-form name="ListCommOrders"
location="component://party/widget/partymgr/CommunicationEventForms.xml"/>
@@ -935,7 +1002,7 @@ under the License.
<entity-one entity-name="CommunicationEvent"
value-field="communicationEvent"/>
</actions>
<widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PartyCommEventProducts}">
<include-form name="ListCommProducts"
location="component://party/widget/partymgr/CommunicationEventForms.xml"/>
