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 [2/2] - in /ofbiz/trunk: applications/accounting/widget/
applications/content/widget/ applications/content/widget/content/
applications/humanres/widget/
applications/manufacturing/widget/manufacturing/
applications/marketing/widget/...
Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/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.PartyLookupPartyByName}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupPartyName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="listLookupPartyName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupPartyName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupPartyName" location="component://party/webapp/partymgr/lookup/LookupForms.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.PartyLookupPartyByName}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupCustomerName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="listLookupCustomerName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupCustomerName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupCustomerName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -111,22 +89,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.PartyLookupPartyByName}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupCustomerNameForSalesRep" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="listLookupCustomerNameForSalesRep" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupCustomerNameForSalesRep" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupCustomerNameForSalesRep" location="component://party/webapp/partymgr/lookup/LookupForms.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.PartyLookupPartyPerson}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -190,22 +146,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.PartyLookupPartyAndUserLoginAndPerson}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupPartyAndUserLoginAndPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="listLookupPartyAndUserLoginAndPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupPartyAndUserLoginAndPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupPartyAndUserLoginAndPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -227,22 +172,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.PartyLookupUserLoginAndPartyDetails}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupUserLoginAndPartyDetails" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="listLookupUserLoginAndPartyDetails" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupUserLoginAndPartyDetails" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupUserLoginAndPartyDetails" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -266,22 +200,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.PartyLookupPartyGroup}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupPartyGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="listLookupPartyGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupPartyGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupPartyGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -306,22 +229,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.PartyLookupPartyClassificationGroup}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="LookupPartyClassificationGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="listLookupPartyClassificationGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="LookupPartyClassificationGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupPartyClassificationGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -339,22 +251,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.PartyLookupPartyCommEvent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="LookupCommEvent" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="ListLookupCommEvent" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="LookupCommEvent" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListLookupCommEvent" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -373,25 +274,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.PartyLookupContactMech}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupContactMech" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- <include-form name="listLookupContactMech" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupContactMech" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupContactMech" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml Sat Jun 21 11:44:43 2008
@@ -65,24 +65,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.PageTitleListContactList}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListLookupContactList"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-results">
+ <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListLookupContactList"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/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.PageTitleLookupProduct}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- <include-form name="listLookupProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupProduct" location="component://product/webapp/catalog/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.PageTitleLookupProductVirtual}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- <include-form name="listLookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
</decorator-section>
</decorator-screen>
</widgets>
@@ -112,23 +90,10 @@
</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.PageTitleLookupProductVariant}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://product/webapp/catalog/lookup/LookupVariantProduct.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-results">
+ <platform-specific>
+ <html><html-template location="component://product/webapp/catalog/lookup/LookupVariantProduct.ftl"/></html>
+ </platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -151,22 +116,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.PageTitleLookupProductPrice}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupProductAndPrice" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- <include-form name="listLookupProductAndPrice" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupProductAndPrice" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupProductAndPrice" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -188,22 +142,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.PageTitleLookupProductCategory}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
- <include-form name="listLookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -225,22 +168,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.PageTitleLookupProductFeature}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
- <include-form name="listLookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -266,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.PageTitleLookupProductStore}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="LookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
- <include-form name="listLookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="LookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/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.PageTitleLookupFacility}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
- <include-form name="listLookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupFacility" location="component://product/webapp/facility/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.PageTitleLookupFacility}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
- <include-form name="listLookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
</decorator-section>
</decorator-screen>
</widgets>
@@ -107,25 +85,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.ProductLookupShipment}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
- <include-form name="listShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml Sat Jun 21 11:44:43 2008
@@ -37,22 +37,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.PageTitleLookupWorkEffort}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/>
- <include-form name="listLookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -76,22 +65,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.PageTitleLookupTimesheet}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupTimesheet" location="component://workeffort/widget/LookupForms.xml"/>
- <include-form name="listLookupTimesheet" location="component://workeffort/widget/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupTimesheet" location="component://workeffort/widget/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupTimesheet" location="component://workeffort/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -115,25 +93,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.PageTitleLookupWorkEffort}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupWorkEffortShort" location="component://workeffort/widget/LookupForms.xml"/>
- <include-form name="listLookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupWorkEffortShort" location="component://workeffort/widget/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sat Jun 21 11:44:43 2008
@@ -198,7 +198,7 @@
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
- <screenlet title="${title}" name="findScreenlet" collapsible="true" padded="false">
+ <screenlet title="${title}" id="findScreenlet" collapsible="true" padded="false">
<decorator-section-include name="search-options"/>
</screenlet>
<screenlet>
Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Sat Jun 21 11:44:43 2008
@@ -33,12 +33,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">
- <include-form name="LookupGeo" location="component://common/widget/LookupForms.xml"/>
- <include-form name="listLookupGeo" location="component://common/widget/LookupForms.xml"/>
- </decorator-section>
- </decorator-screen>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="LookupGeo" location="component://common/widget/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupGeo" location="component://common/widget/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml Sat Jun 21 11:44:43 2008
@@ -99,10 +99,13 @@
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="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="LookupFindExampleFeature" location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
<include-form name="LookupListExampleFeature" location="component://example/widget/example/ExampleFeatureForms.xml"/>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml Sat Jun 21 11:44:43 2008
@@ -39,25 +39,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.PartyLookupPartyPerson}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupPerson" location="component://assetmaint/widget/forms/LookupForms.xml"/>
- <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupPerson" location="component://assetmaint/widget/forms/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml?rev=670249&r1=670248&r2=670249&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml Sat Jun 21 11:44:43 2008
@@ -39,25 +39,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.PageTitleLookupProduct}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="lookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" />
- <include-form name="listLookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" />
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-section name="search-options">
+ <include-form name="lookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" />
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" />
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>