Author: buscob
Date: Sun Jan 10 22:03:08 2010
New Revision: 897716
URL: http://svn.apache.org/viewvc?rev=897716&view=rev
Log:
Fixed common decorator use in FindCommunicationEvents screen.
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.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=897716&r1=897715&r2=897716&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sun Jan 10 22:03:08 2010
@@ -177,14 +177,22 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <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>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=897716&r1=897715&r2=897716&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sun Jan 10
22:03:08 2010
@@ -227,7 +227,7 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.PageTitleListUnknownPartyComms}">
- <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml"
name="ListUnknownPartyEmails"/>
+ <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml"
name="ListUnknownPartyEmails"/>
</screenlet>
</widgets>
<fail-widgets>
@@ -248,17 +248,18 @@
<set field="entityName" value="CommunicationEventAndRole"/>
</actions>
<widgets>
- <decorator-screen location="${parameters.mainDecoratorLocation}" name="main-decorator">
+ <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
<if-service-permission service-name="partyCommunicationEventPermissionCheck"
main-action="VIEW"/>
</condition>
<widgets>
- <include-menu location="component://party/widget/partymgr/PartyMenus.xml"
name="CommEventTabBar"/>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
- <include-menu name="CommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <container style="button-bar">
+ <include-menu name="CommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ </container>
</decorator-section>
<decorator-section name="search-options">
<include-form location="component://party/widget/partymgr/CommunicationEventForms.xml"
name="findCommEvents"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=897716&r1=897715&r2=897716&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sun Jan 10 22:03:08 2010
@@ -533,7 +533,6 @@
</menu>
<menu name="CommEventTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="Find" title="${uiLabelMap.CommonFind}">
- <condition><if-compare field="tabButtonItem" operator="not-equals" value="Find"/></condition>
<link target="FindCommunicationEvents"/>
</menu-item>
<menu-item name="OverView" title="${uiLabelMap.CommonOverview}">
@@ -618,8 +617,7 @@
</menu-item>
</menu>
- <menu name="CommSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- menu-container-style="button-bar button-style-2 no-clear">
+ <menu name="CommSubTabBar">
<menu-item name="new" title="${uiLabelMap.PartyNewCommunication}">
<link target="EditCommunicationEvent"/>
</menu-item>
|