You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/10/18 11:16:58 UTC
svn commit: r826379 - /ofbiz/trunk/applications/order/widget/ordermgr/
Author: buscob
Date: Sun Oct 18 09:16:40 2009
New Revision: 826379
URL: http://svn.apache.org/viewvc?rev=826379&view=rev
Log:
Changed <container style="screenlet"> pattern to <screenlet...>.
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=826379&r1=826378&r2=826379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Sun Oct 18 09:16:40 2009
@@ -254,28 +254,17 @@
<widgets>
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="requestitem" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext">
- <parameter param-name="custRequestId"/>
- </link>
- </container>
- <include-form name="EditCustRequestItem" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/request/CopyRequestItem.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}">
+ <container>
+ <link target="requestitem" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext">
+ <parameter param-name="custRequestId"/>
+ </link>
+ </container>
+ <include-form name="EditCustRequestItem" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/request/CopyRequestItem.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -297,24 +286,13 @@
<widgets>
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/request/requestitemnotes.ftl"/></html>
- </platform-specific>
- <include-form name="ListRequestItemNotes" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
- <include-form name="EditRequestItemNote" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}">
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/request/requestitemnotes.ftl"/></html>
+ </platform-specific>
+ <include-form name="ListRequestItemNotes" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ <include-form name="EditRequestItemNote" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -338,27 +316,16 @@
<widgets>
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditRequirement" text="${uiLabelMap.OrderNewRequirement}" style="buttontext">
- <parameter param-name="custRequestId" from-field="custRequestItem.custRequestId"/>
- <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/>
- </link>
- </container>
- <include-form name="ListRequestItemRequirements" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}">
+ <container>
+ <link target="EditRequirement" text="${uiLabelMap.OrderNewRequirement}" style="buttontext">
+ <parameter param-name="custRequestId" from-field="custRequestItem.custRequestId"/>
+ <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/>
+ </link>
</container>
- </container>
- </decorator-section>
+ <include-form name="ListRequestItemRequirements" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ </screenlet>
+ </decorator-section>
</decorator-screen>
</widgets>
</section>
@@ -382,23 +349,12 @@
<widgets>
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/request/QuoteLinks.ftl"/></html>
- </platform-specific>
- <include-form name="ListRequestQuoteItems" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}">
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/request/QuoteLinks.ftl"/></html>
+ </platform-specific>
+ <include-form name="ListRequestQuoteItems" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -425,20 +381,9 @@
<widgets>
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditQuoteItemForRequest" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}">
+ <include-form name="EditQuoteItemForRequest" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -464,20 +409,9 @@
<widgets>
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="CreateQuoteAndQuoteItemForRequest" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}">
+ <include-form name="CreateQuoteAndQuoteItemForRequest" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml?rev=826379&r1=826378&r2=826379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml Sun Oct 18 09:16:40 2009
@@ -57,14 +57,12 @@
<decorator-section name="body">
<section>
<widgets>
- <container style="screenlet">
+ <screenlet>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl"/></html>
</platform-specific>
- <container style="screenlet-body">
- <decorator-section-include name="body"/>
- </container>
- </container>
+ <decorator-section-include name="body"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=826379&r1=826378&r2=826379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sun Oct 18 09:16:40 2009
@@ -293,14 +293,12 @@
<decorator-section name="body">
<section>
<widgets>
- <container style="screenlet">
+ <screenlet>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl"/></html>
</platform-specific>
- <container style="screenlet-body">
- <include-form location="component://order/webapp/ordermgr/order/OrderForms.xml" name="LookupBulkAddSupplierProductsInApprovedOrder"></include-form>
- </container>
- </container>
+ <include-form location="component://order/webapp/ordermgr/order/OrderForms.xml" name="LookupBulkAddSupplierProductsInApprovedOrder"></include-form>
+ </screenlet>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml?rev=826379&r1=826378&r2=826379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml Sun Oct 18 09:16:40 2009
@@ -61,16 +61,9 @@
<widgets>
<decorator-screen name="CommonOrderHeaderDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditOrderHeader}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="EditOrderHeader" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditOrderHeader}">
+ <include-form name="EditOrderHeader" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -90,16 +83,9 @@
<widgets>
<decorator-screen name="CommonOrderHeaderDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListOrderHeaders}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="ListOrderHeaders" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleListOrderHeaders}">
+ <include-form name="ListOrderHeaders" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=826379&r1=826378&r2=826379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Sun Oct 18 09:16:40 2009
@@ -49,24 +49,13 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFindReturn}"/>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleFindReturn}">
+ <container>
+ <link style="buttontext" target="returnMain" text="${uiLabelMap.OrderCreateNewReturn}"/>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link style="buttontext" target="returnMain" text="${uiLabelMap.OrderCreateNewReturn}"/>
- </container>
- <include-form name="FindReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/>
- <include-form name="ListReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="FindReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/>
+ <include-form name="ListReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -82,24 +71,11 @@
<widgets>
<decorator-screen name="CommonOrderReturnDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFindQuickReturn}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html>
- <html-template location="component://order/webapp/ordermgr/return/quickReturn.ftl"/>
- </html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleFindQuickReturn}">
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/return/quickReturn.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -138,24 +114,11 @@
<widgets>
<decorator-screen name="CommonOrderReturnDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleReturnList}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html>
- <html-template location="component://order/webapp/ordermgr/return/returnList.ftl"/>
- </html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleReturnList}">
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/return/returnList.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=826379&r1=826378&r2=826379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sun Oct 18 09:16:40 2009
@@ -97,22 +97,11 @@
<html><html-template location="component://order/webapp/ordermgr/quote/CreateOrderQuote.ftl"/></html>
</platform-specific>
<include-screen name="ViewQuoteTemplate"/>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderCopyQuote}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/CopyQuote.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OrderCopyQuote}">
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/quote/CopyQuote.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -227,20 +216,9 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteEdit}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditQuote" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteEdit}">
+ <include-form name="EditQuote" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -262,25 +240,14 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteListRoles}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditQuoteRole" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="ListQuoteRoles" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteListRoles}">
+ <container>
+ <link target="EditQuoteRole" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- </container>
+ <include-form name="ListQuoteRoles" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -302,25 +269,14 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteEditRoles}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditQuoteRole" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="EditQuoteRole" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteEditRoles}">
+ <container>
+ <link target="EditQuoteRole" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- </container>
+ <include-form name="EditQuoteRole" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -345,25 +301,14 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteListItems}"/>
- </container>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteListItems}">
+ <container>
+ <link target="EditQuoteItem" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditQuoteItem" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="ListQuoteItems" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="ListQuoteItems" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -385,25 +330,14 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteEditItems}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditQuoteItem" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="EditQuoteItem" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteEditItems}">
+ <container>
+ <link target="EditQuoteItem" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- </container>
+ <include-form name="EditQuoteItem" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -424,25 +358,14 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteListAttributes}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditQuoteAttribute" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="ListQuoteAttributes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteListAttributes}">
+ <container>
+ <link target="EditQuoteAttribute" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- </container>
+ <include-form name="ListQuoteAttributes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -464,25 +387,14 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteEditAttributes}"/>
- </container>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteEditAttributes}">
+ <container>
+ <link target="EditQuoteAttribute" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditQuoteAttribute" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="EditQuoteAttribute" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="EditQuoteAttribute" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -503,25 +415,14 @@
<widgets>
<decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteListCoefficients}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditQuoteCoefficient" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="ListQuoteCoefficients" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteListCoefficients}">
+ <container>
+ <link target="EditQuoteCoefficient" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- </container>
+ <include-form name="ListQuoteCoefficients" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -543,25 +444,14 @@
<widgets>
<decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteEditCoefficients}"/>
- </container>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteEditCoefficients}">
+ <container>
+ <link target="EditQuoteCoefficient" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditQuoteCoefficient" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="EditQuoteCoefficient" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="EditQuoteCoefficient" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -593,39 +483,17 @@
<widgets>
<decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuotePrices}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePrices.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuotePrices}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ManageQuotePrices" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OrderOrderQuotePrices}">
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePrices.ftl"/></html>
+ </platform-specific>
+ </screenlet>
+ <screenlet title="${uiLabelMap.OrderOrderQuotePrices}">
+ <include-form name="ManageQuotePrices" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -649,28 +517,17 @@
<widgets>
<decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteListAdjustments}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="autoCreateQuoteAdjustments" text="${uiLabelMap.OrderRunStorePromotions}" style="buttontext">
- <parameter param-name="quoteId"/>
- </link>
- <link target="EditQuoteAdjustment" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="ListQuoteAdjustments" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteListAdjustments}">
+ <container>
+ <link target="autoCreateQuoteAdjustments" text="${uiLabelMap.OrderRunStorePromotions}" style="buttontext">
+ <parameter param-name="quoteId"/>
+ </link>
+ <link target="EditQuoteAdjustment" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- </container>
+ <include-form name="ListQuoteAdjustments" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -692,25 +549,14 @@
<widgets>
<decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteEditAdjustments}"/>
- </container>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteEditAdjustments}">
+ <container>
+ <link target="EditQuoteAdjustment" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditQuoteAdjustment" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- </container>
- <include-form name="EditQuoteAdjustment" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="EditQuoteAdjustment" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -742,23 +588,12 @@
<widgets>
<decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteViewProfit}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteProfit.ftl"/></html>
- </platform-specific>
- <include-form name="ViewQuoteProfit" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteViewProfit}">
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteProfit.ftl"/></html>
+ </platform-specific>
+ <include-form name="ViewQuoteProfit" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -779,20 +614,9 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteEditReportMail}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditQuoteReportMail" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteEditReportMail}">
+ <include-form name="EditQuoteReportMail" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml?rev=826379&r1=826378&r2=826379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml Sun Oct 18 09:16:40 2009
@@ -36,20 +36,9 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderCreateOrderQuoteWorkEfforts}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddQuoteWorkEffort" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OrderCreateOrderQuoteWorkEfforts}">
+ <include-form name="AddQuoteWorkEffort" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -72,20 +61,9 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteEditWorkEfforts}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditQuoteWorkEffort" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteEditWorkEfforts}">
+ <include-form name="EditQuoteWorkEffort" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -106,25 +84,14 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderOrderQuoteWorkEfforts}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="AddQuoteWorkEffort" text="${uiLabelMap.OrderCreateQuoteWorkEffort}" style="buttontext">
- <parameter param-name="quoteId"/>
- </link>
- </container>
- <include-form name="ListQuoteWorkEfforts" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.OrderOrderQuoteWorkEfforts}">
+ <container>
+ <link target="AddQuoteWorkEffort" text="${uiLabelMap.OrderCreateQuoteWorkEffort}" style="buttontext">
+ <parameter param-name="quoteId"/>
+ </link>
</container>
- </container>
+ <include-form name="ListQuoteWorkEfforts" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=826379&r1=826378&r2=826379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sun Oct 18 09:16:40 2009
@@ -231,34 +231,12 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderReportOpenOrderItems} - ${productStore.storeName}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="OpenOrderItemsList" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderReportOpenOrderItems}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="OpenOrderItemsTotal" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OrderReportOpenOrderItems} - ${productStore.storeName}">
+ <include-form name="OpenOrderItemsList" location="component://order/widget/ordermgr/ReportForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.OrderReportOpenOrderItems}">
+ <include-form name="OpenOrderItemsTotal" location="component://order/widget/ordermgr/ReportForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=826379&r1=826378&r2=826379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Sun Oct 18 09:16:40 2009
@@ -144,20 +144,9 @@
<widgets>
<decorator-screen name="CommonRequirementsDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFindApprovedProductRequirements}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="FindApprovedProductRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleFindApprovedProductRequirements}">
+ <include-form name="FindApprovedProductRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </screenlet>
<section>
<actions>
<set field="genericLinkName" value="print"/>
@@ -175,40 +164,18 @@
<not><if-empty field="parameters.partyId"/></not>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderRequirementsList}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ApprovedProductRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- <container style="screenlet">
- <include-form name="ApprovedProductRequirementsSummary" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </container>
- <include-form name="ApprovedProductRequirementsSubmit" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.OrderRequirementsList}">
+ <include-form name="ApprovedProductRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ <container style="screenlet">
+ <include-form name="ApprovedProductRequirementsSummary" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
</container>
- </container>
+ <include-form name="ApprovedProductRequirementsSubmit" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFindApprovedProductRequirements}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ApprovedProductRequirementsList" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleFindApprovedProductRequirements}">
+ <include-form name="ApprovedProductRequirementsList" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </screenlet>
</fail-widgets>
</section>
</decorator-section>
@@ -248,20 +215,9 @@
<widgets>
<decorator-screen name="CommonRequirementsDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFindApprovedRequirementsBySupplier}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ApprovedProductRequirementsByVendor" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleFindApprovedRequirementsBySupplier}">
+ <include-form name="ApprovedProductRequirementsByVendor" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -300,20 +256,9 @@
<widgets>
<decorator-screen name="CommonRequirementDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditRequirement}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditRequirement" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditRequirement}">
+ <include-form name="EditRequirement" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -336,20 +281,9 @@
<widgets>
<decorator-screen name="CommonRequirementDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListRequirementCustRequests}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListRequirementCustRequests" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleListRequirementCustRequests}">
+ <include-form name="ListRequirementCustRequests" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -373,20 +307,9 @@
<widgets>
<decorator-screen name="CommonRequirementDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListRequirementOrders}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListRequirementOrders" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleListRequirementOrders}">
+ <include-form name="ListRequirementOrders" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -410,29 +333,18 @@
<widgets>
<decorator-screen name="CommonRequirementDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListRequirementRoles}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditRequirementRole" text="${uiLabelMap.CommonNew}" style="buttontext">
- <parameter param-name="requirementId"/>
- </link>
- <link target="autoAssignRequirementToSupplier" text="${uiLabelMap.OrderAutoAssign}" style="buttontext">
- <parameter param-name="requirementId"/>
- </link>
- </container>
- <include-form name="ListRequirementRoles" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- </decorator-section>
+ <screenlet title="${uiLabelMap.PageTitleListRequirementRoles}">
+ <container>
+ <link target="EditRequirementRole" text="${uiLabelMap.CommonNew}" style="buttontext">
+ <parameter param-name="requirementId"/>
+ </link>
+ <link target="autoAssignRequirementToSupplier" text="${uiLabelMap.OrderAutoAssign}" style="buttontext">
+ <parameter param-name="requirementId"/>
+ </link>
+ </container>
+ <include-form name="ListRequirementRoles" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </screenlet>
+ </decorator-section>
</decorator-screen>
</widgets>
</section>
@@ -450,20 +362,9 @@
<widgets>
<decorator-screen name="CommonRequirementDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditRequirementRole}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditRequirementRole" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditRequirementRole}">
+ <include-form name="EditRequirementRole" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>