Author: jleroux
Date: Sun Jul 27 00:38:58 2008
New Revision: 680072
URL: http://svn.apache.org/viewvc?rev=680072&view=rev
Log:
An enhancing patch from Bruno Busco "Approve requirement screen label should
say NOT YET approved requirements"
(https://issues.apache.org/jira/browse/OFBIZ-1875) - OFBIZ-1875
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=680072&r1=680071&r2=680072&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Sun
Jul 27 00:38:58 2008
@@ -90,34 +90,14 @@
<widgets>
<decorator-screen name="CommonRequirementsDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindRequirements}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="FindRequirements"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindRequirements}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListRequirements"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindRequirements"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListRequirements"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
@@ -136,34 +116,14 @@
<widgets>
<decorator-screen name="CommonRequirementsDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindApprovedRequirements}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="FindNotApprovedRequirements"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindApprovedRequirements}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ApproveRequirements"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form
name="FindNotApprovedRequirements"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ApproveRequirements"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
