You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/01/20 21:28:47 UTC
svn commit: r613672 [4/4] - in /ofbiz/trunk/applications/order:
webapp/ordermgr/lookup/ webapp/ordermgr/order/ webapp/ordermgr/quote/
webapp/ordermgr/request/ webapp/ordermgr/requirement/
webapp/ordermgr/return/ webapp/ordermgr/task/ widget/ordermgr/
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml Sun Jan 20 12:28:45 2008
@@ -32,7 +32,7 @@
</condition>
<widgets>
<container>
- <label style="head1">[${uiLabelMap.CommonId}:${orderHeader.orderId}] </label>
+ <label style="head1">${uiLabelMap.CommonId}:${orderHeader.orderId}</label>
</container>
<decorator-section-include name="body"/>
@@ -50,7 +50,6 @@
<screen name="EditOrderHeader">
<section>
<actions>
- <set field="title" value="Edit OrderHeader"/>
<set field="titleProperty" value="PageTitleEditOrderHeader"/>
<set field="headerItem" value="OrderHeader"/>
<set field="tabButtonItem" value="EditOrderHeader"/>
@@ -62,7 +61,16 @@
<widgets>
<decorator-screen name="CommonOrderHeaderDecorator">
<decorator-section name="body">
- <include-form name="EditOrderHeader" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditOrderHeader}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="EditOrderHeader" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -71,8 +79,7 @@
<screen name="ListOrderHeaders">
<section>
<actions>
- <set field="title" value="Edit OrderHeader"/>
- <set field="titleProperty" value="PageTitleEditOrderHeader"/>
+ <set field="titleProperty" value="PageTitleListOrderHeaders"/>
<set field="headerItem" value="OrderHeader"/>
<set field="tabButtonItem" value="EditOrderHeader"/>
@@ -83,11 +90,19 @@
<widgets>
<decorator-screen name="CommonOrderHeaderDecorator">
<decorator-section name="body">
- <include-form name="ListOrderHeaders" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListOrderHeaders}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListOrderHeaders" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
-
+</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Sun Jan 20 12:28:45 2008
@@ -130,6 +130,7 @@
<screen name="OrderHeaderListView">
<section>
<actions>
+ <set field="titleProperty" value="OrderLookupOrder"/>
<set field="headerItem" value="orderlist"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh"/>
@@ -297,7 +298,7 @@
<screen name="ListOrderTerms">
<section>
<actions>
- <set field="titleProperty" value="ListOrderTerms"/>
+ <set field="titleProperty" value="OrderListOrderTerms"/>
<set field="headerItem" value="findorders"/>
<entity-and entity-name="OrderTerm" list-name="orderTerms">
<field-map field-name="orderId" env-name="parameters.orderId"/>
@@ -306,11 +307,29 @@
<widgets>
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
- <include-form name="ListOrderTerms" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
- <include-form name="AddOrderTerm" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.OrderListOrderTerms}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListOrderTerms" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.OrderAddOrderTerms}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="AddOrderTerm" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
+</screens>
\ No newline at end of file