Author: deepak
Date: Wed Apr 11 18:29:12 2018
New Revision: 1828918
URL: http://svn.apache.org/viewvc?rev=1828918&view=rev
Log:
Improved: Standardise layout for Order
(OFBIZ-10332)
Thanks Dennis Balkir for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=1828918&r1=1828917&r2=1828918&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
Wed Apr 11 18:29:12 2018
@@ -51,7 +51,7 @@ under the License.
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleFindReturn}">
- <container>
+ <container style="basic-nav">
<link style="buttontext" target="returnMain"
text="${uiLabelMap.OrderCreateNewReturn}"/>
</container>
<include-form name="FindReturns"
location="component://order/widget/ordermgr/ReturnForms.xml"/>
@@ -97,7 +97,9 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
+ <screenlet>
<include-form name="EditReturn"
location="component://order/widget/ordermgr/ReturnForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1828918&r1=1828917&r2=1828918&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
Wed Apr 11 18:29:12 2018
@@ -387,7 +387,7 @@ under the License.
<decorator-screen name="CommonQuoteDecorator"
location="${parameters.quoteDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.OrderOrderQuoteListAttributes}">
- <container>
+ <container style="basic-nav">
<link target="EditQuoteAttribute"
text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext">
<parameter param-name="quoteId"
from-field="quote.quoteId"/>
</link>
@@ -442,7 +442,7 @@ under the License.
<decorator-screen name="CommonQuoteDecorator"
location="${parameters.quoteDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.OrderOrderQuoteListCoefficients}">
- <container>
+ <container style="basic-nav">
<link target="EditQuoteCoefficient"
text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext">
<parameter param-name="quoteId"
from-field="quote.quoteId"/>
</link>
@@ -543,7 +543,7 @@ under the License.
<decorator-screen name="CommonQuoteDecorator"
location="${parameters.quoteDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.OrderOrderQuoteListAdjustments}">
- <container>
+ <container style="basic-nav">
<link target="autoCreateQuoteAdjustments"
text="${uiLabelMap.OrderRunStorePromotions}" style="buttontext">
<parameter param-name="quoteId"/>
</link>
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml?rev=1828918&r1=1828917&r2=1828918&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
Wed Apr 11 18:29:12 2018
@@ -123,7 +123,7 @@ under the License.
<decorator-screen name="CommonQuoteDecorator"
location="${parameters.quoteDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.OrderOrderQuoteWorkEfforts}">
- <container>
+ <container style="basic-nav">
<link target="AddQuoteWorkEffort"
text="${uiLabelMap.OrderCreateQuoteWorkEffort}" style="buttontext">
<parameter param-name="quoteId"/>
</link>
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=1828918&r1=1828917&r2=1828918&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Wed Apr 11 18:29:12 2018
@@ -65,7 +65,7 @@ under the License.
</condition>
<widgets>
<include-menu name="RequirementsTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
- <container>
+ <container style="button-bar">
<link target="EditRequirement"
text="${uiLabelMap.OrderNewRequirement}" style="buttontext"/>
</container>
<decorator-section-include name="body"/>
