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 [1/3] - in /ofbiz/trunk/applications/manufacturing:
config/ webapp/manufacturing/jobshopmgt/ webapp/manufacturing/mrp/
webapp/manufacturing/routing/ widget/manufacturing/
Author: mrisaliti
Date: Thu Jan 24 12:42:46 2008
New Revision: 614984
URL: http://svn.apache.org/viewvc?rev=614984&view=rev
Log:
Calendar/Cost/Jobshop/Mrp/Report/Routing forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1593)
Modified:
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpTabBar.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTabBar.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskTabBar.ftl
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.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/MrpScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties Thu Jan 24 12:42:46 2008
@@ -25,6 +25,7 @@
ManufacturingAddProductionRunProductComponent=Add ProductComponent to ProductionRun
ManufacturingAddRoutingTask=Add a RoutingTask
ManufacturingAnyMachineGroup=Any Fixed Asset Group
+ManufacturingAssociatedProductionRuns=Associated Production Runs
ManufacturingATPDate=ATP Date
ManufacturingBillOfMaterials=Bill Of Materials
ManufacturingActualStartDateTime=Actual Start Date/Time
@@ -155,10 +156,13 @@
ManufacturingProductTableNotExist=The product Table does not exist
ManufacturingProductHasNoBom=Product has no Bill of material
ManufacturingProductionRun=Production Run
+ManufacturingProductionRunActualComponents=Production Run Actual Components
ManufacturingProductionRunAssocs=Assocs
+ManufacturingProductionRunComponents=Production Run Components
ManufacturingProductionRunCosts=Production Run Costs
ManufacturingProductionRunCreated=ProductionRun ${productionRunId} created
ManufacturingProductionRunDeclaration=Production Run Declaration
+ManufacturingProductionRunFixedAssets=Production Run Fixed Assets
ManufacturingProductionRunFixedAssetAssign=Fixed Asset Assign
ManufacturingProductionRunFixedAssetIdMissing=Fixed Asset Id is missing
ManufacturingProductionRunId=Production Run ID
@@ -170,6 +174,7 @@
ManufacturingProductionRunStartDateMissing=Production Run Start Date is missing
ManufacturingProductionRunStartDateNotCorrect=the Start Date field is incorrect, format must be AAAA-mm-jj HH:mm:ss
ManufacturingProductionRunStatusChanged=Production Run status changed successfully.
+ManufacturingProductionRunTasks=Production Run Tasks
ManufacturingProductId=Product ID
ManufacturingProductIdTo=Product ID To
ManufacturingProductNotExist=Product does not exist
@@ -276,6 +281,7 @@
ManufacturingCopyToProductId=To Product Id
ManufacturingWillBeSetToNow=Will be set to now if empty
+PageTitleAddCalendarExceptionWeek=Add Calendar Exception Week
PageTitleEditCalendar=Edit Calendar
PageTitleEditCalendarExceptionDay=Edit Calendar Exception Day
PageTitleEditCalendarExceptionWeek=Edit Calendar Exception Week
@@ -300,7 +306,9 @@
PageTitleFindRouting=Find Routing
PageTitleFindRoutingTask=Find - Edit Routing Task
PageTitleListCalendarWeek=List of weeks
+PageTitleListRoutingTaskAssoc=List Routing Task Assoc
PageTitleListRoutingTaskProducts=Edit Routing Task Products
+PageTitleListRoutingProductLink=List Routing Product Link
PageTitleListRoutingTaskRoutings=Edit Routing Task Routings
PageTitleLogin=Login
PageTitleLookupProduct=Product Lookup
@@ -382,4 +390,8 @@
FormFieldTitle_startDateTime=Start Date Time
FormFieldTitle_finishDateTime=Finish Date Time
FormFieldTitle_cancelDateTime=Cancel Date Time
-
+FormFieldTitle_allocatedCost=Allocated Cost
+FormFieldTitle_secondaryLocationSeqId=Secondary Location Seq Id
+FormFieldTitle_manufacturingTask=Manufacturing Task
+FormFieldTitle_failIfItemsAreNotAvailable=Fail If Items Are Not Available
+FormFieldTitle_calendarWeekId=Calendar Week Id
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties Thu Jan 24 12:42:46 2008
@@ -25,6 +25,7 @@
ManufacturingAddProductionRunProductComponent=Aggiungi Componente Prodotto ad un\u00b4Ordine di Produzione
ManufacturingAddRoutingTask=Aggiungi una Operazione
ManufacturingAnyMachineGroup=Qualsiasi Gruppo Macchina
+ManufacturingAssociatedProductionRuns=Ordini di Produzione Associati
ManufacturingATPDate=Data ATP
ManufacturingBillOfMaterials=Distinta Base
ManufacturingActualStartDateTime=Data/Ora Inizio Attuale
@@ -37,7 +38,7 @@
ManufacturingCalendarExceptionDayIdAlreadyExist=Codice Capacit\u00e0 Calendario Produzione gi\u00e0 esistente
ManufacturingCalendarExceptionDayUseCalendar=C'\u00e8 un giorno speciale per questo calendario
ManufacturingCalendarExceptionWeek=Settimana Speciale
-ManufacturingCalendarExceptionWeekIdAlreadyExist=Codice Calendario Settimana Produzione Speciale \u00e8 gia esistente
+ManufacturingCalendarExceptionWeekIdAlreadyExist=Codice Calendario Settimanale Produzione Speciale \u00e8 gia esistente
ManufacturingCalendarExceptionWeekUseCalendar=Non c'\u00e8 una settimanale speciale per questo calendario
ManufacturingCalendarIdAlreadyExist=Codice Calendario gi\u00e0 esistente
ManufacturingCalendarId=Codice Calendario
@@ -47,8 +48,8 @@
ManufacturingCalendarWeekIdAlreadyExist=Codice Calendario Settimanale gi\u00e0 esistente
ManufacturingCalendarWeekId=Codice Calendario Settimanale
ManufacturingCalendarWeekIdNotExisting=Codice Calendario Settimanale non esiste
-ManufacturingCalendarWeek=Settimana
-ManufacturingCalendarWeeks=Settimane
+ManufacturingCalendarWeek=Calendario Settimanale
+ManufacturingCalendarWeeks=Calendari Settimanali
ManufacturingCostCalcs=Costi
ManufacturingManageCostComponentCalc=Gestione Costi Componenti Voci Calcolo
ManufacturingListCostComponentCalc=Lista Costi Componenti Voci Calcolo
@@ -57,7 +58,7 @@
ManufacturingCompanySubtitle=Part of the Open For Business Family of Open Source Software
ManufacturingCopyAndAddRoutingTask=Copia e aggiungi una Operazione
ManufacturingCreateCalendar=Creare calendario
-ManufacturingCreateCalendarWeek=Creare Calendario Settimana
+ManufacturingCreateCalendarWeek=Creare Calendario Settimanale
ManufacturingCreateMachineGroup=Creare un gruppo Macchine
ManufacturingCreatePermissionError=Errore Sicurezza: per eseguire questa operazione tu devi avere i permessi MANUFACTURING_CREATE o MANUFACTURING_ADMIN
ManufacturingCreateProductionRun=Creare un Ordine di Produzione
@@ -68,7 +69,7 @@
ManufacturingDependentWorkEfforts=Dipendenza Ordine di Produzione
ManufacturingEditCalendarExceptionDayFor=Aggiorna Calendario giorni speciali per
ManufacturingEditCalendarExceptionWeekFor=Aggiorna Calendario settimane speciali per
-ManufacturingEditCalendarWeek=Aggiorna Settimana
+ManufacturingEditCalendarWeek=Aggiorna Calendario Settimanale
ManufacturingEditMachine=Aggiorna Macchine
ManufacturingEditMachineGroup=Aggiorna Gruppo Macchine
ManufacturingEditProductBom=Aggiorna Distinta Base
@@ -105,9 +106,9 @@
ManufacturingJobShop=Ordine di Produzione
ManufacturingListCalendarWeek=Lista delle settimane
ManufacturingListingBomError=Errore durante la lista delle Distinte Base
-ManufacturingListOfProductionRunComponents=Lista dei Componenti del Ordine di Produzione
+ManufacturingListOfProductionRunComponents=Lista dei Componenti dell\'Ordine di Produzione
ManufacturingListOfProductionRunFixedAssets=Lista dei Cespiti Ordine di Produzione
-ManufacturingListOfProductionRunRoutingTasks=Lista delle Operazioni del Ordine di Produzione
+ManufacturingListOfProductionRunRoutingTasks=Lista delle Operazioni dell\'Ordine di Produzione
ManufacturingListProducts=Prodotti Consegnabili
ManufacturingListRoutings=Lista Cicli
ManufacturingMachineGroupIdAlreadyExist=Codice Gruppo Macchine non esiste
@@ -125,6 +126,7 @@
ManufacturingManufacturingRules=Regole Produzione
ManufacturingMaterials=Materiali
ManufacturingMaterialsNotAvailable=Materiali Non Disponibili a Magazzino
+ManufacturingMaterialsRequiredByRunningTask=Materiali Richiesti dall'Operazione in Esecuzione
ManufacturingMrp=MRP
ManufacturingMrpJobLastExecuted=Ultimo Lavoro
ManufacturingMrpJobIsRunning=Un Lavoro MRP \u00e8 in esecuzione
@@ -154,10 +156,13 @@
ManufacturingProductTableNotExist=La tabella prodotti non esiste
ManufacturingProductHasNoBom=Prodotto non ha Distinta Base
ManufacturingProductionRun=Ordine di Produzione
+ManufacturingProductionRunActualComponents=Componenti Attuali Ordine di Produzione
ManufacturingProductionRunAssocs=Associazioni
+ManufacturingProductionRunComponents=Compomenti Ordine di Produzione
ManufacturingProductionRunCosts=Costi Ordine di Produzione
ManufacturingProductionRunCreated=Ordine di Produzione ${productionRunId} creata
ManufacturingProductionRunDeclaration=Dichiarazione Ordine di Produzione
+ManufacturingProductionRunFixedAssets=Cespite Ordine di Produzione
ManufacturingProductionRunFixedAssetAssign=Assegna Cespite
ManufacturingProductionRunFixedAssetIdMissing=Cespite \u00e8 mancante
ManufacturingProductionRunId=Codice Ordine di Produzione
@@ -169,6 +174,7 @@
ManufacturingProductionRunStartDateMissing=Ordine di Produzione Data Inizio \u00e8 Mancante
ManufacturingProductionRunStartDateNotCorrect=il campo Data Inizio non \u00e8 corretto, il formato deve essere AAAA-mm-jj HH:mm:ss
ManufacturingProductionRunStatusChanged=Stato Ordine di Produzione cambiato con successo.
+ManufacturingProductionRunTasks=Operazione Ordine di Produzione
ManufacturingProductId=Codice Prodotto
ManufacturingProductIdTo=Codice Prodotto A
ManufacturingProductNotExist=Prodotto inesistente
@@ -182,6 +188,7 @@
ManufacturingQuickRunTask=Esecuzione Veloce Operazione
ManufacturingReason=Ragione
ManufacturingReturnedQuantity=Quantit\u00e0 Resa
+ManufacturingReturnMaterials=Materiali Non Usati Resi al Magazzino
ManufacturingReports=Stampe
ManufacturingRouting=Ciclo
ManufacturingRoutings=Cicli
@@ -206,8 +213,11 @@
ManufacturingStartDate=Data Inizio
ManufacturingStartTime=Ora Inizio
ManufacturingSummarizedPartBreakdown=Esplosione Scalare Sommarizzata
+ManufacturingTaskComponents=Componenti Operazione
ManufacturingTaskEstimatedMilliSeconds=Tempo Stimato Esecuzione
ManufacturingTaskEstimatedSetupMillis=Tempo Stimato Configurazione
+ManufacturingTaskEstimatedTotalMilliSeconds=Totale Tempo Stimato Esecuazione
+ManufacturingTaskFixedAssets=Cespite Operazione
ManufacturingTaskId=Codice Operazione
ManufacturingTaskName=Nome Operazione
ManufacturingTaskPurpose=Tipo Operazione
@@ -219,7 +229,7 @@
ManufacturingMrpName=Nome Mrp
ManufacturingTwoRoutingTaskWithSameSeqId=Due Operazioni con stesso Codice Seq e stesso periodo
ManufacturingUpdateCalendar=Aggiorna Calendario
-ManufacturingUpdateCalendarWeek=Aggiorna Settimana
+ManufacturingUpdateCalendarWeek=Aggiorna Calendario Settimanale
ManufacturingUpdateMachineGroup=Aggiorna Gruppo Macchine
ManufacturingUpdatePermissionError=Errore Sicurezza: per eseguire questa operazione tu devi avere i permessi MANUFACTURING_UPDATE o MANUFACTURING_ADMIN
ManufacturingViewPermissionError=Tu non sei autorizzato a vedere questa pagina. (permesso "MANUFACTURING_VIEW" o "MANUFACTURING_ADMIN" necessario)
@@ -270,10 +280,11 @@
ManufacturingCopyToProductId=Al Codice Prodotto
ManufacturingWillBeSetToNow=Verr\u00e0 impostato ad oggi se vuoto
+PageTitleAddCalendarExceptionWeek=Aggiungi Eccezione Calendario Settimanale
PageTitleEditCalendar=Aggiorna Calendario
PageTitleEditCalendarExceptionDay=Aggiorna Giorno Calendario Speciale
-PageTitleEditCalendarExceptionWeek=Aggiorna Calendario Speciale Settimana
-PageTitleEditCalendarWeek=Aggiorna Settimana
+PageTitleEditCalendarExceptionWeek=Aggiorna Calendario Speciale Settimanale
+PageTitleEditCalendarWeek=Aggiorna Calendario Settimanale
PageTitleEditCostCalcs=Aggiorna Calcoli Costo
PageTitleEditMachine=Aggiorna Macchine
PageTitleEditMachineGroup=Aggiorna Gruppo Macchine
@@ -294,7 +305,9 @@
PageTitleFindRouting=Ricerca Ciclo
PageTitleFindRoutingTask=Ricerca - Aggiorna Operazione
PageTitleListCalendarWeek=Lista delle settimane
+PageTitleListRoutingTaskAssoc=Lista Associazioni Operazioni
PageTitleListRoutingTaskProducts=Aggiorna Operazione Prodotti
+PageTitleListRoutingProductLink=Lista Link Prodotti Operazioni
PageTitleListRoutingTaskRoutings=Aggiorna Cicli Associati all'Operazione
PageTitleLogin=Login
PageTitleLookupProduct=Ricerca Prodotto
@@ -376,4 +389,8 @@
FormFieldTitle_startDateTime=Data/Ora di Inizio
FormFieldTitle_finishDateTime=Data/Ora di Termine
FormFieldTitle_cancelDateTime=Data/Ora di Cancellazione
-
+FormFieldTitle_allocatedCost=Costo Allocato
+FormFieldTitle_secondaryLocationSeqId=Locazione Secondaria
+FormFieldTitle_manufacturingTask=Operazione
+FormFieldTitle_failIfItemsAreNotAvailable=Fallisce se i Prodotti Non Sono Disponibili
+FormFieldTitle_calendarWeekId=Calendario Settmanale
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl Thu Jan 24 12:42:46 2008
@@ -18,12 +18,11 @@
-->
<#if mrpName?exists>
- <h1>${uiLabelMap.ManufacturingMrpName}: ${mrpName?if_exists}</h1>
+ <h1>${uiLabelMap.ManufacturingMrpName} ${mrpName?if_exists}</h1>
<#--
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">[${uiLabelMap.ManufacturingMRPPRunsProductsByFeature}]</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">[${uiLabelMap.ManufacturingPRunsComponentsByFeature}]</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">[${uiLabelMap.ManufacturingPRunsComponentsByFeature1}]</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">[${uiLabelMap.ManufacturingPRunsProductsStacks}]</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingMRPPRunsProductsByFeature}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsComponentsByFeature}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsComponentsByFeature1}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsProductsStacks}</a></div>
-->
-</#if>
-
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl Thu Jan 24 12:42:46 2008
@@ -17,11 +17,14 @@
under the License.
-->
-<br/>
<#list taskCosts as taskCost>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
<#assign task = taskCost.task>
<#assign costsForm = taskCost.costsForm>
- <h2>${task.workEffortName?if_exists} [${task.workEffortId}]</h2>
+ <h3>${uiLabelMap.ManufacturingActualCosts} ${task.workEffortName?if_exists} [${task.workEffortId}]</h3>
${costsForm.renderFormString(context)}
- <br/>
-</#list>
+ </div>
+ <div class="screenlet-body">
+</div>
+</#list>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl Thu Jan 24 12:42:46 2008
@@ -18,7 +18,7 @@
-->
<#if routingTaskId?has_content || actionForm=="AddRoutingTask">
- <table border="0" cellspacing="0" cellpadding="0" class="boxoutside">
+ <table class="basic-table" cellspacing="0">
<tr>
<td>
${editPrRoutingTaskWrapper.renderFormString(context)}
@@ -32,6 +32,4 @@
</tr>
</table>
</#if>
-<br/>
-
-
\ No newline at end of file
+ <br/>
\ No newline at end of file
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=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.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="CreateProductionRun" target="createProductionRun" title="" type="single">
+ <form name="CreateProductionRun" target="createProductionRun" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" size="16"/></field>
<field name="quantity" title="${uiLabelMap.ManufacturingQuantity}"><text size="6"/></field>
<field name="startDate" title="${uiLabelMap.ManufacturingStartDate}"><date-time/></field>
@@ -38,7 +39,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="findProductionRun" target="FindProductionRun" title="" type="single">
+ <form name="findProductionRun" target="FindProductionRun" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="workEffortTypeId"><hidden value="PROD_ORDER_HEADER"/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingProductionRunId}"><text-find/></field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
@@ -61,7 +63,8 @@
<field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
</form>
- <form name="listFindProductionRun" list-name="listIt" title="" type="list" paginate-target="/FindProductionRun">
+ <form name="listFindProductionRun" list-name="listIt" title="" type="list" paginate-target="/FindProductionRun"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="requestParameters"/>
@@ -83,7 +86,8 @@
<field name="facilityId" title="${uiLabelMap.ProductFacilityId}"><display/></field>
</form>
- <form name="UpdateProductionRun" type="single" target="updateProductionRun" title="" default-map-name="productionRunData">
+ <form name="UpdateProductionRun" type="single" target="updateProductionRun" title="" default-map-name="productionRunData"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="productionRunId"><hidden/></field>
<field name="productId" title="${uiLabelMap.ProductProductName}">
<display-entity entity-name="Product" description="${internalName} [${productId}]"/>
@@ -105,7 +109,8 @@
<field name="description"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
- <form name="ListProductionRunOrderItems" type="list" target="EditProductionRun" title="" list-name="orderItems">
+ <form name="ListProductionRunOrderItems" type="list" target="EditProductionRun" title="" list-name="orderItems"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="orderId" widget-style="buttontext">
<hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}/${orderItemSeqId}" also-hidden="false" target-type="inter-app"/>
</field>
@@ -120,13 +125,15 @@
<field name="estimatedDeliveryDate"><display/></field>
-->
</form>
- <form name="ListProductionRunInventoryItems" type="list" title="" list-name="inventoryItems">
+ <form name="ListProductionRunInventoryItems" type="list" title="" list-name="inventoryItems"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="inventoryItemId" widget-style="buttontext">
<hyperlink target="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"/>
</field>
</form>
- <form name="ViewListProductionRunRoutingTasks" type="list" title="" list-name="productionRunRoutingTasks">
+ <form name="ViewListProductionRunRoutingTasks" type="list" title="" list-name="productionRunRoutingTasks"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<set field="estimatedTotalMilliSeconds" value="${bsh:estimatedMilliSeconds * quantity}" type="Double"/>
</row-actions>
@@ -139,7 +146,8 @@
<!--<field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}" ><display/></field>-->
<field name="estimatedTotalMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedTotalMilliSeconds}" ><display/></field>
</form>
- <form name="ListProductionRunRoutingTasks" type="list" target="ProductionRunTasks" title="" list-name="productionRunRoutingTasks">
+ <form name="ListProductionRunRoutingTasks" type="list" target="ProductionRunTasks" title="" list-name="productionRunRoutingTasks"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<set field="estimatedTotalMilliSeconds" value="${bsh:estimatedMilliSeconds * quantity}" type="Double"/>
</row-actions>
@@ -160,7 +168,8 @@
</field>
</form>
- <form name="ListProductionRunComponents" type="list" target="EditProductionRun" title="" list-name="productionRunComponents">
+ <form name="ListProductionRunComponents" type="list" target="EditProductionRun" title="" list-name="productionRunComponents"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTaskId}">
<display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]"/>
</field>
@@ -170,7 +179,8 @@
<field name="estimatedQuantity" title="${uiLabelMap.ManufacturingQuantity}"><display/></field>
</form>
- <form name="EditProductionRunRoutingTask" type="single" target="updateProductionRunRoutingTask" title="" default-map-name="productionRunTask">
+ <form name="EditProductionRunRoutingTask" type="single" target="updateProductionRunRoutingTask" title="" default-map-name="productionRunTask"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="productionRunTask==null" target="addProductionRunRoutingTask"/>
<field name="productionRunId">
<hidden value="${productionRunId}"/>
@@ -208,7 +218,8 @@
</form>
<!-- Production Run Declaration -->
- <form name="ShowProductionRun" type="single" target="productionRunProduce" title="" default-map-name="productionRunData">
+ <form name="ShowProductionRun" type="single" target="productionRunProduce" title="" default-map-name="productionRunData"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="workEffortId"><hidden/></field>
<field name="productId" title="${uiLabelMap.ProductProductName}">
<display-entity entity-name="Product" description="${internalName} [${productId}]"/>
@@ -228,7 +239,8 @@
<field name="quantityProduced" title="${uiLabelMap.ManufacturingQuantityProduced}"><display/></field>
<field name="quantityRejected" title="${uiLabelMap.ManufacturingQuantityRejected}"><display/></field>
</form>
- <form name="ProductionRunProduce" type="single" target="productionRunProduce" title="" default-map-name="productionRunData">
+ <form name="ProductionRunProduce" type="single" target="productionRunProduce" title="" default-map-name="productionRunData"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="workEffortId"><hidden/></field>
<field name="quantity" title="${uiLabelMap.ManufacturingProduceQuantity}"><text/></field>
<field name="inventoryItemTypeId">
@@ -241,7 +253,8 @@
</field>
</form>
- <form name="ListProductionRunDeclRoutingTasks" type="list" target="ProductionRunDeclaration" title="" list-name="productionRunRoutingTasks">
+ <form name="ListProductionRunDeclRoutingTasks" type="list" target="ProductionRunDeclaration" title="" list-name="productionRunRoutingTasks"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="actionForm"><hidden value="EditRoutingTask"/></field>
<field name="productionRunId"><hidden value="${workEffortParentId}"/></field>
<field name="routingTaskId"><hidden value="${workEffortId}"/></field>
@@ -268,7 +281,8 @@
<hyperlink target="changeProductionRunTaskStatus?workEffortId=${workEffortId}&productionRunId=${workEffortParentId}" description="${uiLabelMap.ManufacturingCompleteProductionRunTask}" also-hidden="false"/>
</field>
</form>
- <form name="ListIssueProductionRunDeclComponents" type="multi" target="issueProductionRunTaskComponents?productionRunId=${productionRunId}" title="" list-name="productionRunComponentsDataReadyForIssuance">
+ <form name="ListIssueProductionRunDeclComponents" type="multi" target="issueProductionRunTaskComponents?productionRunId=${productionRunId}" title="" list-name="productionRunComponentsDataReadyForIssuance"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="productId"><hidden/></field>
<field name="productionRunId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
@@ -300,7 +314,8 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit/></field>
</form>
- <form name="ListReturnProductionRunDeclComponents" type="multi" use-row-submit="true" target="productionRunTaskReturnMaterials?productionRunId=${productionRunId}" title="" list-name="productionRunComponentsAlreadyIssued">
+ <form name="ListReturnProductionRunDeclComponents" type="multi" use-row-submit="true" target="productionRunTaskReturnMaterials?productionRunId=${productionRunId}" title="" list-name="productionRunComponentsAlreadyIssued"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="productId"><hidden/></field>
<field name="productionRunId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
@@ -319,7 +334,8 @@
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit/></field>
</form>
- <form name="EditProductionRunDeclRoutingTask" type="single" target="updateProductionRunTask" title="" default-map-name="routingTaskData">
+ <form name="EditProductionRunDeclRoutingTask" type="single" target="updateProductionRunTask" title="" default-map-name="routingTaskData"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="actionForm">
<hidden value="${actionForm}"/>
</field>
@@ -391,7 +407,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="CreateRoutingTaskDelivProduct" type="single" target="createProductionRunTaskProduct" title="" default-map-name="formData">
+ <form name="CreateRoutingTaskDelivProduct" type="single" target="createProductionRunTaskProduct" title="" default-map-name="formData"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="productionRunId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="productId" title="${uiLabelMap.ProductProductId}" use-when="${bsh:delivProducts.size()>0}">
@@ -407,12 +424,14 @@
<submit button-type="button"/>
</field>
</form>
- <form name="ProductionRunTaskInventoryProducedList" type="list" title="" list-name="prunInventoryProduced">
+ <form name="ProductionRunTaskInventoryProducedList" type="list" title="" list-name="prunInventoryProduced"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="inventoryItemId" title="${uiLabelMap.FacilityInventoryItem}" widget-style="buttontext">
<hyperlink target="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"/>
</field>
</form>
- <form name="ProductionRunTaskFixedAssets" type="list" target="updateWorkEffortFixedAssetAssign" paginate-target="" title="" list-name="records">
+ <form name="ProductionRunTaskFixedAssets" type="list" target="updateWorkEffortFixedAssetAssign" paginate-target="" title="" list-name="records"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="WorkEffortFixedAssetAssign" default-field-type="edit" />
<field name="productionRunId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
@@ -428,7 +447,8 @@
target="removeWorkEffortFixedAssetAssign?workEffortId=${workEffortId}&fixedAssetId=${fixedAssetId}&fromDate=${fromDate}&productionRunId=${productionRunId}" />
</field>
</form>
- <form name="ListProductionRunTaskFixedAssets" type="list" title="" list-name="productionRunFixedAssetsData">
+ <form name="ListProductionRunTaskFixedAssets" type="list" title="" list-name="productionRunFixedAssetsData"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="WorkEffortFixedAssetAssign" default-field-type="display" />
<field name="workEffortId">
<display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]" />
@@ -440,7 +460,8 @@
<display-entity entity-name="StatusItem" />
</field>
</form>
- <form name="EditProductionRunTaskFixedAsset" type="single" target="EditProductionRun" title="" default-map-name="fixedAssetData">
+ <form name="EditProductionRunTaskFixedAsset" type="single" target="EditProductionRun" title="" default-map-name="fixedAssetData"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="declarationScreen.equals("Y")" target="ProductionRunDeclaration" />
<auto-fields-entity entity-name="WorkEffortFixedAssetAssign" />
<field name="actionForm"><hidden value="${actionForm}" /></field>
@@ -480,7 +501,8 @@
<submit button-type="button" />
</field>
</form>
- <form name="AddProductionRunTaskFixedAsset" type="single" target="createWorkEffortFixedAssetAssign" title="">
+ <form name="AddProductionRunTaskFixedAsset" type="single" target="createWorkEffortFixedAssetAssign" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createWorkEffortFixedAssetAssign" />
<field name="productionRunId"><hidden /></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTask}">
@@ -514,7 +536,8 @@
<!-- Shipment Plan Forms -->
<!-- ******************* -->
<!-- List for Shipment Plan -->
- <form name="listShipmentPlan" type="list" target="" title="" list-name="shipmentPlan">
+ <form name="listShipmentPlan" type="list" target="" title="" list-name="shipmentPlan"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="orderId" title="${uiLabelMap.ProductOrderId}"><display/></field>
<field name="orderItemSeqId" title="${uiLabelMap.ProductOrderItem}"><display/></field>
<field name="productId" title="${uiLabelMap.ProductProductId}"><display/></field>
@@ -533,7 +556,8 @@
<field name="productionRuns"><display/></field>
</form>
- <form name="listShipmentPlans" type="list" target="" title="" list-name="shipmentPlans">
+ <form name="listShipmentPlans" type="list" target="" title="" list-name="shipmentPlans"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="shipmentId"><display/></field>
<field name="statusId">
<display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
@@ -543,13 +567,15 @@
<hyperlink target="WorkWithShipmentPlans?shipmentId=${shipmentId}" description="${uiLabelMap.CommonView}" also-hidden="false"/>
</field>
</form>
- <form name="SelectMrpName" type="single" target="ManufacturingReports" title="">
+ <form name="SelectMrpName" type="single" target="ManufacturingReports" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="mrpName" title="${uiLabelMap.ManufacturingMrpName}"><text size="20"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}">
<submit button-type="button"/>
</field>
</form>
- <form name="mandatoryWorkEfforts" type="list" target="" title="" list-name="mandatoryWorkEfforts">
+ <form name="mandatoryWorkEfforts" type="list" target="" title="" list-name="mandatoryWorkEfforts"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="workEffortIdFrom" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="ShowProductionRun?productionRunId=${workEffortIdFrom}" description="${workEffortIdFrom}" also-hidden="false"/>
</field>
@@ -575,7 +601,8 @@
<display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualCompletionDate} " cache="true"/>
</field>
</form>
- <form name="dependentWorkEfforts" type="list" target="" title="" list-name="dependentWorkEfforts">
+ <form name="dependentWorkEfforts" type="list" target="" title="" list-name="dependentWorkEfforts"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="workEffortIdTo" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="ShowProductionRun?productionRunId=${workEffortIdTo}" description="${workEffortIdTo}" also-hidden="false"/>
</field>
@@ -601,7 +628,8 @@
<display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualCompletionDate} " cache="true"/>
</field>
</form>
- <form name="ProductionRunTaskCosts" type="list" target="" title="" list-name="taskCosts">
+ <form name="ProductionRunTaskCosts" type="list" target="" title="" list-name="taskCosts"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="CostComponent" default-field-type="display"/>
<field name="workEffortId"><hidden/></field>
<field name="productId"><hidden/></field>
@@ -615,7 +643,8 @@
<display-entity entity-name="CostComponentCalc"/>
</field>
</form>
- <form name="AddProductionRunComponent" type="single" target="addProductionRunComponent" title="">
+ <form name="AddProductionRunComponent" type="single" target="addProductionRunComponent" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="addProductionRunComponent"/>
<field name="productionRunId"><hidden/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTask}">
@@ -631,7 +660,8 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ProductionRunTaskComponents" type="list" target="updateProductionRunComponent" paginate-target="ProductionRunComponents" title="" list-name="records">
+ <form name="ProductionRunTaskComponents" type="list" target="updateProductionRunComponent" paginate-target="ProductionRunComponents" title="" list-name="records"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="productId"><display/></field>
<field name="internalName" entry-name="productId" title="${uiLabelMap.ProductProductInternalName}">
<display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/>
@@ -644,7 +674,8 @@
<hyperlink target="deleteProductionRunComponent?workEffortId=${workEffortId}&fromDate=${fromDate}&productId=${productId}&workEffortGoodStdTypeId=${workEffortGoodStdTypeId}&productionRunId=${productionRunId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="ProductionRunTaskActualComponents" type="list" target="updateProductionRunComponent" paginate-target="ProductionRunActualComponents" title="" list-name="records">
+ <form name="ProductionRunTaskActualComponents" type="list" target="updateProductionRunComponent" paginate-target="ProductionRunActualComponents" title="" list-name="records"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<set field="quantityOnHandDiff" value="${bsh:-1*quantityOnHandDiff}"/>
</row-actions>
@@ -662,7 +693,8 @@
</field>
<field name="description"><display/></field>
</form>
- <form name="IssueProductionRunComponent" type="single" target="issueProductionRunTaskComponent" title="">
+ <form name="IssueProductionRunComponent" type="single" target="issueProductionRunTaskComponent" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="issueProductionRunTaskComponent"/>
<field name="productionRunId"><hidden/></field>
<field name="fromDate"><ignored/></field>
@@ -689,4 +721,4 @@
<field name="description"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTabBar.ftl Thu Jan 24 12:42:46 2008
@@ -17,21 +17,23 @@
under the License.
-->
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign selected = tabButtonItem?default("void")>
-<div class='tabContainer'>
- <#if productionRun?has_content>
+<#if productionRun?has_content>
+<div class="button-bar tab-bar">
+ <ul>
<#if productionRun.getString("currentStatusId") == "PRUN_CREATED" || productionRun.getString("currentStatusId") == "PRUN_SCHEDULED">
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.edit?default(unselectedClassName)}">${uiLabelMap.ManufacturingEditProductionRun}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.tasks?default(unselectedClassName)}">${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.components?default(unselectedClassName)}">${uiLabelMap.ManufacturingMaterials}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.fixedAssets?default(unselectedClassName)}">${uiLabelMap.AccountingFixedAssets}</a>
+ <li<#if selected == "edit"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingEditProductionRun}</a></li>
+ <li<#if selected == "tasks"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}</a></li>
+ <li<#if selected == "components"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingMaterials}</a></li>
+ <li<#if selected == "fixedAssets"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingFixedAssets}</a></li>
<#else>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.declaration?default(unselectedClassName)}">${uiLabelMap.ManufacturingProductionRunDeclaration}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.actualComponents?default(unselectedClassName)}">${uiLabelMap.ManufacturingActualMaterials}</a>
+ <li<#if selected == "declaration"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingProductionRunDeclaration}</a></li>
+ <li<#if selected == "actualComponents"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingActualMaterials}</a></li>
</#if>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.assocs?default(unselectedClassName)}">${uiLabelMap.ManufacturingProductionRunAssocs}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.costs?default(unselectedClassName)}">${uiLabelMap.ManufacturingActualCosts}</a>
- </#if>
+ <li<#if selected == "assocs"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingProductionRunAssocs}</a></li>
+ <li<#if selected == "costs"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingActualCosts}</a></li>
+ </ul>
+ <br class="clear"/>
</div>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl Thu Jan 24 12:42:46 2008
@@ -17,11 +17,15 @@
under the License.
-->
-<br/>
<#list taskInfos as taskInfo>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
<#assign task = taskInfo.task>
<#assign taskForm = taskInfo.taskForm>
- <h2>${task.workEffortName?if_exists} [${task.workEffortId}]</h2>
+ <h3>${task.workEffortName?if_exists} [${task.workEffortId}]</h3>
+ </div>
+ <div class="screenlet-body">
${taskForm.renderFormString(context)}
- <br/>
-</#list>
+ </div>
+</div>
+</#list>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl Thu Jan 24 12:42:46 2008
@@ -18,33 +18,43 @@
-->
<#if shipment?exists>
- <h1>${uiLabelMap.ManufacturingWorkWithShipmentPlans}: ${shipment.shipmentId}</h1>
- ${listShipmentPlanForm.renderFormString(context)}
- <#if workInProgress>
- <br/>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingTasksReport}</a></div>
- <div><a href="<@o...@ofbizUrl>" target="_report" class="buttontext">${uiLabelMap.ManufacturingCuttingListReport}</a></div>
- <#else>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingCreateProductionRun}</a></div>
- <br/>
- <div><a href="<@o...@ofbizUrl>" target="_report" class="buttontext">${uiLabelMap.ManufacturingShipmentPlanStockReport}</a></div>
- </#if>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ManufacturingWorkWithShipmentPlans} ${shipment.shipmentId}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${listShipmentPlanForm.renderFormString(context)}
+ <#if workInProgress>
+ <br/>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingTasksReport}</a></div>
+ <div><a href="<@o...@ofbizUrl>" target="_report" class="buttontext">${uiLabelMap.ManufacturingCuttingListReport}</a></div>
+ <#else>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingCreateProductionRun}</a></div>
+ <br/>
+ <div><a href="<@o...@ofbizUrl>" target="_report" class="buttontext">${uiLabelMap.ManufacturingShipmentPlanStockReport}</a></div>
+ </#if>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPackageLabelsReport}</a></div>
- <#-- new reports -->
- <#--
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsProductsByFeature}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsComponentsByFeature2}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsComponentsByFeature3}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPackageContentsAndOrder}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsProductsAndOrder}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsInfoAndOrder}</a></div>
- -->
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPackageLabelsReport}</a></div>
+ <#-- new reports -->
+ <#--
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsProductsByFeature}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsComponentsByFeature2}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsComponentsByFeature3}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPackageContentsAndOrder}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsProductsAndOrder}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsInfoAndOrder}</a></div>
+ -->
+ </div>
+</div>
<#else>
-<h1>${uiLabelMap.ManufacturingWorkWithShipmentPlans}</h1>
-<#if listShipmentPlansForm?has_content>
- ${listShipmentPlansForm.renderFormString(context)}
-</#if>
-
-</#if>
-
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ManufacturingWorkWithShipmentPlans}</h3>
+ </div>
+ <div class="screenlet-body">
+ <#if listShipmentPlansForm?has_content>
+ ${listShipmentPlansForm.renderFormString(context)}
+ </#if>
+ </div>
+</div>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl Thu Jan 24 12:42:46 2008
@@ -20,7 +20,7 @@
<#-- Mandatory work efforts -->
<#if mandatoryWorkEfforts?has_content>
<p>
- ${uiLabelMap.ManufacturingMandatoryProductionRuns}:
+ ${uiLabelMap.ManufacturingMandatoryProductionRuns}
<#list mandatoryWorkEfforts as mandatoryWorkEffortAssoc>
<#assign mandatoryWorkEffort = mandatoryWorkEffortAssoc.getRelatedOne("FromWorkEffort")>
<#if "PRUN_COMPLETED" == mandatoryWorkEffort.getString("currentStatusId") || "PRUN_CLOSED" == mandatoryWorkEffort.getString("currentStatusId")>
@@ -38,7 +38,7 @@
<#-- Dependent work efforts -->
<#if dependentWorkEfforts?has_content>
<p>
- ${uiLabelMap.ManufacturingDependentProductionRuns}:
+ ${uiLabelMap.ManufacturingDependentProductionRuns}
<#list dependentWorkEfforts as dependentWorkEffortAssoc>
<#assign dependentWorkEffort = dependentWorkEffortAssoc.getRelatedOne("ToWorkEffort")>
<#if "PRUN_COMPLETED" == dependentWorkEffort.currentStatusId || "PRUN_CLOSED" == dependentWorkEffort.currentStatusId>
@@ -52,4 +52,4 @@
</#if>
</#list>
</p>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpForms.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">
- <form name="RunMrp" type="single" target="runMrpGo" title="">
+ <form name="RunMrp" type="single" target="runMrpGo" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="mrpName" title="${uiLabelMap.ManufacturingMrpName}"><text size="20"/></field>
<field name="facilityGroupId" title="${uiLabelMap.ProductFacilityGroup}">
<drop-down allow-empty="true">
@@ -39,7 +40,8 @@
</field>
</form>
- <form name="ListRunningMrpJobs" list-name="mrpActiveJobs" title="" type="list">
+ <form name="ListRunningMrpJobs" list-name="mrpActiveJobs" title="" type="list"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
<field name="statusId">
<display-entity entity-name="StatusItem" description="${description}"></display-entity>
@@ -57,7 +59,8 @@
<field name="finishDateTime"><hidden/></field>
<field name="cancelDateTime"><hidden/></field>
</form>
- <form name="ListFinishedMrpJobs" list-name="lastFinishedJobs" title="" type="list">
+ <form name="ListFinishedMrpJobs" list-name="lastFinishedJobs" title="" type="list"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
<field name="statusId">
<display-entity entity-name="StatusItem" description="${description}"></display-entity>
@@ -72,5 +75,4 @@
<field name="recurrenceInfoId"><hidden/></field>
<field name="serviceName"><hidden/></field>
</form>
-
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpTabBar.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpTabBar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/MrpTabBar.ftl Thu Jan 24 12:42:46 2008
@@ -17,10 +17,12 @@
under the License.
-->
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign selected = tabButtonItem?default("void")>
-<div class='tabContainer'>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.RunMrp?default(unselectedClassName)}">${uiLabelMap.ManufacturingRunMrp}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.findInventoryEventPlan?default(unselectedClassName)}">${uiLabelMap.ManufacturingMrpLog}</a>
-</div>
+<div class="button-bar tab-bar">
+ <ul>
+ <li<#if selected == "RunMrp"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingRunMrp}</a></li>
+ <li<#if selected == "findInventoryEventPlan"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingMrpLog}</a></li>
+ </ul>
+ <br class="clear"/>
+</div>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Thu Jan 24 12:42:46 2008
@@ -24,72 +24,78 @@
}
// -->
</script>
-
-<form method="post" name="lookupinventory" action="<@o...@ofbizUrl>">
-<input type="hidden" name="lookupFlag" value="Y"/>
-<input type="hidden" name="hideFields" value="Y"/>
-<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <tr>
- <td width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <td class='boxhead'></td>
- <td align='right'>
- <p>
- <#if requestParameters.hideFields?default("N") == "Y">
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonShowLookupFields}</a>
- <#else>
- <#if inventoryList?exists>
- <a href="<@o...@ofbizUrl>" class="submenutext">${uiLabelMap.CommonHideFields}</a>
- </#if>
- <a href="javascript:lookupInventory();" class="submenutextright">${uiLabelMap.CommonLookup}</a>
- </#if>
- </p>
- </td>
- </tr>
- </table>
- <#if requestParameters.hideFields?default("N") != "Y">
- <table width='100%' border='0' cellspacing='0' cellpadding='2' class='boxbottom'>
- <tr>
- <td align='center' width='100%'>
- <table border='0' cellspacing='0' cellpadding='2'>
- <tr>
- <th width='20%' align='right'>${uiLabelMap.ManufacturingProductId}:</th>
- <td width='5%'> </td>
- <td>
- <input type='text' size='25' name='productId' value='${requestParameters.productId?if_exists}'/>
- <span>
- <a href="javascript:call_fieldlookup2(document.lookupinventory.productId,'LookupProduct');">
- <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
- </a>
- </span>
- <input type='text' size='25' readonly name='productId_description' value=''/>
- </td>
- </tr>
- <tr>
- <th width='20%' align='right'>${uiLabelMap.CommonFromDate}:</th>
- <td width='5%'> </td>
- <td>
- <input type='text' size='25' name='eventDate' value='${requestParameters.eventDate?if_exists}'/>
- <a href="javascript:call_cal(document.lookupinventory.eventDate,'');">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
- </a>
- </td>
- </tr>
- <tr>
- <td width="25%" align="center" valign="top">
- <td width="5"> </td>
- <td width="75%"> <a href="javascript:lookupInventory();" class="smallSubmit"> ${uiLabelMap.CommonLookup} </a></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </#if>
- </td>
- </tr>
-</table>
-</form>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleFindInventoryEventPlan}</h3>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" name="lookupinventory" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="lookupFlag" value="Y"/>
+ <input type="hidden" name="hideFields" value="Y"/>
+ <table class="basic-table" cellspacing="0">
+ <tr>
+ <td width='100%'>
+ <table class="basic-table" cellspacing="0">
+ <tr>
+ <td></td>
+ <td align='right'>
+ <p>
+ <#if requestParameters.hideFields?default("N") == "Y">
+ <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonShowLookupFields}</a>
+ <#else>
+ <#if inventoryList?exists>
+ <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonHideFields}</a>
+ </#if>
+ <a href="javascript:lookupInventory();" class="smallSubmit">${uiLabelMap.CommonLookup}</a>
+ </#if>
+ </p>
+ </td>
+ </tr>
+ </table>
+ <#if requestParameters.hideFields?default("N") != "Y">
+ <table class="basic-table" cellspacing="0">
+ <tr>
+ <td align='center' width='100%'>
+ <table class="basic-table" cellspacing="0">
+ <tr>
+ <td width='20%' align='right' class="label">${uiLabelMap.ManufacturingProductId}</td>
+ <td width='5%'> </td>
+ <td>
+ <input type='text' size='25' name='productId' value='${requestParameters.productId?if_exists}'/>
+ <span>
+ <a href="javascript:call_fieldlookup2(document.lookupinventory.productId,'LookupProduct');">
+ <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
+ </a>
+ </span>
+ <input type='text' size='25' readonly name='productId_description' value=''/>
+ </td>
+ </tr>
+ <tr>
+ <td width='20%' align='right' class="label">${uiLabelMap.CommonFromDate}</td>
+ <td width='5%'> </td>
+ <td>
+ <input type='text' size='25' name='eventDate' value='${requestParameters.eventDate?if_exists}'/>
+ <a href="javascript:call_cal(document.lookupinventory.eventDate,'');">
+ <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td width="25%" align="center" valign="top">
+ <td width="5"> </td>
+ <td width="75%"> <a href="javascript:lookupInventory();" class="smallSubmit"> ${uiLabelMap.CommonLookup} </a></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </#if>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</div>
<#if requestParameters.hideFields?default("N") != "Y">
<script language="JavaScript" type="text/javascript">
@@ -99,14 +105,13 @@
</script>
</#if>
<#if requestParameters.lookupFlag?default("N") == "Y">
-<br/>
-<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
+<table class="basic-table" cellspacing="0">
<tr>
<td width='100%'>
<#if inventoryList?exists>
<#if 0 < inventoryList?size>
<#assign rowClass = "viewManyTR2">
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
+ <table class="basic-table" cellspacing="0">
<tr>
<td width="50%" class="boxhead">${uiLabelMap.CommonElementsFound}</td>
<td width="50%">
@@ -132,15 +137,15 @@
</tr>
</table>
- <table width='100%' border='0' cellspacing='0' cellpadding='2' class='boxbottom'>
- <tr>
- <td align="left"><b>${uiLabelMap.CommonType}</b></td>
- <td align="center"><b> </b></td>
- <td align="left"><b>${uiLabelMap.CommonDescription}</b></td>
- <td align="left"><b>${uiLabelMap.CommonDate}</b></td>
- <td align="center"><b> </b></td>
- <td align="right"><b>${uiLabelMap.CommonQuantity}</b></td>
- <td align="right"><b>${uiLabelMap.ManufacturingTotalQuantity}</b></td>
+ <table class="basic-table" cellspacing="0">
+ <tr class="header-row">
+ <td align="left">${uiLabelMap.CommonType}</td>
+ <td align="center"> </td>
+ <td align="left">${uiLabelMap.CommonDescription}</td>
+ <td align="left">${uiLabelMap.CommonDate}</td>
+ <td align="center"> </td>
+ <td align="right">${uiLabelMap.CommonQuantity}</td>
+ <td align="right">${uiLabelMap.ManufacturingTotalQuantity}</td>
</tr>
<tr>
<td colspan="7"><hr/></td>
@@ -231,4 +236,4 @@
</td>
</tr>
</table>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.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="ListTechDataCalendars" type="list" title="" list-name="techDataCalendars">
+ <form name="ListTechDataCalendars" type="list" title="" list-name="techDataCalendars"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="calendarId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarId}"><display/></field>
@@ -31,7 +32,8 @@
<hyperlink target="RemoveCalendar?calendarId=${calendarId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="ListCalendarWeek" type="list" target="UpdateCalendarWeek" title="" list-name="calendarWeeks">
+ <form name="ListCalendarWeek" type="list" target="UpdateCalendarWeek" title="" list-name="calendarWeeks"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="updateLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -41,7 +43,8 @@
<hyperlink target="RemoveCalendarWeek?calendarWeekId=${calendarWeekId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="ListCalendarExceptionDay" type="list" target="UpdateCalendarExceptionDay" title="" list-name="calendarExceptionDays">
+ <form name="ListCalendarExceptionDay" type="list" target="UpdateCalendarExceptionDay" title="" list-name="calendarExceptionDays"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -57,7 +60,8 @@
</field>
</form>
- <form name="UpdateCalendarExceptionDay" type="single" target="UpdateCalendarExceptionDay" title="">
+ <form name="UpdateCalendarExceptionDay" type="single" target="UpdateCalendarExceptionDay" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="updateCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId" ><hidden/></field>
<field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}" ><display/></field>
@@ -71,7 +75,8 @@
</sort-order>
</form>
- <form name="AddCalendarExceptionDay" type="single" target="CreateCalendarExceptionDay" title="">
+ <form name="AddCalendarExceptionDay" type="single" target="CreateCalendarExceptionDay" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId" map-name="techDataCalendar"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}" ></field>
@@ -80,7 +85,8 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
- <form name="ListCalendarExceptionWeek" type="list" target="UpdateCalendarExceptionWeek" title="" list-name="calendarExceptionWeeksDatas">
+ <form name="ListCalendarExceptionWeek" type="list" target="UpdateCalendarExceptionWeek" title="" list-name="calendarExceptionWeeksDatas"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateCalendarExceptionWeek" map-name="calendarExceptionWeek"/>
<field name="calendarId"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display /></field>
@@ -97,7 +103,8 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="UpdateCalendarExceptionWeek" type="single" target="UpdateCalendarExceptionWeek" title="">
+ <form name="UpdateCalendarExceptionWeek" type="single" target="UpdateCalendarExceptionWeek" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="updateCalendarExceptionWeek" map-name="calendarExceptionWeek"/>
<field name="calendarId" ><hidden/></field>
<field name="exceptionDateStart" title="${uiLabelMap.ManufacturingExceptionDateStart}" ><display/></field>
@@ -116,7 +123,8 @@
<sort-field name="calendarWeekId"/>
</sort-order>
</form>
- <form name="AddCalendarExceptionWeek" type="single" target="CreateCalendarExceptionWeek" title="">
+ <form name="AddCalendarExceptionWeek" type="single" target="CreateCalendarExceptionWeek" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createCalendarExceptionWeek" map-name="calendarExceptionWeek"/>
<field name="calendarId" map-name="techDatacalendar"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}" ></field>
@@ -131,7 +139,8 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
- <form name="UpdateCalendarWeek" type="single" target="updateCalendarWeek" title="">
+ <form name="UpdateCalendarWeek" type="single" target="updateCalendarWeek" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="calendarWeek==null" target="createCalendarWeek"/>
<auto-fields-service service-name="updateCalendarWeek" map-name="calendarWeek"/>
<field name="calendarWeekId" use-when="calendarWeek!=null" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
@@ -151,5 +160,4 @@
<field name="sundayCapacity" position="2"><text/></field>
<field name="submitButton"><submit button-type="button"/></field>
</form>
-
- </forms>
+ </forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl Thu Jan 24 12:42:46 2008
@@ -17,17 +17,23 @@
under the License.
-->
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign selected = tabButtonItem?default("void")>
-<div class='tabContainer'>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.Calendar?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendars}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.CalendarWeek?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendarWeeks}</a>
+<div class="button-bar tab-bar">
+ <ul>
+ <li<#if selected == "Calendar"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingCalendars}</a></li>
+ <li<#if selected == "CalendarWeek"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingCalendarWeeks}</a></li>
+ </ul>
+ <br class="clear"/>
</div>
<#if techDataCalendar?has_content>
- <div class='tabContainer'>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.calendar?default(unselectedClassName)}">${uiLabelMap.CommonEdit}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.calendarExceptionDay?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendarExceptionDate}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.calendarExceptionWeek?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendarExceptionWeek}</a>
+ <br/>
+ <div class="button-bar tab-bar">
+ <ul>
+ <li<#if selected == "calendar"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li>
+ <li<#if selected == "calendarExceptionDay"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingCalendarExceptionDate}</a></li>
+ <li<#if selected == "calendarExceptionWeek"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ManufacturingCalendarExceptionWeek}</a></li>
+ </ul>
+ <br class="clear"/>
</div>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl Thu Jan 24 12:42:46 2008
@@ -18,36 +18,44 @@
-->
<#if techDataCalendar?has_content>
- <h1>${uiLabelMap.ManufacturingUpdateCalendar} </h1>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ManufacturingUpdateCalendar}</h3>
+ </div>
+ <div class="screenlet-body">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a>
<form name="calendarform" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="calendarId" value="${techDataCalendar.calendarId}">
<#else>
- <h1>${uiLabelMap.ManufacturingCreateCalendar}</h1>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ManufacturingCreateCalendar}</h3>
+ </div>
+ <div class="screenlet-body">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a>
<form name="calendarform" method="post" action="<@o...@ofbizUrl>">
</#if>
-
- <br/>
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <table class="basic-table" cellspacing="0">
<#if techDataCalendar?has_content>
<tr>
- <td width='26%' align='right' valign='top'>${uiLabelMap.ManufacturingCalendarId}</td>
+ <td width='26%' align='right' valign='top' class="label">${uiLabelMap.ManufacturingCalendarId}</td>
<td width="5"> </td>
- <td width="74%" valign="top"><b>${techDataCalendar.calendarId?if_exists}</b> (${uiLabelMap.CommonNotModifRecreat})</td>
+ <td width="74%" valign="top"><span class="label">${techDataCalendar.calendarId?if_exists}</span> <span class="tooltip">(${uiLabelMap.CommonNotModifRecreat})</span></td>
</tr>
<#else>
<tr>
- <td width='26%' align='right' valign="top">${uiLabelMap.ManufacturingCalendarId}</td>
+ <td width='26%' align='right' valign="top" class="label">${uiLabelMap.ManufacturingCalendarId}</td>
<td width="5"> </td>
<td width="74%"><input type="text" size="12" name="calendarId" value="${calendarData.calendarId?if_exists}"></td>
</tr>
</#if>
<tr>
- <td width='26%' align='right' valign='top'>${uiLabelMap.CommonDescription}</td>
+ <td width='26%' align='right' valign='top' class="label">${uiLabelMap.CommonDescription}</td>
<td width="5"> </td>
<td width="74%"><input type="text" size="40" name="description" value="${calendarData.description?if_exists}"></td>
</tr>
<tr>
- <td width='26%' align='right' valign='top'>${uiLabelMap.ManufacturingCalendarWeekId}</td>
+ <td width='26%' align='right' valign='top' class="label">${uiLabelMap.ManufacturingCalendarWeekId}</td>
<td width="5"> </td>
<td width="74%">
<select name="calendarWeekId">
@@ -62,11 +70,6 @@
<td width="74%"><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
</tr>
</table>
-</form>
-<table width="90%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <td width='100%' align='right' valign='top'>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a>
- </td>
- </tr>
-</table>
+ </form>
+ </div>
+</div>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl?rev=614984&r1=614983&r2=614984&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl Thu Jan 24 12:42:46 2008
@@ -17,20 +17,33 @@
under the License.
-->
-<h1>${uiLabelMap.ManufacturingEditCalendarExceptionDayFor}
- <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if>
- [${uiLabelMap.CommonId}:${techDataCalendar.calendarId?if_exists}]
-</h1>
-<br/>
<#if techDataCalendar?has_content>
-${listCalendarExceptionDayWrapper.renderFormString(context)}
-<br/>
-<hr/>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ManufacturingEditCalendarExceptionDayFor}
+ <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if>
+ [${uiLabelMap.CommonId} ${techDataCalendar.calendarId?if_exists}]</h3>
+ </div>
+ <div class="screenlet-body">
+ ${listCalendarExceptionDayWrapper.renderFormString(context)}
+ </div>
+</div>
<#if calendarExceptionDay?has_content>
-${updateCalendarExceptionDayWrapper.renderFormString(context)}
-<br/>
-<hr/>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleEditCalendarExceptionWeek}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${updateCalendarExceptionDayWrapper.renderFormString(context)}
+ </div>
+</div>
</#if>
-${addCalendarExceptionDayWrapper.renderFormString(context)}
-</#if>
-<br/>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleAddCalendarExceptionWeek}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${addCalendarExceptionDayWrapper.renderFormString(context)}
+ </div>
+</div>
+</#if>
\ No newline at end of file