svn commit: r646410 - in /ofbiz/branches/release4.0/applications/marketing: src/org/ofbiz/marketing/marketing/MarketingServices.java webapp/marketing/contact/ContactListMenus.xml widget/CommonScreens.xml widget/ContactListScreens.xml

[ChrisG-2]

Author: chrisg
Date: Wed Apr  9 08:43:57 2008
New Revision: 646410

URL: http://svn.apache.org/viewvc?rev=646410&view=rev
Log:
Applied fix from trunk for revision 646389:
Fixed active tab display in contact lists


Modified:
    ofbiz/branches/release4.0/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java   (props changed)
    ofbiz/branches/release4.0/applications/marketing/webapp/marketing/contact/ContactListMenus.xml
    ofbiz/branches/release4.0/applications/marketing/widget/CommonScreens.xml
    ofbiz/branches/release4.0/applications/marketing/widget/ContactListScreens.xml

Propchange: ofbiz/branches/release4.0/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ofbiz/branches/release4.0/applications/marketing/webapp/marketing/contact/ContactListMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/webapp/marketing/contact/ContactListMenus.xml?rev=646410&r1=646409&r2=646410&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/webapp/marketing/contact/ContactListMenus.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/webapp/marketing/contact/ContactListMenus.xml Wed Apr  9 08:43:57 2008
@@ -19,7 +19,8 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
 
-    <menu name="ContactListTabBar" default-menu-item-name="ContactList" type="simple">
+    <menu name="ContactListTabBar" default-menu-item-name="ContactList" type="simple"
+          selected-menuitem-context-field-name="contactListTabButtonItem">
         <menu-item name="ContactList" title="${uiLabelMap.ContactList}">
             <link target="/EditContactList?contactListId=${contactListId}"/>
         </menu-item>

Modified: ofbiz/branches/release4.0/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/widget/CommonScreens.xml?rev=646410&r1=646409&r2=646410&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/widget/CommonScreens.xml Wed Apr  9 08:43:57 2008
@@ -49,6 +49,7 @@
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="headerItem" value="ContactList"/>
+                <set field="tabButtonItem" value="ContactList"/>
                 <set field="contactListId" from-field="parameters.contactListId"/>
                 <entity-one entity-name="ContactList" value-name="contactList"/>
             </actions>

Modified: ofbiz/branches/release4.0/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/widget/ContactListScreens.xml?rev=646410&r1=646409&r2=646410&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/widget/ContactListScreens.xml Wed Apr  9 08:43:57 2008
@@ -45,7 +45,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditContactList"/>
-                <set field="tabButtonItem" value="ContactList"/>
+                <set field="contactListTabButtonItem" value="ContactList"/>
                 <set field="labelTitleProperty" value="PageTitleEditContactList"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactLists"/>
@@ -79,7 +79,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListContactList"/>
-                <set field="tabButtonItem" value="ContactList"/>
+                <set field="contactListTabButtonItem" value="ContactList"/>
                 <set field="labelTitleProperty" value="PageTitleListContactList"/>
 
                 <!-- parameters for pagination -->
@@ -105,7 +105,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditContactListParty"/>
-                <set field="tabButtonItem" value="ContactListParty"/>
+                <set field="contactListTabButtonItem" value="ContactListParty"/>
                 <set field="labelTitleProperty" value="PageTitleEditContactListParty"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/>
@@ -146,7 +146,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListContactListParty"/>
-                <set field="tabButtonItem" value="ContactListParty"/>
+                <set field="contactListTabButtonItem" value="ContactListParty"/>
                 <set field="labelTitleProperty" value="PageTitleListContactListParty"/>
 
                 <!-- parameters for pagination -->
@@ -171,7 +171,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleFindContactListParty"/>
-                <set field="tabButtonItem" value="ContactListParty"/>
+                <set field="contactListTabButtonItem" value="ContactListParty"/>
                 <set field="labelTitleProperty" value="PageTitleFindContactListParty"/>
 
                 <set field="contactListId" from-field="parameters.contactListId"/>
@@ -193,7 +193,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditContactList"/>
-                <set field="tabButtonItem" value="ContactListCommEvent"/>
+                <set field="contactListTabButtonItem" value="ContactListCommEvent"/>
                 <set field="labelTitleProperty" value="PageTitleEditContactList"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/>
@@ -219,7 +219,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListContactListCommEvent"/>
-                <set field="tabButtonItem" value="ContactListCommEvent"/>
+                <set field="contactListTabButtonItem" value="ContactListCommEvent"/>
                 <set field="labelTitleProperty" value="PageTitleListContactListCommEvent"/>
 
                 <!-- parameters for pagination -->
@@ -244,7 +244,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleFindContactListCommEvents"/>
-                <set field="tabButtonItem" value="ContactListCommEvent"/>
+                <set field="contactListTabButtonItem" value="ContactListCommEvent"/>
                 <set field="labelTitleProperty" value="PageTitleFindContactListCommEvents"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/>
@@ -267,7 +267,7 @@
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="PageTitleLookupContactList"/>
-                <set field="tabButtonItem" value="ContactList"/>
+                <set field="contactListTabButtonItem" value="ContactListCommEvent"/>
                 <set field="labelTitleProperty" value="PageTitleLookupContactList"/>
                 <set field="title" value="${uiLabelMap.PageTitleLookupContactList}" />
             </actions>
@@ -287,7 +287,7 @@
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="PageTitlePreferredContactMech"/>
-                <set field="tabButtonItem" value="ContactList"/>
+                <set field="contactListTabButtonItem" value="ContactListCommEvent"/>
                 <set field="labelTitleProperty" value="PageTitlePreferredContactMech"/>
                 <set field="title" value="${uiLabelMap.PageTitlePreferredContactMech}" />