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 [2/3] - in /ofbiz/trunk/applications/manufacturing:
config/ webapp/manufacturing/jobshopmgt/ webapp/manufacturing/mrp/
webapp/manufacturing/routing/ widget/manufacturing/
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl Thu Jan 24 12:42:46 2008
@@ -17,21 +17,33 @@
under the License.
-->
-<h1>
- ${uiLabelMap.ManufacturingEditCalendarExceptionWeekFor}
- <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if>
- [${uiLabelMap.CommonId}:${techDataCalendar.calendarId?if_exists}]
-</h1>
-<br/>
<#if techDataCalendar?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ManufacturingEditCalendarExceptionWeekFor}
+ <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if>
+ [${uiLabelMap.CommonId} ${techDataCalendar.calendarId?if_exists}]</h3>
+ </div>
+ <div class="screenlet-body">
${listCalendarExceptionWeekWrapper.renderFormString(context)}
- <br/>
- <hr/>
+ </div>
+</div>
<#if calendarExceptionWeek?has_content>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleEditCalendarExceptionWeek}</h3>
+ </div>
+ <div class="screenlet-body">
${updateCalendarExceptionWeekWrapper.renderFormString(context)}
- <br/>
- <hr/>
+ </div>
+ </div>
</#if>
- ${addCalendarExceptionWeekWrapper.renderFormString(context)}
-</#if>
-<br/>
\ No newline at end of file
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleAddCalendarExceptionWeek}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${addCalendarExceptionWeekWrapper.renderFormString(context)}
+ </div>
+ </div>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl Thu Jan 24 12:42:46 2008
@@ -36,7 +36,7 @@
<input type="hidden" name="workEffortIdFrom" value="${workEffortId}"/>
<input type="hidden" name="workEffortAssocTypeId" value="ROUTING_COMPONENT"/>
<input type="hidden" name="copyTask" value="N"/>
- <table cellpadding="2" cellspacing="0" border="0" class="boxoutside">
+ <table class="basic-table" cellspacing="0">
<tr>
<th align="right">
${uiLabelMap.ManufacturingRoutingTaskId}
@@ -82,5 +82,4 @@
</tr>
</table>
</form>
-<br/>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTabBar.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTabBar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTabBar.ftl Thu Jan 24 12:42:46 2008
@@ -17,13 +17,15 @@
under the License.
-->
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign selected = tabButtonItem?default("void")>
<#if routing?exists>
-<div class='tabContainer'>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.editRouting?default(unselectedClassName)}">${uiLabelMap.ManufacturingEditRouting}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.routingTaskAssoc?default(unselectedClassName)}">${uiLabelMap.ManufacturingEditRoutingTaskAssoc}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.routingProductLink?default(unselectedClassName)}">${uiLabelMap.ManufacturingEditRoutingProductLink}</a>
+<div class="button-bar tab-bar">
+ <ul>
+ <li<#if selected == "editRouting"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingEditRouting}</a></li>
+ <li<#if selected == "routingTaskAssoc"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingEditRoutingTaskAssoc}</a></li>
+ <li<#if selected == "routingProductLink"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingEditRoutingProductLink}</a></li>
+ </ul>
+ <br class="clear"/>
</div>
</#if>
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=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Thu Jan 24 12:42:46 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -21,7 +21,8 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<!-- Routing forms -->
- <form name="FindRoutings" type="single" target="FindRouting" title="">
+ <form name="FindRoutings" type="single" target="FindRouting" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="hideSearch"><hidden value="Y"/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingId}">
<text-find/>
@@ -34,7 +35,7 @@
</field>
</form>
<form name="ListRoutings" type="list" title="" list-name="listIt"
- paginate-target="FindRouting">
+ paginate-target="FindRouting" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<set field="entityName" value="WorkEffort"/>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -49,7 +50,8 @@
<field name="description"><display/></field>
<field name="quantityToProduce"><display/></field>
</form>
- <form name="EditRouting" type="single" target="UpdateRouting" title="" default-map-name="routing">
+ <form name="EditRouting" type="single" target="UpdateRouting" title="" default-map-name="routing"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="routing==null" target="CreateRouting"/>
<field name="workEffortTypeId" use-when="routing==null"><hidden value="ROUTING"/></field>
<field name="currentStatusId" use-when="routing==null"><hidden value="ROU_ACTIVE"/></field>
@@ -63,7 +65,8 @@
</form>
<!-- Routing Task Forms -->
- <form name="FindRoutingTasks" type="single" target="FindRoutingTask" title="">
+ <form name="FindRoutingTasks" type="single" target="FindRoutingTask" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="hideSearch"><hidden value="Y"/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTaskId}">
<text-find/>
@@ -83,7 +86,7 @@
</field>
</form>
<form name="ListRoutingTasks" type="list" title="" list-name="listIt"
- paginate-target="FindRoutingTask">
+ paginate-target="FindRoutingTask" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<set field="entityName" value="WorkEffort"/>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -105,7 +108,8 @@
<field name="estimatedSetupMillis"><display/></field>
<field name="estimatedMilliSeconds"><display/></field>
</form>
- <form name="EditRoutingTask" type="single" target="UpdateRoutingTask" title="" default-map-name="routingTask">
+ <form name="EditRoutingTask" type="single" target="UpdateRoutingTask" title="" default-map-name="routingTask"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="routingTask==null" target="CreateRoutingTask"/>
<field name="workEffortTypeId" use-when="routingTask==null"><hidden value="ROU_TASK"/></field>
<field name="currentStatusId" use-when="routingTask==null"><hidden value="ROU_ACTIVE"/></field>
@@ -139,7 +143,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="ListRoutingTaskCosts" type="list" title="" list-name="allCosts">
+ <form name="ListRoutingTaskCosts" type="list" title="" list-name="allCosts"
+ odd-row-style="alternate-row" 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">
@@ -157,7 +162,8 @@
<hyperlink target="removeRoutingTaskCost?costComponentCalcId=${costComponentCalcId}&costComponentTypeId=${costComponentTypeId}&fromDate=${fromDate}&workEffortId=${workEffortId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
</field>
</form>
- <form name="AddRoutingTaskCost" type="single" target="addRoutingTaskCost" title="">
+ <form name="AddRoutingTaskCost" type="single" target="addRoutingTaskCost" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="WorkEffortCostCalc" default-field-type="edit"/>
<field name="workEffortId"><hidden/></field>
<field name="costComponentTypeId">
@@ -177,7 +183,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="ListRoutingTaskRoutings" type="list" title="" list-name="allRoutings">
+ <form name="ListRoutingTaskRoutings" type="list" title="" list-name="allRoutings"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="workEffortIdFrom" title="${uiLabelMap.ManufacturingRouting}">
<display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="[${workEffortId}] ${workEffortName}"/>
</field>
@@ -190,7 +197,8 @@
</form>
<!-- Routing Task Assoc Forms -->
- <form name="ListRoutingTaskAssoc" type="list" target="EditRoutingTaskAssoc" title="" list-name="allRoutingTasks">
+ <form name="ListRoutingTaskAssoc" type="list" target="EditRoutingTaskAssoc" title="" list-name="allRoutingTasks"
+ odd-row-style="alternate-row" 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>
@@ -212,7 +220,8 @@
</sort-order>
</form>
- <form name="UpdateRoutingTaskAssoc" type="single" target="UpdateRoutingTaskAssoc" title="">
+ <form name="UpdateRoutingTaskAssoc" type="single" target="UpdateRoutingTaskAssoc" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="updateWorkEffortAssoc" map-name="routingTaskAssoc"/>
<field name="workEffortId"><hidden value="${workEffortIdFrom}"/></field>
<field name="workEffortIdFrom"><hidden/></field>
@@ -231,7 +240,8 @@
</form>
<!-- Routing Product Assoc -->
- <form name="EditRoutingProductLink" type="single" target="UpdateRoutingProductLink" title="" default-map-name="routingProductLink">
+ <form name="EditRoutingProductLink" type="single" target="UpdateRoutingProductLink" title="" default-map-name="routingProductLink"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="routingProductLink==null" target="AddRoutingProductLink"/>
<auto-fields-entity entity-name="WorkEffortGoodStandard" default-field-type="edit"/>
<field name="workEffortId"><hidden/></field>
@@ -249,7 +259,8 @@
</field>
</form>
- <form name="ListRoutingProductLink" type="list" target="EditRoutingProductLink" title="" list-name="allRoutingProductLinks">
+ <form name="ListRoutingProductLink" type="list" target="EditRoutingProductLink" title="" list-name="allRoutingProductLinks"
+ odd-row-style="alternate-row" 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>
@@ -266,9 +277,10 @@
<hyperlink target="removeRoutingProductLink?workEffortId=${workEffortId}&productId=${productId}&fromDate=${fromDate}&workEffortGoodStdTypeId=ROU_PROD_TEMPLATE" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="ListRoutingTaskProducts" type="list" target="ListRoutingTaskProducts" title="" list-name="allProducts">
+ <form name="ListRoutingTaskProducts" type="list" target="ListRoutingTaskProducts" title="" list-name="allProducts"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="productId" title="${uiLabelMap.ProductProductName}">
- <display-entity entity-name="Product" description="[${productId}] ${internalName}"/>
+ <display-entity entity-name="Product" description="${productId} ${internalName}"/>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
@@ -279,7 +291,8 @@
<hyperlink target="removeRoutingTaskProduct?workEffortId=${workEffortId}&productId=${productId}&fromDate=${fromDate}&workEffortGoodStdTypeId=PRUNT_PROD_DELIV" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="EditRoutingTaskProduct" type="single" target="updateRoutingTaskProduct" title="" default-map-name="routingProductLink">
+ <form name="EditRoutingTaskProduct" type="single" target="updateRoutingTaskProduct" title="" default-map-name="routingProductLink"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="routingProductLink==null" target="addRoutingTaskProduct"/>
<auto-fields-entity entity-name="WorkEffortGoodStandard" default-field-type="edit"/>
<field name="workEffortId"><hidden/></field>
@@ -299,7 +312,8 @@
</form>
<!-- RoutingTask-FixedAsset association (WorkEffortFixedAssetStd) -->
- <form name="ListRoutingTaskFixedAssets" type="list" title="" target="updateRoutingTaskFixedAsset" list-name="allFixedAssets">
+ <form name="ListRoutingTaskFixedAssets" type="list" title="" target="updateRoutingTaskFixedAsset" list-name="allFixedAssets"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="WorkEffortFixedAssetStd" />
<field name="workEffortId"><hidden/></field>
<field name="fixedAssetTypeId">
@@ -313,7 +327,8 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false" />
</field>
</form>
- <form name="EditRoutingTaskFixedAsset" type="single" title="" target="createRoutingTaskFixedAsset">
+ <form name="EditRoutingTaskFixedAsset" type="single" title="" target="createRoutingTaskFixedAsset"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="WorkEffortFixedAssetStd" default-field-type="edit" />
<field name="workEffortId"><hidden /></field>
<field name="fixedAssetTypeId">
@@ -325,4 +340,4 @@
<submit button-type="button" />
</field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskTabBar.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskTabBar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskTabBar.ftl Thu Jan 24 12:42:46 2008
@@ -17,15 +17,16 @@
under the License.
-->
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign selected = tabButtonItem?default("void")>
<#if routingTask?exists>
-<div class='tabContainer'>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.editRoutingTask?default(unselectedClassName)}">${uiLabelMap.ManufacturingEditRoutingTask}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.editRoutingTaskCosts?default(unselectedClassName)}">${uiLabelMap.ManufacturingRoutingTaskCosts}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.listRoutingTaskRoutings?default(unselectedClassName)}">${uiLabelMap.ManufacturingListRoutings}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.listRoutingTaskProducts?default(unselectedClassName)}">${uiLabelMap.ManufacturingListProducts}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.editRoutingTaskFixedAssets?default(unselectedClassName)}">${uiLabelMap.ManufacturingRoutingTaskFixedAssets}</a>
+<div class="button-bar tab-bar">
+ <ul>
+ <li<#if selected == "editRoutingTask"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingEditRoutingTask}</a></li>
+ <li<#if selected == "editRoutingTaskCosts"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingListRoutings}</a></li>
+ <li<#if selected == "listRoutingTaskProducts"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingListProducts}</a></li>
+ <li<#if selected == "editRoutingTaskFixedAssets"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingRoutingTaskFixedAssets}</a></li>
+ </ul>
+ <br class="clear"/>
</div>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Thu Jan 24 12:42:46 2008
@@ -52,7 +52,6 @@
<screen name="EditCalendar">
<section>
<actions>
- <set field="title" value="Edit a Calendar"/>
<set field="titleProperty" value="PageTitleEditCalendar"/>
<set field="tabButtonItem" value="calendar"/>
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
@@ -63,9 +62,13 @@
<widgets>
<decorator-screen name="CommonCalendarDecorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendar.ftl"/></html>
- </platform-specific>
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendar.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -74,7 +77,6 @@
<screen name="FindCalendar">
<section>
<actions>
- <set field="title" value="Find a Calendar"/>
<set field="titleProperty" value="PageTitleFindCalendar"/>
<set field="tabButtonItem" value="Calendar"/>
<set field="headerItem" value="calendar"/>
@@ -86,10 +88,23 @@
<widgets>
<decorator-screen name="CommonCalendarDecorator">
<decorator-section name="body">
- <container>
- <link style="buttontext" target="EditCalendar" text="${uiLabelMap.ManufacturingNewCalendar}"/>
- </container>
- <include-form name="ListTechDataCalendars" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindCalendar}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link style="buttontext" target="EditCalendar" text="${uiLabelMap.ManufacturingNewCalendar}"/>
+ </container>
+ <include-form name="ListTechDataCalendars" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -98,7 +113,6 @@
<screen name="ListCalendarWeek">
<section>
<actions>
- <set field="title" value="List Calendar Weeks"/>
<set field="titleProperty" value="PageTitleListCalendarWeek"/>
<set field="tabButtonItem" value="CalendarWeek"/>
<set field="headerItem" value="calendar"/>
@@ -110,10 +124,23 @@
<widgets>
<decorator-screen name="CommonCalendarDecorator">
<decorator-section name="body">
- <container>
- <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/>
- </container>
- <include-form name="ListCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListCalendarWeek}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/>
+ </container>
+ <include-form name="ListCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -122,7 +149,6 @@
<screen name="EditCalendarWeek">
<section>
<actions>
- <set field="title" value="Edit a Calendar Week"/>
<set field="titleProperty" value="PageTitleEditCalendarWeek"/>
<set field="tabButtonItem" value="CalendarWeek"/>
<set field="headerItem" value="calendar"/>
@@ -132,10 +158,23 @@
<widgets>
<decorator-screen name="CommonCalendarDecorator">
<decorator-section name="body">
- <container>
- <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/>
- </container>
- <include-form name="UpdateCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditCalendarWeek}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/>
+ </container>
+ <include-form name="UpdateCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -144,7 +183,6 @@
<screen name="EditCalendarExceptionWeek">
<section>
<actions>
- <set field="title" value="Edit a Calendar Exception Week"/>
<set field="titleProperty" value="PageTitleEditCalendarExceptionWeek"/>
<set field="tabButtonItem" value="calendarExceptionWeek"/>
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
@@ -154,10 +192,14 @@
</actions>
<widgets>
<decorator-screen name="CommonCalendarDecorator">
- <decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl"/></html>
- </platform-specific>
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -166,7 +208,6 @@
<screen name="EditCalendarExceptionDay">
<section>
<actions>
- <set field="title" value="Edit a Calendar Exception Day"/>
<set field="titleProperty" value="PageTitleEditCalendarExceptionDay"/>
<set field="tabButtonItem" value="calendarExceptionDay"/>
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
@@ -176,15 +217,17 @@
</actions>
<widgets>
<decorator-screen name="CommonCalendarDecorator">
- <decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl"/></html>
- </platform-specific>
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
-</screens>
-
+</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml Thu Jan 24 12:42:46 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -20,7 +20,8 @@
<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">
+ <form name="ListCostComponentCalc" type="list" title="" list-name="allCostComponentCalcs"
+ odd-row-style="alternate-row" 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"/>
@@ -37,7 +38,8 @@
<hyperlink target="removeCostComponentCalc?costComponentCalcId=${costComponentCalcId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
</field>
</form>
- <form name="EditCostComponentCalc" type="single" target="updateCostComponentCalc" title="" default-map-name="costComponentCalc">
+ <form name="EditCostComponentCalc" type="single" target="updateCostComponentCalc" title="" default-map-name="costComponentCalc"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="costComponentCalc==null" target="createCostComponentCalc"/>
<auto-fields-entity entity-name="CostComponentCalc" default-field-type="edit"/>
<field name="costComponentCalcId"><display/></field>
@@ -62,4 +64,4 @@
<submit button-type="button"/>
</field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml Thu Jan 24 12:42:46 2008
@@ -23,7 +23,6 @@
<screen name="EditCostCalcs">
<section>
<actions>
- <set field="title" value="Edit cost component calc information"/>
<set field="titleProperty" value="PageTitleEditCostCalcs"/>
<set field="headerItem" value="costs"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
@@ -39,18 +38,37 @@
<container>
<label style="head1">${uiLabelMap.ManufacturingManageCostComponentCalc}</label>
</container>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingListCostComponentCalc}</label>
- </container>
- <include-form name="ListCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingEditCostComponentCalc}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
- <include-form name="EditCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
-
+</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Thu Jan 24 12:42:46 2008
@@ -39,7 +39,7 @@
<html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl"/></html>
</platform-specific>
<container>
- <label style="head1">[${uiLabelMap.CommonId}:${productionRunId}]</label>
+ <label style="head1">[${uiLabelMap.CommonId} ${productionRunId}]</label>
</container>
<container>
<link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext"/>
@@ -58,17 +58,26 @@
<screen name="CreateProductionRun">
<section>
<actions>
- <set field="title" value="Create a Production Run"/>
<set field="titleProperty" value="ManufacturingCreateProductionRun"/>
<set field="headerItem" value="jobshop"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head1" text="${uiLabelMap.ManufacturingCreateProductionRun}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingCreateProductionRun}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="CreateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"></include-form>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="CreateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"></include-form>
</decorator-section>
</decorator-screen>
</widgets>
@@ -77,7 +86,6 @@
<screen name="EditProductionRun">
<section>
<actions>
- <set field="title" value="Edit a Production Run"/>
<set field="titleProperty" value="ManufacturingEditProductionRun"/>
<set field="tabButtonItem" value="edit"/>
<set field="headerItem" value="jobshop"/>
@@ -96,29 +104,79 @@
<link target="quickChangeProductionRunStatus?productionRunId=${productionRunId}&statusId=PRUN_CLOSED" text="${uiLabelMap.ManufacturingQuickClose}" style="buttontext"/>
<link target="cancelProductionRun?productionRunId=${productionRunId}" text="${uiLabelMap.ManufacturingCancel}" style="buttontext"/>
</container>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingProductionRunId}: ${productionRunId}</label>
- </container>
- <include-form name="UpdateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html>
- </platform-specific>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingOrderItems}</label>
- </container>
- <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}</label>
- </container>
- <include-form name="ViewListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingMaterials}</label>
- </container>
- <include-form name="ListProductionRunComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}</label>
- </container>
- <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="UpdateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingOrderItems}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingMaterials}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListProductionRunComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -127,7 +185,6 @@
<screen name="ProductionRunDeclaration">
<section>
<actions>
- <set field="title" value="Declare a Production Run"/>
<set field="titleProperty" value="ManufacturingProductionRunDeclaration"/>
<set field="tabButtonItem" value="declaration"/>
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
@@ -166,48 +223,157 @@
</widgets>
</section>
</container>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingProductionRunId}: ${productionRunId}</label>
- </container>
- <include-form name="ShowProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ShowProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<section>
<condition>
<if-compare field-name="canProduce" operator="equals" value="Y"/>
</condition>
<widgets>
- <include-form name="ProductionRunProduce" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingProductionRunProduce}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ProductionRunProduce" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
</section>
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html>
- </platform-specific>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingInventoryItemsProduced}</label>
- </container>
- <include-form name="ListProductionRunInventoryItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingOrderItems}</label>
- </container>
- <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}</label>
- </container>
- <include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl"/></html>
- </platform-specific>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingMaterialsRequiredByRunningTask}</label>
- </container>
- <include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingReturnMaterials}</label>
- </container>
- <include-form name="ListReturnProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingAssociatedProductionRuns}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingInventoryItemsProduced}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListProductionRunInventoryItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingOrderItems}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingProductionRunDeclaration}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingMaterialsRequiredByRunningTask}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingReturnMaterials}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListReturnProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -233,7 +399,6 @@
<screen name="ProductionRunAssocs">
<section>
<actions>
- <set field="title" value="Production Run Assocs"/>
<set field="titleProperty" value="ManufacturingProductionRunAssocs"/>
<set field="tabButtonItem" value="assocs"/>
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
@@ -261,14 +426,34 @@
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
- <container>
- <label style="head2">${uiLabelMap.ManufacturingMandatoryWorkEfforts}</label>
- </container>
- <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.ManufacturingDependentWorkEfforts}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingDependentWorkEfforts}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -277,7 +462,6 @@
<screen name="ProductionRunTasks">
<section>
<actions>
- <set field="title" value="Production Run Components"/>
<set field="titleProperty" value="ManufacturingProductionRunTasks"/>
<set field="tabButtonItem" value="tasks"/>
<set field="headerItem" value="jobshop"/>
@@ -297,11 +481,34 @@
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
- <container>
- <label style="head2">${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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="head4">
+ <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>
- <include-form name="EditProductionRunRoutingTask" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <include-form name="ListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -310,7 +517,6 @@
<screen name="ProductionRunComponents">
<section>
<actions>
- <set field="title" value="Production Run Components"/>
<set field="titleProperty" value="ManufacturingProductionRunComponents"/>
<set field="tabButtonItem" value="components"/>
<set field="headerItem" value="jobshop"/>
@@ -326,13 +532,27 @@
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
- <container>
- <label style="head2">${uiLabelMap.ManufacturingTaskComponents}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingProductionRunComponents}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="AddProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
- </platform-specific>
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -341,7 +561,6 @@
<screen name="ProductionRunActualComponents">
<section>
<actions>
- <set field="title" value="Production Run Actual Components"/>
<set field="titleProperty" value="ManufacturingProductionRunActualComponents"/>
<set field="tabButtonItem" value="actualComponents"/>
<set field="headerItem" value="jobshop"/>
@@ -357,10 +576,20 @@
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
- <container>
- <label style="head2">${uiLabelMap.ManufacturingActualMaterials}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingActualMaterials}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="IssueProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="IssueProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
<platform-specific>
<html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
</platform-specific>
@@ -372,7 +601,6 @@
<screen name="ProductionRunFixedAssets">
<section>
<actions>
- <set field="title" value="Production Run Fixed Assets"/>
<set field="titleProperty" value="ManufacturingProductionRunFixedAssets"/>
<set field="tabButtonItem" value="fixedAssets"/>
<set field="headerItem" value="jobshop"/>
@@ -388,13 +616,27 @@
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
- <container>
- <label style="head2">${uiLabelMap.ManufacturingTaskFixedAssets}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingTaskFixedAssets}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddProductionRunTaskFixedAsset" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="AddProductionRunTaskFixedAsset" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
- </platform-specific>
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -403,7 +645,6 @@
<screen name="ProductionRunCosts">
<section>
<actions>
- <set field="title" value="Production Run Actual Costs"/>
<set field="titleProperty" value="ManufacturingProductionRunCosts"/>
<set field="tabButtonItem" value="costs"/>
<set field="headerItem" value="jobshop"/>
@@ -417,12 +658,13 @@
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
- <container>
- <label style="head2">${uiLabelMap.ManufacturingActualCosts}</label>
- </container>
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl"/></html>
- </platform-specific>
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -431,24 +673,45 @@
<screen name="FindProductionRun">
<section>
<actions>
- <set field="title" value="Find Production Runs"/>
<set field="titleProperty" value="ManufacturingFindProductionRun"/>
<set field="headerItem" value="jobshop"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
-
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.ManufacturingFindProductionRun}</label>
- </container>
- <container>
- <link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingFindProductionRun}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext"/>
+ </container>
+ <include-form name="findProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingFindProductionRun}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="listFindProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="findProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
- <include-form name="listFindProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -457,7 +720,6 @@
<screen name="WorkWithShipmentPlans">
<section>
<actions>
- <set field="title" value="Work With Shipment Plans"/>
<set field="titleProperty" value="ManufacturingWorkWithShipmentPlans"/>
<set field="headerItem" value="ShipmentPlans"/>
@@ -474,5 +736,4 @@
</widgets>
</section>
</screen>
-</screens>
-
+</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Thu Jan 24 12:42:46 2008
@@ -52,7 +52,6 @@
<screen name="MrpExecution">
<section>
<actions>
- <set field="title" value="Run MRP"/>
<set field="titleProperty" value="ManufacturingRunMrp"/>
<set field="tabButtonItem" value="RunMrp"/>
<set field="headerItem" value="mrp"/>
@@ -60,11 +59,19 @@
<widgets>
<decorator-screen name="CommonMrpDecorator">
<decorator-section name="body">
- <container>
- <label style="head1" text="${uiLabelMap.ManufacturingRunMrp}"/>
- </container>
- <container>
- <include-form name="RunMrp" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingRunMrp}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="RunMrp" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
</decorator-section>
</decorator-screen>
@@ -74,7 +81,6 @@
<screen name="FindMrpPlannedEvents">
<section>
<actions>
- <set field="title" value="MRP Planned Events"/>
<set field="titleProperty" value="PageTitleFindInventoryEventPlan"/>
<set field="tabButtonItem" value="findInventoryEventPlan"/>
<set field="headerItem" value="mrp"/>
@@ -117,10 +123,34 @@
<widgets>
<decorator-screen name="CommonMrpDecorator">
<decorator-section name="body">
- <label style="head2">${uiLabelMap.ManufacturingMrpJobLastExecuted}</label>
- <include-form name="ListFinishedMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/>
- <label style="head2">${uiLabelMap.ManufacturingMrpJobScheduledOrRunning}</label>
- <include-form name="ListRunningMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingMrpJobLastExecuted}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListFinishedMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ManufacturingMrpJobScheduledOrRunning}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListRunningMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<section>
<condition>
<if-empty field-name="mrpRunningJobs"/>
@@ -139,5 +169,4 @@
</widgets>
</section>
</screen>
-</screens>
-
+</screens>
\ No newline at end of file