svn commit: r925625 - in /ofbiz/trunk/applications/marketing/widget: ContactListForms.xml ContactListScreens.xml

[buscob]

Author: buscob
Date: Sat Mar 20 15:10:47 2010
New Revision: 925625

URL: http://svn.apache.org/viewvc?rev=925625&view=rev
Log:
Introduced the FindScreenDecorator in the Find Contact Lists Parties screen

Modified:
    ofbiz/trunk/applications/marketing/widget/ContactListForms.xml
    ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml

Modified: ofbiz/trunk/applications/marketing/widget/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListForms.xml?rev=925625&r1=925624&r2=925625&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListForms.xml Sat Mar 20 15:10:47 2010
@@ -173,7 +173,7 @@ under the License.
      </form>
     
 
-    <form name="FindContactListParties" type="single" target="ListContactListParties" title=""
+    <form name="FindContactListParties" type="single" target="FindContactListParties" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find/></field>
         <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>

Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=925625&r1=925624&r2=925625&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Sat Mar 20 15:10:47 2010
@@ -25,6 +25,8 @@ under the License.
        <section>
            <actions>
                <set field="titleProperty" value="MarketingContactListFindContactLists"/>
+               <set field="headerItem" value="ContactList"/>
+               <set field="tabButtonItem" value="ContactList"/>              
                <set field="contactListTabButtonItem" value="ContactList"/>
                <set field="labelTitleProperty" value="PageTitleFindContactLists"/>
                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/FindContactList"/>
@@ -216,15 +218,22 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.PageTitleFindContactListParty}">
-                            <container style="button-bar">
-                                <link  text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" style="buttontext create">
-                                    <parameter param-name="contactListId"/>
-                                    <parameter param-name="DONE_PAGE" from-field="donePage"/>
-                                </link>
-                            </container>
-                            <include-form name="FindContactListParties" location="component://marketing/widget/ContactListForms.xml"/>
-                        </screenlet>
+                        <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                            <decorator-section name="menu-bar">
+                                <container style="button-bar">
+                                    <link  text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty" style="buttontext create">
+                                        <parameter param-name="contactListId"/>
+                                        <parameter param-name="DONE_PAGE" from-field="donePage"/>
+                                    </link>
+                                </container>
+                            </decorator-section>
+                            <decorator-section name="search-options">
+                                <include-form name="FindContactListParties" location="component://marketing/widget/ContactListForms.xml"/>
+                            </decorator-section>
+                            <decorator-section name="search-results">
+                                <include-form name="ListContactListParties" location="component://marketing/widget/ContactListForms.xml"/>
+                            </decorator-section>
+                        </decorator-screen>
                    </decorator-section>
                 </decorator-screen>
             </widgets>