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

[buscob]

Author: buscob
Date: Fri Mar 19 23:10:23 2010
New Revision: 925475

URL: http://svn.apache.org/viewvc?rev=925475&view=rev
Log:
Introduced the FindScreenDecorator in the Find Contact Lists 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=925475&r1=925474&r2=925475&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListForms.xml Fri Mar 19 23:10:23 2010
@@ -81,10 +81,10 @@ under the License.
         <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
     </form>
 
-    <form name="FindContactLists" target="ListContactLists" title="" type="single"
+    <form name="FindContactLists" target="FindContactLists" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text size="20" maxlength="20"/></field>
+        <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find ignore-case="true"/></field>
         <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field>
         <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
             <drop-down allow-empty="true">

Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=925475&r1=925474&r2=925475&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Fri Mar 19 23:10:23 2010
@@ -30,16 +30,23 @@ under the License.
                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/FindContactList"/>
            </actions>
            <widgets>
-               <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}">
+               <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.MarketingContactListFindContactLists}">
-                            <container>
-                                <link  text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext">
-                                    <parameter param-name="DONE_PAGE" from-field="donePage"/>
-                                </link>
-                            </container>
-                            <include-form name="FindContactLists" 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.MarketingContactListCreate}" target="EditContactList" style="buttontext create">
+                                        <parameter param-name="DONE_PAGE" from-field="donePage"/>
+                                    </link>
+                                </container>
+                            </decorator-section>
+                            <decorator-section name="search-options">
+                                <include-form name="FindContactLists" location="component://marketing/widget/ContactListForms.xml"/>
+                            </decorator-section>
+                            <decorator-section name="search-results">
+                                <include-form name="ListContactLists" location="component://marketing/widget/ContactListForms.xml"/>
+                            </decorator-section>
+                        </decorator-screen>
                    </decorator-section>
                </decorator-screen>
            </widgets>