You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/11/24 17:44:59 UTC
svn commit: r883776 - in /ofbiz/trunk/applications/marketing/widget:
CommonScreens.xml DataSourceScreens.xml MarketingCampaignScreens.xml
SegmentScreens.xml
Author: buscob
Date: Tue Nov 24 16:44:59 2009
New Revision: 883776
URL: http://svn.apache.org/viewvc?rev=883776&view=rev
Log:
Marketing component
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
This makes better the rendering of themes such as Dropping Crumbs.
Removed several redundant <section><widget> tags also
Modified:
ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=883776&r1=883775&r2=883776&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Tue Nov 24 16:44:59 2009
@@ -58,6 +58,20 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <!-- do check for MARKETING, _VIEW permission -->
+ <condition>
+ <and>
+ <if-has-permission permission="MARKETING" action="_VIEW"/>
+ <not><if-empty field="contactListId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="ContactListTabBar" location="component://marketing/widget/ContactListMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
@@ -68,7 +82,6 @@
<section>
<condition><not><if-empty field="contactListId"/></not></condition>
<widgets>
- <include-menu name="ContactListTabBar" location="component://marketing/widget/ContactListMenus.xml"/>
<container>
<label style="h1">${uiLabelMap.MarketingContactList} ${contactList.contactListName} [${contactListId}]</label>
</container>
Modified: ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml?rev=883776&r1=883775&r2=883776&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml Tue Nov 24 16:44:59 2009
@@ -31,6 +31,17 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <!-- do check for MARKETING, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="MARKETING" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-menu name="DataSourceTabBar" location="component://marketing/widget/DataSourceMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
@@ -38,12 +49,6 @@
<if-has-permission permission="MARKETING" action="_VIEW"/>
</condition>
<widgets>
- <section>
- <widgets>
- <include-menu name="DataSourceTabBar" location="component://marketing/widget/DataSourceMenus.xml"/>
- </widgets>
- </section>
-
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=883776&r1=883775&r2=883776&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Tue Nov 24 16:44:59 2009
@@ -30,6 +30,20 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <!-- do check for MARKETING, _VIEW permission -->
+ <condition>
+ <and>
+ <if-has-permission permission="MARKETING" action="_VIEW"/>
+ <not><if-empty field="marketingCampaignId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="MarketingCampaignTabBar" location="component://marketing/widget/MarketingCampaignMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
@@ -37,13 +51,6 @@
<if-has-permission permission="MARKETING" action="_VIEW"/>
</condition>
<widgets>
- <section>
- <condition><not><if-empty field="marketingCampaignId"/></not></condition>
- <widgets>
- <include-menu name="MarketingCampaignTabBar" location="component://marketing/widget/MarketingCampaignMenus.xml"/>
- </widgets>
- </section>
-
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=883776&r1=883775&r2=883776&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Tue Nov 24 16:44:59 2009
@@ -74,6 +74,20 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <!-- do check for MARKETING, _VIEW permission -->
+ <condition>
+ <and>
+ <if-has-permission permission="MARKETING" action="_VIEW"/>
+ <not><if-empty field="segmentGroupId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu location="component://marketing/widget/SegmentMenus.xml" name="SegmentGroupTabBar"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
@@ -84,11 +98,9 @@
<section>
<condition><not><if-empty field="segmentGroupId"/></not></condition>
<widgets>
- <include-menu location="component://marketing/widget/SegmentMenus.xml" name="SegmentGroupTabBar"/>
<container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container>
</widgets>
</section>
-
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>