svn commit: r543864 - in /ofbiz/branches/release4.0/applications/marketing: webapp/marketing/campaign/ webapp/marketing/datasource/ webapp/marketing/segment/ webapp/marketing/trackingcode/ widget/

[lektran]

Author: lektran
Date: Sun Jun  3 02:27:16 2007
New Revision: 543864

URL: http://svn.apache.org/viewvc?view=rev&rev=543864
Log:
Applied partial fix from trunk for revision: 543863
I left the Segment Group menu change out as it's an improvement rather than a bugfix

Removed:
    ofbiz/branches/release4.0/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl
    ofbiz/branches/release4.0/applications/marketing/webapp/marketing/datasource/DataSourceTabBar.ftl
Modified:
    ofbiz/branches/release4.0/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
    ofbiz/branches/release4.0/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml
    ofbiz/branches/release4.0/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl
    ofbiz/branches/release4.0/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml
    ofbiz/branches/release4.0/applications/marketing/widget/DataSourceScreens.xml
    ofbiz/branches/release4.0/applications/marketing/widget/MarketingCampaignScreens.xml
    ofbiz/branches/release4.0/applications/marketing/widget/SegmentScreens.xml
    ofbiz/branches/release4.0/applications/marketing/widget/TrackingCodeScreens.xml

Modified: ofbiz/branches/release4.0/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml?view=diff&rev=543864&r1=543863&r2=543864
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml Sun Jun  3 02:27:16 2007
@@ -19,7 +19,7 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
 
-    <menu name="MarketingCampaignTabBar" default-menu-item-name="MarketingCampaign" type="simple">
+    <menu name="MarketingCampaignTabBar" default-menu-item-name="MarketingCampaign" type="simple" selected-menuitem-context-field-name="campaignTabButtonItem">
         <menu-item name="MarketingCampaign" title="${uiLabelMap.MarketingCampaign}">
             <link target="/EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}"/>
         </menu-item>

Modified: ofbiz/branches/release4.0/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml?view=diff&rev=543864&r1=543863&r2=543864
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml Sun Jun  3 02:27:16 2007
@@ -19,7 +19,7 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
 
-    <menu name="DataSourceTabBar" default-menu-item-name="DataSource" type="simple">
+    <menu name="DataSourceTabBar" default-menu-item-name="DataSource" type="simple" selected-menuitem-context-field-name="dataSourceTabButtonItem">
         <menu-item name="DataSource" title="${uiLabelMap.DataSource}">
             <link target="/FindDataSource"/>
         </menu-item>

Modified: ofbiz/branches/release4.0/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl?view=diff&rev=543864&r1=543863&r2=543864
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl (original)
+++ ofbiz/branches/release4.0/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl Sun Jun  3 02:27:16 2007
@@ -17,7 +17,7 @@
 under the License.
 -->
 <#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign selectedClassMap = {page.segmentTabButtonItem?default("void") : "tabButtonSelected"}>
 
 <#if security.hasEntityPermission("MARKETING", "_VIEW", session)>
 <#if segmentGroup?has_content>

Modified: ofbiz/branches/release4.0/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml?view=diff&rev=543864&r1=543863&r2=543864
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml Sun Jun  3 02:27:16 2007
@@ -19,7 +19,7 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
 
-    <menu name="TrackingCodeTabBar" default-menu-item-name="TrackingCode" type="simple">
+    <menu name="TrackingCodeTabBar" default-menu-item-name="TrackingCode" type="simple" selected-menuitem-context-field-name="trackingCodeTabButtonItem">
         <menu-item name="TrackingCode" title="${uiLabelMap.TrackingCode}">
             <link target="/FindTrackingCode"/>
         </menu-item>

Modified: ofbiz/branches/release4.0/applications/marketing/widget/DataSourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/widget/DataSourceScreens.xml?view=diff&rev=543864&r1=543863&r2=543864
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/widget/DataSourceScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/widget/DataSourceScreens.xml Sun Jun  3 02:27:16 2007
@@ -61,7 +61,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditDataSource"/>
-                <set field="tabButtonItem" value="DataSource"/>
+                <set field="dataSourceTabButtonItem" value="DataSource"/>
                 <set field="labelTitleProperty" value="PageTitleEditDataSource"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListDataSource"/>
@@ -95,7 +95,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListDataSource"/>
-                <set field="tabButtonItem" value="DataSource"/>
+                <set field="dataSourceTabButtonItem" value="DataSource"/>
                 <set field="labelTitleProperty" value="PageTitleListDataSource"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListDataSource"/>
@@ -118,7 +118,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditDataSourceType"/>
-                <set field="tabButtonItem" value="DataSourceType"/>
+                <set field="dataSourceTabButtonItem" value="DataSourceType"/>
                 <set field="labelTitleProperty" value="PageTitleEditDataSourceType"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListDataSourceType"/>
@@ -152,7 +152,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListDataSourceType"/>
-                <set field="tabButtonItem" value="DataSourceType"/>
+                <set field="dataSourceTabButtonItem" value="DataSourceType"/>
                 <set field="labelTitleProperty" value="PageTitleListDataSourceType"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListDataSourceType"/>

Modified: ofbiz/branches/release4.0/applications/marketing/widget/MarketingCampaignScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/widget/MarketingCampaignScreens.xml?view=diff&rev=543864&r1=543863&r2=543864
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/widget/MarketingCampaignScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/widget/MarketingCampaignScreens.xml Sun Jun  3 02:27:16 2007
@@ -61,7 +61,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditMarketingCampaign"/>
-                <set field="tabButtonItem" value="MarketingCampaign"/>
+                <set field="campaignTabButtonItem" value="MarketingCampaign"/>
                 <set field="labelTitleProperty" value="PageTitleEditMarketingCampaign"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign"/>
@@ -95,7 +95,6 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListMarketingCampaign"/>
-                <set field="tabButtonItem" value="MarketingCampaign"/>
                 <set field="labelTitleProperty" value="PageTitleListMarketingCampaign"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindListMarketingCampaign"/>
@@ -117,7 +116,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditMarketingCampaignRole"/>
-                <set field="tabButtonItem" value="MarketingCampaignRole"/>
+                <set field="campaignTabButtonItem" value="MarketingCampaignRole"/>
                 <set field="labelTitleProperty" value="PageTitleEditMarketingCampaignRole"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaignRoles"/>
@@ -143,7 +142,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListMarketingCampaignRole"/>
-                <set field="tabButtonItem" value="MarketingCampaignRole"/>
+                <set field="campaignTabButtonItem" value="MarketingCampaignRole"/>
                 <set field="labelTitleProperty" value="PageTitleListMarketingCampaignRole"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign"/>

Modified: ofbiz/branches/release4.0/applications/marketing/widget/SegmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/widget/SegmentScreens.xml?view=diff&rev=543864&r1=543863&r2=543864
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/widget/SegmentScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/widget/SegmentScreens.xml Sun Jun  3 02:27:16 2007
@@ -34,7 +34,6 @@
                 
                 <set field="titleProperty" value="PageTitleFindSegmentGroup"/>
                 <set field="headerItem" value="Segment"/>
-                <set field="tabButtonItem" value="Segment"/>
                 
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
@@ -108,7 +107,7 @@
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="PageTitleEditSegmentGroup"/>
-                <set field="tabButtonItem" value="viewSegmentGroup"/>
+                <set field="segmentTabButtonItem" value="viewSegmentGroup"/>
                 <set field="labelTitleProperty" value="PageTitleEditSegmentGroup"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/LookupSegmentGroup"/>
@@ -139,7 +138,7 @@
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="titleProperty" value="PageTitleFindSegmentGroup"/>
-                <set field="tabButtonItem" value="listSegmentGroupClassification"/>
+                <set field="segmentTabButtonItem" value="listSegmentGroupClassification"/>
 
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
@@ -182,7 +181,7 @@
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="titleProperty" value="PageTitleListSegmentGroupGeo"/>
-                <set field="tabButtonItem" value="listSegmentGroupGeo"/>
+                <set field="segmentTabButtonItem" value="listSegmentGroupGeo"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
@@ -224,7 +223,7 @@
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="titleProperty" value="PageTitleListSegmentGroupRole"/>
-                <set field="tabButtonItem" value="listSegmentGroupRole"/>
+                <set field="segmentTabButtonItem" value="listSegmentGroupRole"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>

Modified: ofbiz/branches/release4.0/applications/marketing/widget/TrackingCodeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/widget/TrackingCodeScreens.xml?view=diff&rev=543864&r1=543863&r2=543864
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/widget/TrackingCodeScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/widget/TrackingCodeScreens.xml Sun Jun  3 02:27:16 2007
@@ -59,7 +59,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditTrackingCode"/>
-                <set field="tabButtonItem" value="TrackingCode"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCode"/>
                 <set field="labelTitleProperty" value="PageTitleEditTrackingCode"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/>
@@ -92,7 +92,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListTrackingCode"/>
-                <set field="tabButtonItem" value="TrackingCode"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCode"/>
                 <set field="labelTitleProperty" value="PageTitleListTrackingCode"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/>
@@ -130,7 +130,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditTrackingCodeOrder"/>
-                <set field="tabButtonItem" value="TrackingCodeOrder"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCodeOrder"/>
                 <set field="labelTitleProperty" value="PageTitleEditTrackingCodeOrder"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/>
@@ -154,7 +154,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListTrackingCodeOrder"/>
-                <set field="tabButtonItem" value="TrackingCodeOrder"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCodeOrder"/>
                 <set field="labelTitleProperty" value="PageTitleListTrackingCodeOrder"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/>
@@ -175,7 +175,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleFindTrackingCodeOrder"/>
-                <set field="tabButtonItem" value="TrackingCodeOrder"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCodeOrder"/>
                 <set field="labelTitleProperty" value="PageTitleFindTrackingCodeOrder"/>
 
                 <set field="trackingCodeId" from-field="parameters.trackingCodeId"/>
@@ -197,7 +197,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditTrackingCodeVisit"/>
-                <set field="tabButtonItem" value="TrackingCodeVisit"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCodeVisit"/>
                 <set field="labelTitleProperty" value="PageTitleEditTrackingCodeVisit"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/>
@@ -219,7 +219,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListTrackingCodeVisit"/>
-                <set field="tabButtonItem" value="TrackingCodeVisit"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCodeVisit"/>
                 <set field="labelTitleProperty" value="PageTitleListTrackingCodeVisit"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/>
@@ -240,7 +240,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleFindTrackingCodeVisits"/>
-                <set field="tabButtonItem" value="TrackingCodeVisit"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCodeVisit"/>
                 <set field="labelTitleProperty" value="PageTitleFindTrackingCodeVisits"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/>
@@ -261,7 +261,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleLookupVisit"/>
-                <set field="tabButtonItem" value="TrackingCode"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCode"/>
                 <set field="labelTitleProperty" value="PageTitleLookupVisit"/>
                 <set field="title" value="${uiLabelMap.PageTitleLookupVisit}" />
                 <set field="entityName" value="CommunicationEvent"/>                
@@ -282,7 +282,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleLookupTrackingCode"/>
-                <set field="tabButtonItem" value="TrackingCode"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCode"/>
                 <set field="labelTitleProperty" value="PageTitleLookupTrackingCode"/>
                 <set field="title" value="${uiLabelMap.PageTitleLookupTrackingCode}" />
                 <set field="entityName" value="TrackingCode"/>                
@@ -303,7 +303,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditTrackingCodeType"/>
-                <set field="tabButtonItem" value="TrackingCodeType"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCodeType"/>
                 <set field="labelTitleProperty" value="PageTitleEditTrackingCodeType"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCodeType"/>
@@ -337,7 +337,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListTrackingCodeType"/>
-                <set field="tabButtonItem" value="TrackingCodeType"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCodeType"/>
                 <set field="labelTitleProperty" value="PageTitleListTrackingCodeType"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCodeType"/>
@@ -359,7 +359,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleLookupTrackingCodeType"/>
-                <set field="tabButtonItem" value="TrackingCodeType"/>
+                <set field="trackingCodeTabButtonItem" value="TrackingCodeType"/>
                 <set field="labelTitleProperty" value="PageTitleLookupTrackingCodeType"/>
                 <set field="title" value="${uiLabelMap.PageTitleLookupTrackingCodeType}" />
                 <set field="entityName" value="TrackingCodeType"/>