You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/06/13 09:10:00 UTC
svn commit: r667390 - in /ofbiz/trunk/applications/order:
config/OrderUiLabels.xml webapp/ordermgr/order/OrderForms.xml
webapp/ordermgr/request/RequestForms.xml
widget/ordermgr/OrderViewScreens.xml widget/ordermgr/RequestScreens.xml
Author: ashish
Date: Fri Jun 13 00:09:59 2008
New Revision: 667390
URL: http://svn.apache.org/viewvc?rev=667390&view=rev
Log:
Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839.
Container to Screenlet conversion is done on Order component.
Thanks Parimal Gain for your patch.
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=667390&r1=667389&r2=667390&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Jun 13 00:09:59 2008
@@ -8428,16 +8428,6 @@
<value xml:lang="th">หัวà¸à¹à¸à¸à¸²à¸£à¸£à¹à¸à¸à¸à¸</value>
<value xml:lang="zh">请æ±æç»</value>
</property>
- <property key="PageTitleRequestRoles">
- <value xml:lang="en">Request Roles</value>
- <value xml:lang="fr">Demande de rôles</value>
- <value xml:lang="it">Ruoli Richiesta</value>
- <value xml:lang="nl">Request Roles</value>
- <value xml:lang="ro">Roluri Cerere</value>
- <value xml:lang="ru">Роли запÑоÑа</value>
- <value xml:lang="th">สà¸à¸²à¸à¸°à¸à¸²à¸£à¸£à¹à¸à¸à¸à¸</value>
- <value xml:lang="zh">请æ±è§è²</value>
- </property>
<property key="PageTitleReturnHeader">
<value xml:lang="en">Return Header</value>
<value xml:lang="fr">Entête de retour</value>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml?rev=667390&r1=667389&r2=667390&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml Fri Jun 13 00:09:59 2008
@@ -94,7 +94,7 @@
<field name="productStoreId"> <display-entity entity-name="ProductStore"/> </field>
</form>
<form name="ListOrderTerms" type="list" list-name="orderTerms" target="updateOrderTerm" title=""
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListOrderTerms">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="ListOrderTerms">
<auto-fields-entity entity-name="OrderTerm" default-field-type="edit"/>
<field name="termTypeId"><display-entity also-hidden="true" entity-name="TermType"/></field>
<field name="orderId"><hidden/></field>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=667390&r1=667389&r2=667390&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Fri Jun 13 00:09:59 2008
@@ -318,7 +318,7 @@
</form>
<form name="ListRequestRoles" type="list" use-row-submit="true" title="" list-name="custRequestRoles"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="RequestRoles">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="RequestRoles">
<auto-fields-entity entity-name="CustRequestRole" default-field-type="display"/>
<field name="custRequestId"><hidden/></field>
<field name="partyId" widget-style="buttontext">
@@ -357,7 +357,7 @@
</field>
</form>
<form name="ListCustRequestItemWorkEfforts" type="list" target="" title=""
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="custRequestId"><hidden/></field>
<field name="custRequestItemSeqId"><hidden/></field>
<field name="workEffortId">
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=667390&r1=667389&r2=667390&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Fri Jun 13 00:09:59 2008
@@ -296,7 +296,7 @@
<screen name="ListOrderTerms">
<section>
<actions>
- <set field="titleProperty" value="OrderListOrderTerms"/>
+ <set field="titleProperty" value="OrderAddOrderTerms"/>
<set field="headerItem" value="findorders"/>
<entity-and entity-name="OrderTerm" list-name="orderTerms">
<field-map field-name="orderId" env-name="parameters.orderId"/>
@@ -305,26 +305,10 @@
<widgets>
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <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="h3">
- <label text="${uiLabelMap.OrderAddOrderTerms}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="AddOrderTerm" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
- </container>
- </container>
+ <screenlet id="OrderTermPanel" title="${uiLabelMap.OrderAddOrderTerms}" collapsible="true">
+ <include-form name="AddOrderTerm" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
+ </screenlet>
+ <include-form name="ListOrderTerms" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=667390&r1=667389&r2=667390&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Fri Jun 13 00:09:59 2008
@@ -171,7 +171,7 @@
<screen name="RequestRoles">
<section>
<actions>
- <set field="titleProperty" value="PageTitleRequestRoles"/>
+ <set field="titleProperty" value="PageTitleEditRequestRoles"/>
<set field="tabButtonItem" value="requestroles"/>
<set field="headerItem" value="request"/>
<set field="custRequestId" from-field="parameters.custRequestId"/>
@@ -183,34 +183,10 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleRequestRoles}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditRequestRoles}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditRequestRole" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="RequestRolePanel" title="${uiLabelMap.PageTitleEditRequestRoles}" collapsible="true">
+ <include-form name="EditRequestRole" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </screenlet>
+ <include-form name="ListRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -520,37 +496,11 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<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="EditRequestItem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
- </container>
- <include-form name="ListCustRequestItemWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="PageTitleEditRequestItemWorkEffort"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddCustRequestItemWorkEffort" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="CustRequestItemWorkEffortPanel" title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}" collapsible="true">
+ <link target="EditRequestItem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
+ <include-form name="AddCustRequestItemWorkEffort" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </screenlet>
+ <include-form name="ListCustRequestItemWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>