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/24 21:42:54 UTC
svn commit: r614984 [3/3] - in /ofbiz/trunk/applications/manufacturing:
config/ webapp/manufacturing/jobshopmgt/ webapp/manufacturing/mrp/
webapp/manufacturing/routing/ widget/manufacturing/
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Thu Jan 24 12:42:46 2008
@@ -23,7 +23,6 @@
<screen name="ManufacturingReports">
<section>
<actions>
- <set field="title" value="Manufacturing Reports"/>
<set field="titleProperty" value="ManufacturingReports"/>
<set field="headerItem" value="ManufacturingReports"/>
@@ -32,15 +31,23 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head1" text="${uiLabelMap.ManufacturingReports}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingReports}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="SelectMrpName" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
</container>
- <container>
- <include-form name="SelectMrpName" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- </container>
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl"/></html>
- </platform-specific>
</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=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Thu Jan 24 12:42:46 2008
@@ -42,7 +42,7 @@
<html><html-template location="component://manufacturing/webapp/manufacturing/routing/RoutingTabBar.ftl"/></html>
</platform-specific>
<container>
- <label style="head1">[${uiLabelMap.CommonId}:${routing.workEffortId}] ${routing.workEffortName}</label>
+ <label style="head1">[${uiLabelMap.CommonId} ${routing.workEffortId}] ${routing.workEffortName}</label>
</container>
<decorator-section-include name="body"/>
</widgets>
@@ -74,7 +74,7 @@
<html><html-template location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskTabBar.ftl"/></html>
</platform-specific>
<container>
- <label style="head1">[${uiLabelMap.CommonId}:${routingTask.workEffortId}] ${routingTask.workEffortName}</label>
+ <label style="head1">[${uiLabelMap.CommonId} ${routingTask.workEffortId}] ${routingTask.workEffortName}</label>
</container>
<decorator-section-include name="body"/>
</widgets>
@@ -91,7 +91,6 @@
<screen name="FindRouting">
<section>
<actions>
- <set field="title" value="Find a Product Routing"/>
<set field="titleProperty" value="PageTitleFindRouting"/>
<set field="tabButtonItem" value="findRouting"/>
<set field="headerItem" value="routing"/>
@@ -104,15 +103,37 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.ManufacturingRoutings}</label>
- </container>
- <container>
- <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindRouting}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext"/>
+ </container>
+ <include-form name="FindRoutings" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
-
- <include-form name="FindRoutings" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- <include-form name="ListRoutings" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingRoutings}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListRoutings" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -121,7 +142,6 @@
<screen name="EditRouting">
<section>
<actions>
- <set field="title" value="Edit Routing"/>
<set field="titleProperty" value="PageTitleEditRouting"/>
<set field="headerItem" value="routing"/>
<set field="tabButtonItem" value="editRouting"/>
@@ -132,10 +152,23 @@
<widgets>
<decorator-screen name="CommonRoutingDecorator">
<decorator-section name="body">
- <container>
- <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext"/>
- </container>
- <include-form name="EditRouting" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditRouting}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext"/>
+ </container>
+ <include-form name="EditRouting" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -144,7 +177,6 @@
<screen name="FindRoutingTask">
<section>
<actions>
- <set field="title" value="Find a Product Routing Task"/>
<set field="titleProperty" value="PageTitleFindRoutingTask"/>
<set field="tabButtonItem" value="routingTask"/>
<set field="headerItem" value="routingTask"/>
@@ -155,15 +187,37 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.ManufacturingRoutingTasks}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindRoutingTask}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext"/>
+ </container>
+ <include-form name="FindRoutingTasks" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <container>
- <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingRoutingTasks}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListRoutingTasks" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
-
- <include-form name="FindRoutingTasks" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- <include-form name="ListRoutingTasks" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -172,7 +226,6 @@
<screen name="EditRoutingTask">
<section>
<actions>
- <set field="title" value="Edit Routing Task"/>
<set field="titleProperty" value="PageTitleEditRoutingTask"/>
<set field="headerItem" value="routingTask"/>
<set field="tabButtonItem" value="editRoutingTask"/>
@@ -183,10 +236,23 @@
<widgets>
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
- <container>
- <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext"/>
- </container>
- <include-form name="EditRoutingTask" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditRoutingTask}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext"/>
+ </container>
+ <include-form name="EditRoutingTask" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -195,7 +261,6 @@
<screen name="EditRoutingTaskCosts">
<section>
<actions>
- <set field="title" value="Edit Routing Task Costs"/>
<set field="titleProperty" value="PageTitleEditRoutingTaskCosts"/>
<set field="headerItem" value="routingTask"/>
<set field="tabButtonItem" value="editRoutingTaskCosts"/>
@@ -209,14 +274,34 @@
<widgets>
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
- <container>
- <label style="head2">${uiLabelMap.ManufacturingRoutingTaskCosts}</label>
- </container>
- <include-form name="ListRoutingTaskCosts" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.CommonAdd}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
- <include-form name="AddRoutingTaskCost" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
@@ -225,7 +310,6 @@
<screen name="ListRoutingTaskRoutings">
<section>
<actions>
- <set field="title" value="List Routing Task Routings"/>
<set field="titleProperty" value="PageTitleListRoutingTaskRoutings"/>
<set field="headerItem" value="routingTask"/>
<set field="tabButtonItem" value="listRoutingTaskRoutings"/>
@@ -239,7 +323,20 @@
<widgets>
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
- <include-form name="ListRoutingTaskRoutings" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListRoutingTaskRoutings}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListRoutingTaskRoutings" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -248,7 +345,6 @@
<screen name="ListRoutingTaskProducts">
<section>
<actions>
- <set field="title" value="List Routing Task Products"/>
<set field="titleProperty" value="PageTitleListRoutingTaskProducts"/>
<set field="headerItem" value="routingTask"/>
<set field="tabButtonItem" value="listRoutingTaskProducts"/>
@@ -263,10 +359,23 @@
<widgets>
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
- <container>
- <link target="EditRoutingTaskProduct?workEffortId=${workEffortId}" text="${uiLabelMap.ManufacturingNewRoutingTaskProduct}" style="buttontext"/>
- </container>
- <include-form name="ListRoutingTaskProducts" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
@@ -275,7 +384,6 @@
<screen name="EditRoutingTaskProduct">
<section>
<actions>
- <set field="title" value="Edit a Routing Task Product"/>
<set field="titleProperty" value="PageTitleEditRoutingTaskProduct"/>
<set field="headerItem" value="routingTask"/>
<set field="tabButtonItem" value="listRoutingTaskProducts"/>
@@ -290,19 +398,28 @@
<widgets>
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
- <include-form name="EditRoutingTaskProduct" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditRoutingTaskProduct}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditRoutingTaskProduct" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
-
-
<screen name="EditRoutingTaskAssoc">
<section>
<actions>
- <set field="title" value="Edit a Routing Task Assoc"/>
<set field="titleProperty" value="PageTitleEditRoutingTaskAssoc"/>
<set field="tabButtonItem" value="routingTaskAssoc"/>
<set field="headerItem" value="routing"/>
@@ -319,10 +436,36 @@
<widgets>
<decorator-screen name="CommonRoutingDecorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl"/></html>
- </platform-specific>
- <include-form name="ListRoutingTaskAssoc" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
@@ -331,7 +474,6 @@
<screen name="EditRoutingProductLink">
<section>
<actions>
- <set field="title" value="Edit a Routing Product Link"/>
<set field="titleProperty" value="PageTitleEditRoutingProductLink"/>
<set field="tabButtonItem" value="routingProductLink"/>
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
@@ -350,13 +492,34 @@
<widgets>
<decorator-screen name="CommonRoutingDecorator">
<decorator-section name="body">
- <!--
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditRoutingProductLink.ftl"/></html>
- </platform-specific>
- -->
- <include-form name="EditRoutingProductLink" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
- <include-form name="ListRoutingProductLink" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
@@ -365,7 +528,6 @@
<screen name="EditRoutingTaskFixedAssets">
<section>
<actions>
- <set field="title" value="Edit a Routing Task-Fixed Asset association" />
<set field="titleProperty" value="PageTitleEditRoutingTaskFixedAsset" />
<set field="tabButtonItem" value="editRoutingTaskFixedAssets" />
<set field="headerItem" value="routingTask" />
@@ -377,18 +539,37 @@
<widgets>
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
- <include-form name="ListRoutingTaskFixedAssets"
- location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml" />
- <container>
- <label style="head2">${uiLabelMap.CommonAdd}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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="head4">
+ <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>
- <include-form name="EditRoutingTaskFixedAsset"
- location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml" />
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
-</screens>
-
+</screens>
\ No newline at end of file