Author: buscob
Date: Sat Mar 20 15:08:03 2010
New Revision: 925624
URL: http://svn.apache.org/viewvc?rev=925624&view=rev
Log:
Added proper styles to button bars.
Moved TabBar Menu from the "body" decorator-section to the "pre-body" decorator
section.
Modified:
ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml
Modified: ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml?rev=925624&r1=925623&r2=925624&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml Sat Mar 20
15:08:03 2010
@@ -80,8 +80,8 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PageTitleEditDataSource}">
- <container>
- <link
text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource"
style="buttontext">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.DataSourceCreate}" target="EditDataSource" style="buttontext
create">
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
</container>
@@ -115,8 +115,8 @@ under the License.
<decorator-screen name="CommonDataSourceDecorator">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListDataSource}">
- <container>
- <link text="${uiLabelMap.DataSourceCreate}"
target="/EditDataSource" style="buttontext">
+ <container style="button-bar">
+ <link text="${uiLabelMap.DataSourceCreate}"
target="EditDataSource" style="buttontext create">
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
</container>
@@ -148,8 +148,8 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PageTitleEditDataSourceType}">
- <container>
- <link
text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType"
style="buttontext">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.DataSourceTypeCreate}" target="EditDataSourceType"
style="buttontext create">
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
</container>
@@ -184,8 +184,8 @@ under the License.
<decorator-screen name="CommonDataSourceDecorator">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListDataSourceType}">
- <container>
- <link
text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType"
style="buttontext">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.DataSourceTypeCreate}" target="EditDataSourceType"
style="buttontext create">
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
</container>
Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=925624&r1=925623&r2=925624&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
(original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Sat
Mar 20 15:08:03 2010
@@ -84,8 +84,8 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PageTitleEditMarketingCampaign}">
- <container>
- <link
text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign"
style="buttontext">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.MarketingCampaignCreate}" target="EditMarketingCampaign"
style="buttontext create">
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
</container>
@@ -118,8 +118,8 @@ under the License.
<decorator-screen name="CommonMarketingCampaignDecorator">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListMarketingCampaign}">
- <container>
- <link
text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign"
style="buttontext">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.MarketingCampaignCreate}" target="EditMarketingCampaign"
style="buttontext create">
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
</container>
@@ -148,8 +148,8 @@ under the License.
<decorator-screen name="CommonMarketingCampaignDecorator">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditMarketingCampaignRole}">
- <container>
- <link
text="${uiLabelMap.MarketingCampaignRoleCreate}"
target="/EditMarketingCampaignRoles">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.MarketingCampaignRoleCreate}"
target="EditMarketingCampaignRoles" style="buttontext create">
<parameter
param-name="marketingCampaignId"/>
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
@@ -176,8 +176,8 @@ under the License.
<decorator-screen name="CommonMarketingCampaignDecorator">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListMarketingCampaignRole}">
- <container>
- <link
text="${uiLabelMap.MarketingCampaignRoleCreate}"
target="/EditMarketingCampaignRoles">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.MarketingCampaignRoleCreate}"
target="EditMarketingCampaignRoles" style="buttontext create">
<parameter
param-name="marketingCampaignId"/>
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=925624&r1=925623&r2=925624&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Sat Mar 20
15:08:03 2010
@@ -49,7 +49,9 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PageTitleFindSegmentGroup}">
- <container><link
text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup"
style="buttontext"/></container>
+ <container style="button-bar">
+ <link
text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup"
style="buttontext create"/>
+ </container>
<include-form name="FindSegmentGroup"
location="component://marketing/widget/SegmentForms.xml"/>
</screenlet>
</widgets>
@@ -98,7 +100,9 @@ under the License.
<section>
<condition><not><if-empty
field="segmentGroupId"/></not></condition>
<widgets>
- <container><link
text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup"
style="buttontext"/></container>
+ <container style="button-bar">
+ <link
text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup"
style="buttontext create"/>
+ </container>
</widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=925624&r1=925623&r2=925624&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Sat Mar
20 15:08:03 2010
@@ -30,7 +30,7 @@ under the License.
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="pre-body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
<condition>
@@ -42,7 +42,16 @@ under the License.
<include-menu
name="TrackingCodeTabBar"
location="component://marketing/widget/TrackingCodeMenus.xml"/>
</widgets>
</section>
-
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <!-- do check for MARKETING, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="MARKETING"
action="_VIEW"/>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -109,8 +118,8 @@ under the License.
<decorator-screen name="CommonTrackingCodeDecorator">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListTrackingCode}">
- <container>
- <link
text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode"
style="buttontext">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode"
style="buttontext create">
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
</container>
@@ -346,8 +355,8 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PageTitleEditTrackingCodeType}">
- <container>
- <link
text="${uiLabelMap.MarketingTrackingCodeTypeCreate}"
target="/EditTrackingCodeType" style="buttontext">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.MarketingTrackingCodeTypeCreate}"
target="/EditTrackingCodeType" style="buttontext create">
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
</container>
@@ -381,8 +390,8 @@ under the License.
<decorator-screen name="CommonTrackingCodeDecorator">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListTrackingCodeType}">
- <container>
- <link
text="${uiLabelMap.MarketingTrackingCodeTypeCreate}"
target="/EditTrackingCodeType" style="buttontext">
+ <container style="button-bar">
+ <link
text="${uiLabelMap.MarketingTrackingCodeTypeCreate}"
target="/EditTrackingCodeType" style="buttontext create">
<parameter param-name="DONE_PAGE"
from-field="donePage"/>
</link>
</container>
