svn commit: r660156 - in /ofbiz/trunk/applications/marketing: webapp/marketing/WEB-INF/ widget/

[mor-2]

Author: mor
Date: Mon May 26 03:29:33 2008
New Revision: 660156

URL: http://svn.apache.org/viewvc?rev=660156&view=rev
Log:
Patch from Pranay Pandey for Menu Item highlight fix for Marketing component

Modified:
    ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
    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/MarketingMenus.xml
    ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
    ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
    ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=660156&r1=660155&r2=660156&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Mon May 26 03:29:33 2008
@@ -44,7 +44,7 @@
 
     <request-map uri="view"><security https="true" auth="false"/><response name="success" type="view" value="main"/></request-map>
     <request-map uri="authview"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map>
-    <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="FindMarketingCampaign"/></request-map>    
+    <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map>    
     
     <request-map uri="changeDelegator">
         <security https="true" auth="true"/>

Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=660156&r1=660155&r2=660156&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Mon May 26 03:29:33 2008
@@ -86,6 +86,9 @@
     </screen>
     <screen name="main">
         <section>
+            <actions>
+                <set field="headerItem" value="main"/>                
+            </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">

Modified: ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml?rev=660156&r1=660155&r2=660156&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml Mon May 26 03:29:33 2008
@@ -25,8 +25,7 @@
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="headerItem" value="contactlist"/>
-                <set field="tabButtonItem" value="DataSource"/>
+                <set field="headerItem" value="DataSource"/>
                 <set field="dataSourceId" from-field="parameters.dataSourceId"/>
                 <entity-one entity-name="DataSource" value-name="dataSource"/>
             </actions>
@@ -61,7 +60,6 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditDataSource"/>
-                <set field="dataSourceTabButtonItem" value="DataSource"/>
                 <set field="labelTitleProperty" value="PageTitleEditDataSource"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListDataSource"/>

Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=660156&r1=660155&r2=660156&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Mon May 26 03:29:33 2008
@@ -24,9 +24,8 @@
         <section>
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="headerItem" value="contactlist"/>
                 <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
-                <set field="tabButtonItem" value="Campaign"/>
+                <set field="headerItem" value="Campaign"/>
                 <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
             </actions>
             <widgets>
@@ -120,7 +119,7 @@
             <actions>
                 <set field="titleProperty" value="PageTitleListMarketingCampaign"/>
                 <set field="labelTitleProperty" value="PageTitleListMarketingCampaign"/>
-
+                
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindListMarketingCampaign"/>
                 <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
                 <set field="entityName" value="MarketingCampaign"/>

Modified: ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml?rev=660156&r1=660155&r2=660156&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml Mon May 26 03:29:33 2008
@@ -19,7 +19,7 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     <menu name="MarketingAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.MarketingManagerApplication}"
-        default-selected-style="selected" menu-container-style="button-bar tab-bar">
+        default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="headerItem">
         <menu-item name="main" title="${uiLabelMap.MarketingMainPage}"><link target="main"/></menu-item>
         <menu-item name="DataSource" title="${uiLabelMap.DataSource}"><link target="FindDataSource"/></menu-item>
         <menu-item name="Campaign" title="${uiLabelMap.MarketingCampaign}"><link target="FindMarketingCampaign"/></menu-item>

Modified: ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml?rev=660156&r1=660155&r2=660156&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml Mon May 26 03:29:33 2008
@@ -21,6 +21,9 @@
          xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
     <screen name="CommonMarketReportDecorator">
         <section>
+            <actions>
+                <set field="headerItem" value="Reports"/>                
+            </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
@@ -45,7 +48,6 @@
         <section>
             <actions>
                 <set field="titleProperty" value="MarketingReports"/>
-                <set field="tabButtonItem" value="Reports"/>
                 <!--  <script location="component://order/webapp/ordermgr/WEB-INF/actions/reports/reportlist.bsh"/>-->
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=660156&r1=660155&r2=660156&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Mon May 26 03:29:33 2008
@@ -33,7 +33,7 @@
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 
                 <set field="titleProperty" value="PageTitleFindSegmentGroup"/>
-                <set field="tabButtonItem" value="Segment"/>
+                <set field="headerItem" value="Segment"/>
                 
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>

Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=660156&r1=660155&r2=660156&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Mon May 26 03:29:33 2008
@@ -24,7 +24,7 @@
         <section>
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="tabButtonItem" value="Tracking"/>
+                <set field="headerItem" value="Tracking"/>
                 <set field="trackingCodeId" from-field="parameters.trackingCodeId"/>
                 <entity-one entity-name="TrackingCode" value-name="trackingCode"/>
             </actions>