svn commit: r532806 - in /ofbiz/trunk/applications/marketing: webapp/marketing/contact/ContactListForms.xml widget/CommonScreens.xml

[rayb-2]

Author: rayb
Date: Thu Apr 26 10:20:40 2007
New Revision: 532806

URL: http://svn.apache.org/viewvc?view=rev&rev=532806
Log:
Added selected contact list name and Id below the menus for user convenience as per other apps. Also fixed link to EditContactListCommEvent so it adds the contactListId.

Modified:
    ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
    ofbiz/trunk/applications/marketing/widget/CommonScreens.xml

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?view=diff&rev=532806&r1=532805&r2=532806
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Thu Apr 26 10:20:40 2007
@@ -272,7 +272,6 @@
 
         <field name="contactMechIdFrom" title="${uiLabelMap.PartyFromContactMech}">
             <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyIdFrom"/>
-            <text default-value="${thisUserPrimaryEmail.contactMechId}"/>          <!-- this default value is the logged in user's primary email and is useful for comm events which are emails -->
         </field>
         <field name="contactListId"><lookup size="20" target-form-name="LookupContactList"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-time/></field>
@@ -312,7 +311,7 @@
             </service>
         </actions>
         <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}">
-            <hyperlink description="${communicationEventId}" target="EditContactListCommEvent?communicationEventId=${communicationEventId}&amp;DONE_PAGE=${donePage}" target-type="intra-app"/>
+            <hyperlink description="${communicationEventId}" target="EditContactListCommEvent?contactListId=${contactListId}&amp;communicationEventId=${communicationEventId}&amp;DONE_PAGE=${donePage}" target-type="intra-app"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>

Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?view=diff&rev=532806&r1=532805&r2=532806
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Thu Apr 26 10:20:40 2007
@@ -65,6 +65,9 @@
                                     <condition><not><if-empty field-name="contactListId"/></not></condition>
                                     <widgets>
                                         <include-menu name="ContactListTabBar" location="component://marketing/webapp/marketing/contact/ContactListMenus.xml"/>
+                                        <container>
+                                            <label style="head1">Contact List ${contactList.contactListName} [ID:${contactListId}]</label>
+                                        </container>
                                     </widgets>
                                 </section>
                                 <decorator-section-include name="body"/>