You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/06/21 20:45:07 UTC

svn commit: r670249 [1/2] - in /ofbiz/trunk: applications/accounting/widget/ applications/content/widget/ applications/content/widget/content/ applications/humanres/widget/ applications/manufacturing/widget/manufacturing/ applications/marketing/widget/...

Author: adrianc
Date: Sat Jun 21 11:44:43 2008
New Revision: 670249

URL: http://svn.apache.org/viewvc?rev=670249&view=rev
Log:
Improved lookup screens - contributed by Bruno Busco - https://issues.apache.org/jira/browse/OFBIZ-1841.

Modified:
    ofbiz/trunk/applications/accounting/widget/LookupScreens.xml
    ofbiz/trunk/applications/content/widget/LookupScreens.xml
    ofbiz/trunk/applications/content/widget/SurveyScreens.xml
    ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
    ofbiz/trunk/applications/humanres/widget/LookupScreens.xml
    ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml
    ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
    ofbiz/trunk/applications/marketing/widget/LookupScreens.xml
    ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
    ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
    ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml
    ofbiz/trunk/framework/common/widget/CommonScreens.xml
    ofbiz/trunk/framework/common/widget/LookupScreens.xml
    ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Sat Jun 21 11:44:43 2008
@@ -36,22 +36,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingLookupPayment}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -73,22 +62,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingLookupInvoices}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -108,22 +86,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupFixedAsset}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -147,22 +114,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupBillingAccount}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupBillingAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
-                                        <include-form name="listBillingAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupBillingAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listBillingAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -185,22 +141,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupGlAccount}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="lookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -221,22 +166,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingLookupAgreement}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupAgreement" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
-                                        <include-form name="listAgreements" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupAgreement" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listAgreements" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -257,25 +191,14 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingLookupAgreementItem}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupAgreementItem" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listAgreementItems" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupAgreementItem" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listAgreementItems" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/applications/content/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/LookupScreens.xml Sat Jun 21 11:44:43 2008
@@ -36,21 +36,8 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupListLayout}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupListLayout" location="component://content/webapp/content/lookup/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-results">
+                        <include-form name="lookupListLayout" location="component://content/webapp/content/lookup/LookupForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -72,25 +59,14 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupSubContent}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/>
-                                        <include-form name="listLookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="lookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Sat Jun 21 11:44:43 2008
@@ -411,22 +411,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupSurvey}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/>
-                                        <include-form name="listLookupSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="lookupSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -446,25 +435,14 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupSurveyResponse}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="lookupSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/>
-                                        <include-form name="listLookupSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="lookupSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sat Jun 21 11:44:43 2008
@@ -363,25 +363,14 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupContent}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="LookupContent" location="component://content/widget/content/ContentForms.xml"/>
-                                        <include-form name="ListLookupContent" location="component://content/widget/content/ContentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="LookupContent" location="component://content/widget/content/ContentForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListLookupContent" location="component://content/widget/content/ContentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sat Jun 21 11:44:43 2008
@@ -158,8 +158,10 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
+                    <decorator-section name="search-options">
                         <include-form name="LookupDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
                         <include-form name="ListLookupDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/humanres/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/LookupScreens.xml Sat Jun 21 11:44:43 2008
@@ -28,24 +28,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupBudgetByName}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupBudget" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListBudgets" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupBudget" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                    <decorator-section name="search-results">
+                        <include-form name="ListBudgets" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -57,24 +46,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupBudgetItemByName}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupBudgetItem" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListBudgetItems" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupBudgetItem" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListBudgetItems" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -86,24 +64,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupEmplPositionByName}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupEmplPosition" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListEmplPositions" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupEmplPosition" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                    <decorator-section name="search-results">
+                        <include-form name="ListEmplPositions" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -115,24 +82,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupTerminationReason}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupTerminationReason" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListTerminationReasons" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupTerminationReason" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListTerminationReasons" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -144,24 +100,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupSalaryStepSeqId}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupSalaryStep" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListSalarySteps" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupSalaryStep" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                    <decorator-section name="search-results">
+                        <include-form name="ListSalarySteps" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -173,24 +118,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupPayGrade}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupPayGrade" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListPayGrades" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupPayGrade" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListPayGrades" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -202,24 +136,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupPayRollPreference}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupPayRollPreference" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListPayRollPreferences" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupPayRollPreference" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListPayRollPreferences" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -231,24 +154,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupUnemploymentClaim}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupUnemploymentClaim" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListUnemploymentClaims" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupUnemploymentClaim" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                    <decorator-section name="search-results">
+                        <include-form name="ListUnemploymentClaims" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -260,24 +172,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupAgreement}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupAgreement" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListAgreements" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupAgreement" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListAgreements" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -289,24 +190,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupAgreementEmploymentAppl}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupAgreementEmploymentAppl" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListAgreementEmploymentAppls" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupAgreementEmploymentAppl" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListAgreementEmploymentAppls" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -318,24 +208,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupPerfReview}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupPerfReview" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListPerfReviews" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupPerfReview" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                    <decorator-section name="search-results">
+                        <include-form name="ListPerfReviews" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -347,24 +226,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupPartyResume}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupPartyResume" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListPartyResumes" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupPartyResume" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListPartyResumes" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -376,25 +244,14 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResLookupEmploymentApp}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupEmploymentApp" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                        <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="LookupEmploymentApp" location="component://humanres/widget/forms/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/LookupForms.xml"/>
                     </decorator-section>
-                </decorator-screen>    
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml Sat Jun 21 11:44:43 2008
@@ -39,22 +39,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupRouting}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -79,25 +68,14 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupRoutingTask}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="lookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Sat Jun 21 11:44:43 2008
@@ -393,22 +393,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupContactList}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
-                                        <include-form name="ListLookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="LookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListLookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -428,24 +417,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitlePreferredContactMech}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="ListPreferredContactMech" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-results">
+                        <include-form name="ListPreferredContactMech" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/applications/marketing/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/LookupScreens.xml Sat Jun 21 11:44:43 2008
@@ -38,25 +38,14 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
             </actions>
             <widgets>
-               <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                <decorator-section name="body">
-                    <container style="screenlet">
-                        <container style="screenlet-title-bar">
-                            <container style="h3">
-                                <label text="${uiLabelMap.PageTitleLookupSegmentGroup}"/>
-                            </container>
-                        </container>
-                        <container style="screenlet-body">
-                            <section>
-                                <widgets>
-                                    <include-form name="LookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
-                                    <include-form name="listLookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
-                                </widgets>
-                            </section>
-                        </container>
-                    </container>
-                </decorator-section>
-              </decorator-screen>
+                <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                    <decorator-section name="search-options">
+                        <include-form name="LookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -76,25 +65,14 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupSalesForecast}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupSalesForecast" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
-                                        <include-form name="ListLookupSalesForecast" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="LookupSalesForecast" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListLookupSalesForecast" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Sat Jun 21 11:44:43 2008
@@ -396,22 +396,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupVisit}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupVisit" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
-                                        <include-form name="ListLookupVisit" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="LookupVisit" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListLookupVisit" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -428,22 +417,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupTrackingCode}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
-                                        <include-form name="ListLookupTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="LookupTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListLookupTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -552,25 +530,14 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupTrackingCodeType}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="LookupTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
-                                        <include-form name="ListLookupTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="LookupTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListLookupTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml Sat Jun 21 11:44:43 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -36,22 +36,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupOrderHeader}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                                
+                    <decorator-section name="search-options">
+                        <include-form name="lookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -74,22 +63,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupOrderHeaderAndShipInfo}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -113,22 +91,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupPurchaseOrderHeaderAndShipInfo}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupPurchaseOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupPurchaseOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -151,22 +118,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupCustomerRequest}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -189,22 +145,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupCustomerRequestItem}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                    
+                    <decorator-section name="search-options">
+                        <include-form name="lookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -226,22 +171,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupQuote}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -264,22 +198,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupQuoteItem}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
+                    <decorator-section name="search-options">
+                        <include-form name="lookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -301,22 +224,11 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupRequirement}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                    
+                    <decorator-section name="search-options">
+                        <include-form name="lookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -338,25 +250,14 @@
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleLookupShoppingList}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="lookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                        <include-form name="listLookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                    <decorator-section name="search-options">
+                        <include-form name="lookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>