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/12 12:53:11 UTC
svn commit: r667042 - in /ofbiz/trunk/applications/manufacturing: config/
webapp/manufacturing/bom/ webapp/manufacturing/jobshopmgt/
webapp/manufacturing/routing/ widget/manufacturing/
Author: ashish
Date: Thu Jun 12 03:53:11 2008
New Revision: 667042
URL: http://svn.apache.org/viewvc?rev=667042&view=rev
Log:
Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839.
Container to Screenlet conversion is done on Manufacturing component.
Thanks Harsha Chadhar for your patch.
Harsha you didn't remove the relative path from your patch :-).
Modified:
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=667042&r1=667041&r2=667042&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Thu Jun 12 03:53:11 2008
@@ -1363,14 +1363,6 @@
<value xml:lang="th">รายà¸à¸²à¸£à¸à¸à¸à¸ªà¸±à¸à¸à¸²à¸«à¹</value>
<value xml:lang="zh">å¨å表</value>
</property>
- <property key="ManufacturingListCostComponentCalc">
- <value xml:lang="en">List Cost Component Calc Entries</value>
- <value xml:lang="es">Lista de calculo de componentes</value>
- <value xml:lang="it">Lista Costi Componenti Voci Calcolo</value>
- <value xml:lang="ro">Lista Costuri Componente Date Calcul</value>
- <value xml:lang="th">à¹à¸à¹à¸²à¸ªà¸¹à¹à¸ªà¹à¸§à¸à¸à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸³à¸à¸§à¸à¸£à¸²à¸à¸²</value>
- <value xml:lang="zh">ååºè´¹ç¨ç»æ计ç®è®°å½</value>
- </property>
<property key="ManufacturingListOfProductionRunComponents">
<value xml:lang="en">List Of Production Run Components</value>
<value xml:lang="es">Lista de componentes de la corrida de produción</value>
@@ -1503,8 +1495,8 @@
</property>
<property key="ManufacturingMainPageNote">
<value xml:lang="en">NOTE: This application is currently in development. This page will change.</value>
- <value xml:lang="es">
- NOTA:
+ <value xml:lang="es">
+ NOTA:
La aplicación aún se encuentra en desarrollo. Es muy probable que la página cambie en las siguientes versiones.</value>
<value xml:lang="fr">Aide sur l'application de gestion de production</value>
<value xml:lang="it">NOTA: Questa applicazione è attualmente in sviluppo. Questa pagina verrà cambiata.</value>
@@ -2846,23 +2838,6 @@
<value xml:lang="th">รายà¸à¸²à¸£à¸à¸à¸à¸ªà¸±à¸à¸à¸²à¸«à¹</value>
<value xml:lang="zh">å¨å表</value>
</property>
- <property key="PageTitleListRoutingProductLink">
- <value xml:lang="en">List Routing Product Link</value>
- <value xml:lang="it">Lista Link Prodotti Operazioni</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¸à¸±à¸à¸à¸²à¸à¸ªà¸´à¸à¸à¹à¸²</value>
- </property>
- <property key="PageTitleListRoutingTaskAssoc">
- <value xml:lang="en">List Routing Task Assoc</value>
- <value xml:lang="it">Lista Associazioni Operazioni</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸¥à¸¥à¸¸à¹à¸¡à¸à¸à¸à¸à¸²à¸</value>
- </property>
- <property key="PageTitleListRoutingTaskProducts">
- <value xml:lang="en">Edit Routing Task Products</value>
- <value xml:lang="it">Aggiorna Operazione Prodotti</value>
- <value xml:lang="ro">Actualizare Operatii Produse</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸à¸à¹à¸²à¸à¸ªà¸´à¸à¸à¹à¸²</value>
- <value xml:lang="zh">ç¼è¾è§ç¨ä»»å¡ç产å</value>
- </property>
<property key="PageTitleListRoutingTaskRoutings">
<value xml:lang="en">Edit Routing Task Routings</value>
<value xml:lang="it">Aggiorna Cicli Associati all'Operazione</value>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml?rev=667042&r1=667041&r2=667042&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml Thu Jun 12 03:53:11 2008
@@ -71,7 +71,7 @@
</form>
<form name="ListProductManufacturingRules" type="list" target="UpdateProductManufacturingRule" title="" list-name="manufacturingRules"
- 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">
<auto-fields-service service-name="updateProductManufacturingRule" map-name="manufacturingRule"/>
<field name="ruleId"><display/></field>
<field name="ruleSeqId"><display/></field>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=667042&r1=667041&r2=667042&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Thu Jun 12 03:53:11 2008
@@ -149,7 +149,7 @@
<field name="estimatedTotalMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedTotalMilliSeconds}" ><display/></field>
</form>
<form name="ListProductionRunRoutingTasks" type="list" target="ProductionRunTasks" title="" list-name="productionRunRoutingTasks"
- 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">
<row-actions>
<set field="estimatedTotalMilliSeconds" value="${bsh:estimatedMilliSeconds * quantity}" type="Double"/>
</row-actions>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml?rev=667042&r1=667041&r2=667042&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Thu Jun 12 03:53:11 2008
@@ -144,7 +144,7 @@
</field>
</form>
<form name="ListRoutingTaskCosts" type="list" title="" list-name="allCosts"
- 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">
<auto-fields-entity entity-name="WorkEffortCostCalc" default-field-type="display"/>
<field name="workEffortId"><hidden/></field>
<field name="costComponentTypeId">
@@ -198,7 +198,7 @@
<!-- Routing Task Assoc Forms -->
<form name="ListRoutingTaskAssoc" type="list" target="EditRoutingTaskAssoc" title="" list-name="allRoutingTasks"
- 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">
<auto-fields-service service-name="updateWorkEffortAssoc" map-name="routingTaskAssoc"/>
<field name="workEffortIdFrom"><hidden/></field>
<field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
@@ -260,7 +260,7 @@
</form>
<form name="ListRoutingProductLink" type="list" target="EditRoutingProductLink" title="" list-name="allRoutingProductLinks"
- 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="productId" widget-style="buttontext">
<hyperlink description="${productId}" target="/catalog/control/ViewProductManufacturing?productId=${productId}" also-hidden="false" target-type="inter-app"/>
</field>
@@ -278,7 +278,7 @@
</field>
</form>
<form name="ListRoutingTaskProducts" type="list" target="ListRoutingTaskProducts" title="" list-name="allProducts"
- 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="productId" title="${uiLabelMap.ProductProductName}">
<display-entity entity-name="Product" description="${productId} ${internalName}"/>
</field>
@@ -313,7 +313,7 @@
<!-- RoutingTask-FixedAsset association (WorkEffortFixedAssetStd) -->
<form name="ListRoutingTaskFixedAssets" type="list" title="" target="updateRoutingTaskFixedAsset" list-name="allFixedAssets"
- 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">
<auto-fields-entity entity-name="WorkEffortFixedAssetStd" />
<field name="workEffortId"><hidden/></field>
<field name="fixedAssetTypeId">
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=667042&r1=667041&r2=667042&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Thu Jun 12 03:53:11 2008
@@ -90,34 +90,10 @@
<widgets>
<decorator-screen name="CommonBomDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditProductManufacturingRules}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateProductManufacturingRule" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditProductManufacturingRules}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListProductManufacturingRules" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ProductManufacturingRulePanel" title="${uiLabelMap.PageTitleEditProductManufacturingRules}" collapsible="true">
+ <include-form name="UpdateProductManufacturingRule" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/>
+ </screenlet>
+ <include-form name="ListProductManufacturingRules" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml?rev=667042&r1=667041&r2=667042&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml Thu Jun 12 03:53:11 2008
@@ -21,7 +21,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="ListCostComponentCalc" type="list" title="" list-name="allCostComponentCalcs"
- 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">
<auto-fields-entity entity-name="CostComponentCalc" default-field-type="display"/>
<field name="costComponentCalcId" widget-style="buttontext">
<hyperlink target="EditCostCalcs?costComponentCalcId=${costComponentCalcId}" description="${costComponentCalcId}" also-hidden="false"/>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml?rev=667042&r1=667041&r2=667042&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml Thu Jun 12 03:53:11 2008
@@ -38,34 +38,10 @@
<container>
<label style="h1">${uiLabelMap.ManufacturingManageCostComponentCalc}</label>
</container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ManufacturingListCostComponentCalc}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ManufacturingEditCostComponentCalc}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="CostComponentCalcPanel" title="${uiLabelMap.ManufacturingEditCostComponentCalc}" collapsible="true">
+ <include-form name="EditCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
+ </screenlet>
+ <include-form name="ListCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=667042&r1=667041&r2=667042&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Thu Jun 12 03:53:11 2008
@@ -506,34 +506,10 @@
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ManufacturingProductionRunTasks}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditProductionRunRoutingTask" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="ProductionRunRoutingTaskPanel" title="${uiLabelMap.ManufacturingProductionRunTasks}" collapsible="true">
+ <include-form name="EditProductionRunRoutingTask" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </screenlet>
+ <include-form name="ListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=667042&r1=667041&r2=667042&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Thu Jun 12 03:53:11 2008
@@ -274,34 +274,10 @@
<widgets>
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditRoutingTaskCosts}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListRoutingTaskCosts" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonAdd} ${uiLabelMap.ManufacturingRoutingTaskCosts}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddRoutingTaskCost" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="RoutingTaskCostPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.ManufacturingRoutingTaskCosts}" collapsible="true">
+ <include-form name="AddRoutingTaskCost" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </screenlet>
+ <include-form name="ListRoutingTaskCosts" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -345,7 +321,7 @@
<screen name="ListRoutingTaskProducts">
<section>
<actions>
- <set field="titleProperty" value="PageTitleListRoutingTaskProducts"/>
+ <set field="titleProperty" value="ManufacturingNewRoutingTaskProduct"/>
<set field="headerItem" value="routingTask"/>
<set field="tabButtonItem" value="listRoutingTaskProducts"/>
@@ -359,23 +335,10 @@
<widgets>
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListRoutingTaskProducts}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditRoutingTaskProduct?workEffortId=${workEffortId}" text="${uiLabelMap.ManufacturingNewRoutingTaskProduct}" style="buttontext"/>
- </container>
- <include-form name="ListRoutingTaskProducts" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="RoutingTaskProductPanel" title="${uiLabelMap.ManufacturingNewRoutingTaskProduct}" collapsible="true">
+ <link target="EditRoutingTaskProduct?workEffortId=${workEffortId}" text="${uiLabelMap.ManufacturingNewRoutingTaskProduct}" style="buttontext"/>
+ </screenlet>
+ <include-form name="ListRoutingTaskProducts" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -436,36 +399,12 @@
<widgets>
<decorator-screen name="CommonRoutingDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditRoutingTaskAssoc}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListRoutingTaskAssoc}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListRoutingTaskAssoc" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="RoutingTaskAssocPanel" title="${uiLabelMap.PageTitleEditRoutingTaskAssoc}" collapsible="true">
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl"/></html>
+ </platform-specific>
+ </screenlet>
+ <include-form name="ListRoutingTaskAssoc" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -492,34 +431,10 @@
<widgets>
<decorator-screen name="CommonRoutingDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditRoutingProductLink}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditRoutingProductLink" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListRoutingProductLink}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListRoutingProductLink" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="RoutingProductLinkPanel" title="${uiLabelMap.PageTitleEditRoutingProductLink}" collapsible="true">
+ <include-form name="EditRoutingProductLink" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </screenlet>
+ <include-form name="ListRoutingProductLink" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -539,34 +454,10 @@
<widgets>
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditRoutingTaskFixedAsset}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListRoutingTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonAdd}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditRoutingTaskFixedAsset" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml" />
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="RoutingTaskFixedAssetPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.ManufacturingRoutingTasks} ${uiLabelMap.ManufacturingRoutingTaskFixedAssets}" collapsible="true">
+ <include-form name="EditRoutingTaskFixedAsset" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </screenlet>
+ <include-form name="ListRoutingTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>