svn commit: r614715 - in /ofbiz/trunk/applications/manu
Locked
 
|
Author: mrisaliti
Date: Wed Jan 23 14:31:35 2008 New Revision: 614715 URL: http://svn.apache.org/viewvc?rev=614715&view=rev Log: Lookup/Bom 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/bom/BomForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomTabBar.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties?rev=614715&r1=614714&r2=614715&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties (original) +++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties Wed Jan 23 14:31:35 2008 @@ -142,6 +142,9 @@ ManufacturingNoDataAvailable=No Data Available. ManufacturingNoMachineGroupFound=No Fixed Asset group found ManufacturingNoProductionRunSelected=No ProductionRun Selected +ManufacturingNote1=date/time entries denote that the current time is before the From Date or after the Thru Date. If the From Date is +ManufacturingNote2=, association has not started yet; if Thru Date is +ManufacturingNote3=, association has expired (<u>and should probably be deleted</u>). ManufacturingPackageLabelsReport=Package Labels Report ManufacturingPrintProductionRun=Manufacturing Print Production Run ManufacturingProductLevel=Product Level @@ -171,6 +174,7 @@ ManufacturingProductIdTo=Product ID To ManufacturingProductNotExist=Product does not exist ManufacturingProductRoutingNotExist=Product Routing link doesn't exist +ManufacturingProductVirtual=Virtual ManufacturingProposedOrder=Proposed Order ManufacturingQuantity=Quantity ManufacturingQuantityMinimum=Quantity Minimum Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties?rev=614715&r1=614714&r2=614715&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties (original) +++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties Wed Jan 23 14:31:35 2008 @@ -141,6 +141,9 @@ ManufacturingNoDataAvailable=Nessun Dato Disponibile. ManufacturingNoMachineGroupFound=Nessun Gruppo Macchine trovato ManufacturingNoProductionRunSelected=Nessun Ordine di Produzione Selezionato +ManufacturingNote1=le voci data/ora indicano che l'orario attuale \u00e8 prima della Data di Inizio o dopo la Data di Fine. Se la Data di Inizio \u00e8 +ManufacturingNote2=, associazione non \u00e8 ancora iniziata; se la Data di Fine \u00e8 +ManufacturingNote3=, associazione \u00e8 scaduta (<u>e dovrebbe probabilmente essere cancellata</u>). ManufacturingPackageLabelsReport=Stampa Etichette Pacco ManufacturingPrintProductionRun=Stampa Ordine di Produzione ManufacturingProductLevel=Livello Prodotto @@ -170,6 +173,7 @@ ManufacturingProductIdTo=Codice Prodotto A ManufacturingProductNotExist=Prodotto inesistente ManufacturingProductRoutingNotExist=Link Ciclo Prodotto inesistente +ManufacturingProductVirtual=Virtuale ManufacturingProposedOrder=Ordine Proposta ManufacturingQuantity=Quantit\u00e0 ManufacturingQuantityMinimum=Quantit\u00e0 Minima Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml?rev=614715&r1=614714&r2=614715&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml Wed Jan 23 14:31:35 2008 @@ -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="RunBomSimulation" type="single" target="runBomSimulation" title=""> + <form name="RunBomSimulation" type="single" target="runBomSimulation" title="" + header-row-style="header-row" default-table-style="basic-table"> <field name="lookupFlag"><hidden value="Y"/></field> <field name="productId"> <lookup target-form-name="LookupProduct"/> @@ -69,7 +70,8 @@ </field> </form> - <form name="ListProductManufacturingRules" type="list" target="UpdateProductManufacturingRule" title="" list-name="manufacturingRules"> + <form name="ListProductManufacturingRules" type="list" target="UpdateProductManufacturingRule" title="" list-name="manufacturingRules" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateProductManufacturingRule" map-name="manufacturingRule"/> <field name="ruleId"><display/></field> <field name="ruleSeqId"><display/></field> @@ -91,7 +93,8 @@ </field> </form> - <form name="UpdateProductManufacturingRule" type="single" target="UpdateProductManufacturingRule" title=""> + <form name="UpdateProductManufacturingRule" type="single" target="UpdateProductManufacturingRule" title="" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="ruleId==null" target="AddProductManufacturingRule"/> <auto-fields-service service-name="updateProductManufacturingRule" map-name="manufacturingRule"/> <field name="ruleId"><display/></field> @@ -120,4 +123,4 @@ <submit button-type="button"/> </field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl?rev=614715&r1=614714&r2=614715&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Wed Jan 23 14:31:35 2008 @@ -18,33 +18,44 @@ --> <#if requestParameters.lookupFlag?default("N") == "Y"> - -<#if selectedFeatures?has_content> -<hr/> -<h2>${uiLabelMap.ManufacturingSelectedFeatures}</h2> -<#list selectedFeatures as selectedFeature> - <p>${selectedFeature.productFeatureTypeId} = ${selectedFeature.description?if_exists} [${selectedFeature.productFeatureId}]</p> -</#list> + <#if selectedFeatures?has_content> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ManufacturingSelectedFeatures}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#list selectedFeatures as selectedFeature> + <p>${selectedFeature.productFeatureTypeId} = ${selectedFeature.description?if_exists} [${selectedFeature.productFeatureId}]</p> + </#list> +<#else> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ManufacturingBomSimulation}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> </#if> -<hr/> - <table border='0' cellspacing='0' cellpadding='2' class='boxbottom'> - <tr> - <th width="10%" align="left">${uiLabelMap.ManufacturingProductLevel}</th> - <th width="20%" align="left">${uiLabelMap.ProductProductId}</th> - <th width="10%" align="left"> </th> - <th width="40%" align="left">${uiLabelMap.ProductProductName}</th> - <th width="10%" align="right">${uiLabelMap.CommonQuantity}</th> - <th width="10%" align="right"> </th> - </tr> - <tr> - <td colspan="6"><hr/></td> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td width="10%" align="left">${uiLabelMap.ManufacturingProductLevel}</td> + <td width="20%" align="left">${uiLabelMap.ProductProductId}</td> + <td width="10%" align="left"> </td> + <td width="40%" align="left">${uiLabelMap.ProductProductName}</td> + <td width="10%" align="right">${uiLabelMap.CommonQuantity}</td> + <td width="10%" align="right"> </td> </tr> <#if tree?has_content> - <#assign rowClass = "viewManyTR2"> + <#assign alt_row = false> <#list tree as node> - <tr class="${rowClass}"> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> - <table cellspacing="1"><tr> + <table cellspacing="1"> + <tr> <td>${node.depth}</td> <#list 0..(node.depth) as level> <td bgcolor="red"> </td> @@ -55,7 +66,7 @@ <td>${node.product.productId}</td> <td> <#if node.product.isVirtual?default("N") == "Y"> - Virtual + ${uiLabelMap.ManufacturingProductVirtualVirtual} </#if> ${(node.ruleApplied.ruleId)?if_exists} </td> @@ -64,37 +75,29 @@ <td align="right"><a href="<@ofbizUrl>EditProductBom?productId=${(node.product.productId)?if_exists}&productAssocTypeId=${(node.bomTypeId)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a></td> </tr> <#-- toggle the row color --> - <#if rowClass == "viewManyTR2"> - <#assign rowClass = "viewManyTR1"> - <#else> - <#assign rowClass = "viewManyTR2"> - </#if> + <#assign alt_row = !alt_row> </#list> <#else> - <tr> - <th colspan="4">${uiLabelMap.CommonNoElementFound}.</th> - </tr> + <tr> + <td colspan="6">${uiLabelMap.CommonNoElementFound}.</td> + </tr> </#if> </table> -<hr/> -<hr/> - <table border='0' cellspacing='0' cellpadding='2' class='boxbottom'> - <tr> - <th width="18%" align="left">${uiLabelMap.ProductProductId}</th> - <th width="50%" align="left">${uiLabelMap.ProductProductName}</th> - <th width="8%" align="right">${uiLabelMap.CommonQuantity}</th> - <th width="8%" align="right">${uiLabelMap.ProductQoh}</th> - <th width="8%" align="right">${uiLabelMap.FormFieldTitle_cost}</th> - <th width="8%" align="right">${uiLabelMap.CommonTotalCost}</th> - </tr> - <tr> - <td colspan="6"><hr/></td> + <br/> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td width="18%" align="left">${uiLabelMap.ProductProductId}</td> + <td width="50%" align="left">${uiLabelMap.ProductProductName}</td> + <td width="8%" align="right">${uiLabelMap.CommonQuantity}</td> + <td width="8%" align="right">${uiLabelMap.ProductQoh}</td> + <td width="8%" align="right">${uiLabelMap.FormFieldTitle_cost}</td> + <td width="8%" align="right">${uiLabelMap.CommonTotalCost}</td> </tr> <#if productsData?has_content> - <#assign rowClass = "viewManyTR2"> + <#assign alt_row = false> <#list productsData as productData> <#assign node = productData.node> - <tr class='${rowClass}'> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}" class="buttontext">${node.product.productId}</a></td> <td>${node.product.internalName?default(" ")}</td> <td align="right">${node.quantity}</td> @@ -107,23 +110,21 @@ <td align="right">${productData.totalCost?if_exists}</td> </tr> <#-- toggle the row color --> - <#if rowClass == "viewManyTR2"> - <#assign rowClass = "viewManyTR1"> - <#else> - <#assign rowClass = "viewManyTR2"> - </#if> + <#assign alt_row = !alt_row> </#list> <#-- <#if grandTotalCost?exists> <tr> - <th colspan="6" align="right">${grandTotalCost}</th> + <td colspan="6" align="right">${grandTotalCost}</td> </tr> </#if> --> <#else> <tr> - <td colspan="6"><h3>${uiLabelMap.CommonNoElementFound}.</h3></td> + <td colspan="6">${uiLabelMap.CommonNoElementFound}.</td> </tr> </#if> </table> -</#if> + </div> +</div> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomTabBar.ftl?rev=614715&r1=614714&r2=614715&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomTabBar.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomTabBar.ftl Wed Jan 23 14:31:35 2008 @@ -17,11 +17,13 @@ under the License. --> -<#assign unselectedClassName = "tabButton"> -<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> +<#assign selected = tabButtonItem?default("void")> -<div class='tabContainer'> - <a href="<@ofbizUrl>BomSimulation</@ofbizUrl>" class="${selectedClassMap.findBom?default(unselectedClassName)}">${uiLabelMap.ManufacturingBomSimulation}</a> - <a href="<@ofbizUrl>EditProductBom</@ofbizUrl>" class="${selectedClassMap.EditProductBom?default(unselectedClassName)}">${uiLabelMap.ManufacturingEditProductBom}</a> - <a href="<@ofbizUrl>EditProductManufacturingRules</@ofbizUrl>" class="${selectedClassMap.productManufacturingRules?default(unselectedClassName)}">${uiLabelMap.ManufacturingManufacturingRules}</a> -</div> +<div class="button-bar tab-bar"> + <ul> + <li<#if selected == "findBom"> class="selected"</#if>><a href="<@ofbizUrl>BomSimulation</@ofbizUrl>">${uiLabelMap.ManufacturingBomSimulation}</a></li> + <li<#if selected == "EditProductBom"> class="selected"</#if>><a href="<@ofbizUrl>EditProductBom</@ofbizUrl>">${uiLabelMap.ManufacturingEditProductBom}</a></li> + <li<#if selected == "productManufacturingRules"> class="selected"</#if>><a href="<@ofbizUrl>EditProductManufacturingRules</@ofbizUrl>">${uiLabelMap.ManufacturingManufacturingRules}</a></li> + </ul> + <br class="clear"/> +</div> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=614715&r1=614714&r2=614715&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Wed Jan 23 14:31:35 2008 @@ -26,69 +26,70 @@ } // --> </script> - - <h1>${uiLabelMap.ManufacturingBillOfMaterials} <#if product?exists>${(product.internalName)?if_exists}</#if>[${uiLabelMap.CommonId}:${productId?if_exists}]</h1> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleEditProductBom} <#if product?exists>${(product.internalName)?if_exists}</#if> [${uiLabelMap.CommonId} ${productId?if_exists}]</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> <#if product?has_content> <a href="<@ofbizUrl>BomSimulation</@ofbizUrl>?productId=${productId}&bomType=${productAssocTypeId}" class="buttontext">${uiLabelMap.ManufacturingBillOfMaterials}</a> <!--<a href="<@ofbizUrl>EditRoutingProductLink?byProduct=${productId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ManufacturingProductRoutings}]</a></span>--> </#if> - <br/> <br/> - <form name="searchform" action="<@ofbizUrl>UpdateProductBom</@ofbizUrl>#topform" method="post"> <input type="hidden" name="UPDATE_MODE" value=""/> <a name="topform"/> - <table border="0" cellpadding="2" cellspacing="0"> + <table class="basic-table" cellspacing="0"> <tr> - <th align="right">${uiLabelMap.ManufacturingBomType}:</th> + <td align="right">${uiLabelMap.ManufacturingBomType}</td> <td> </td> <td> - <select name="productAssocTypeId" size="1"> - <#if productAssocTypeId?has_content> - <#assign curAssocType = delegator.findByPrimaryKey("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId))> - <#if curAssocType?exists> - <option selected value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option> - <option value="${(curAssocType.productAssocTypeId)?if_exists}"></option> + <select name="productAssocTypeId" size="1"> + <#if productAssocTypeId?has_content> + <#assign curAssocType = delegator.findByPrimaryKey("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId))> + <#if curAssocType?exists> + <option selected value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option> + <option value="${(curAssocType.productAssocTypeId)?if_exists}"></option> + </#if> </#if> - </#if> - <#list assocTypes as assocType> - <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option> - </#list> - </select> + <#list assocTypes as assocType> + <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option> + </#list> + </select> </td> - <th align="right">${uiLabelMap.ProductProductId}:</th> + <td align="right">${uiLabelMap.ProductProductId}</td> <td> </td> <td> - <input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/> - <a href="javascript:call_fieldlookup2(document.searchform.productId,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a> - <span><a href="javascript:document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingShowBOMAssocs}</a></span> + <input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/> + <a href="javascript:call_fieldlookup2(document.searchform.productId,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a> + <span><a href="javascript:document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingShowBOMAssocs}</a></span> </td> </tr> <tr> <td colspan='3' align="left"> </td> - <th align="right">${uiLabelMap.ManufacturingCopyToProductId}:</th> + <td align="right">${uiLabelMap.ManufacturingCopyToProductId}</td> <td> </td> <td> - <input type="text" name="copyToProductId" size="20" maxlength="40" value=""/> - <a href="javascript:call_fieldlookup2(document.searchform.copyToProductId,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a> - <span><a href="javascript:document.searchform.UPDATE_MODE.value='COPY';document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingCopyBOMAssocs}</a></span> + <input type="text" name="copyToProductId" size="20" maxlength="40" value=""/> + <a href="javascript:call_fieldlookup2(document.searchform.copyToProductId,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a> + <span><a href="javascript:document.searchform.UPDATE_MODE.value='COPY';document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingCopyBOMAssocs}</a></span> </td> </tr> </table> </form> - <hr/> - - <form action="<@ofbizUrl>UpdateProductBom</@ofbizUrl>" method="post" name="editProductAssocForm"> <#if !(productAssoc?exists)> <input type="hidden" name="UPDATE_MODE" value="CREATE"/> - <table border="0" cellpadding="2" cellspacing="0"> - <tr> - <th align="right">${uiLabelMap.ManufacturingBomType}:</th> + <table class="basic-table" cellspacing="0"> + <tr> + <td align="right">${uiLabelMap.ManufacturingBomType}</td> <td> </td> <td> <select name="productAssocTypeId" size="1"> @@ -104,32 +105,32 @@ </#list> </select> </td> - </tr> - <tr> - <th align="right">${uiLabelMap.ProductProductId}:</th> + </tr> + <tr> + <td align="right">${uiLabelMap.ProductProductId}</td> <td> </td> <td> <input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/> <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productId,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a> </td> - </tr> - <tr> - <th align="right">${uiLabelMap.ManufacturingProductIdTo}:</th> + </tr> + <tr> + <td align="right">${uiLabelMap.ManufacturingProductIdTo}</td> <td> </td> <td> <input type="text" name="productIdTo" size="20" maxlength="40" value="${productIdTo?if_exists}"/> <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productIdTo,'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a> </td> - </tr> - <tr> - <th align="right">${uiLabelMap.CommonFromDate}:</th> + </tr> + <tr> + <td align="right">${uiLabelMap.CommonFromDate}</td> <td> </td> <td> <input type="text" name="fromDate" size="25" maxlength="40" value=""/> <a href="javascript:call_cal(document.editProductAssocForm.fromDate,'${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> - (${uiLabelMap.ManufacturingWillBeSetToNow}) + <span class="tooltip">(${uiLabelMap.ManufacturingWillBeSetToNow})</span> </td> - </tr> + </tr> <#else> <#assign curProductAssocType = productAssoc.getRelatedOneCache("ProductAssocType")> <input type="hidden" name="UPDATE_MODE" value="UPDATE"/> @@ -137,30 +138,30 @@ <input type="hidden" name="productIdTo" value="${productIdTo?if_exists}"/> <input type="hidden" name="productAssocTypeId" value="${productAssocTypeId?if_exists}"/> <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/> - <table border="0" cellpadding="2" cellspacing="0"> - <tr> - <th align="right">${uiLabelMap.ProductProductId}:</th> + <table class="basic-table" cellspacing="0"> + <tr> + <td align="right">${uiLabelMap.ProductProductId}</td> + <td> </td> + <td>${productId?if_exists}</td> + </tr> + <tr> + <td align="right">${uiLabelMap.ManufacturingProductIdTo}</td> + <td> </td> + <td>${productIdTo?if_exists}</td> + </tr> + <tr> + <td align="right">${uiLabelMap.ManufacturingBomType}</td> + <td> </td> + <td><#if curProductAssocType?exists>${(curProductAssocType.get("description",locale))?if_exists}<#else> ${productAssocTypeId?if_exists}</#if></td> + </tr> + <tr> + <td align="right">${uiLabelMap.CommonFromDate}</td> <td> </td> - <td><b>${productId?if_exists}</b></td> - </tr> - <tr> - <th align="right">${uiLabelMap.ManufacturingProductIdTo}:</th> - <td> </td> - <td><b>${productIdTo?if_exists}</b></td> - </tr> - <tr> - <th align="right">${uiLabelMap.ManufacturingBomType}:</th> - <td> </td> - <td><b><#if curProductAssocType?exists>${(curProductAssocType.get("description",locale))?if_exists}<#else> ${productAssocTypeId?if_exists}</#if></b></td> - </tr> - <tr> - <th align="right">${uiLabelMap.CommonFromDate}:</th> - <td> </td> - <td><b>${fromDate?if_exists}</b></td> - </tr> + <td>${fromDate?if_exists}</td> + </tr> </#if> <tr> - <th width="26%" align="right">${uiLabelMap.CommonThruDate}:</th> + <td width="26%" align="right">${uiLabelMap.CommonThruDate}</td> <td> </td> <td width="74%"> <input type="text" name="thruDate" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("thruDate"))?if_exists}"</#if> size="30" maxlength="30"/> @@ -168,35 +169,32 @@ </td> </tr> <tr> - <th width="26%" align="right">${uiLabelMap.CommonSequenceNum}:</th> + <td width="26%" align="right">${uiLabelMap.CommonSequenceNum}</td> <td> </td> <td width="74%"><input type="text" name="sequenceNum" <#if useValues>value="${(productAssoc.sequenceNum)?if_exists}"<#else>value="${(request.getParameter("sequenceNum"))?if_exists}"</#if> size="5" maxlength="10"/></td> </tr> <tr> - <th width="26%" align="right">${uiLabelMap.ManufacturingReason}:</th> + <td width="26%" align="right">${uiLabelMap.ManufacturingReason}</td> <td> </td> <td width="74%"><input type="text" name="reason" <#if useValues>value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("reason"))?if_exists}"</#if> size="60" maxlength="255"/></td> </tr> <tr> - <th width="26%" align="right">${uiLabelMap.ManufacturingInstruction}:</th> + <td width="26%" align="right">${uiLabelMap.ManufacturingInstruction}</td> <td> </td> <td width="74%"><input type="text" name="instruction" <#if useValues>value="${(productAssoc.instruction)?if_exists}"<#else>value="${(request.getParameter("instruction"))?if_exists}"</#if> size="60" maxlength="255"/></td> </tr> - <tr> - <th width="26%" align="right">${uiLabelMap.ManufacturingQuantity}:</th> + <td width="26%" align="right">${uiLabelMap.ManufacturingQuantity}</td> <td> </td> <td width="74%"><input type="text" name="quantity" <#if useValues>value="${(productAssoc.quantity)?if_exists}"<#else>value="${(request.getParameter("quantity"))?if_exists}"</#if> size="10" maxlength="15"/></td> </tr> - <tr> - <th width="26%" align="right">${uiLabelMap.ManufacturingScrapFactor}:</th> + <td width="26%" align="right">${uiLabelMap.ManufacturingScrapFactor}</td> <td> </td> <td width="74%"><input type="text" name="scrapFactor" <#if useValues>value="${(productAssoc.scrapFactor)?if_exists}"<#else>value="${(request.getParameter("scrapFactor"))?if_exists}"</#if> size="10" maxlength="15"/></td> </tr> - <tr> - <th width="26%" align="right">${uiLabelMap.ManufacturingFormula}:</th> + <td width="26%" align="right">${uiLabelMap.ManufacturingFormula}</td> <td> </td> <td width="74%"> <select name="estimateCalcMethod"> @@ -213,98 +211,116 @@ </select> </td> </tr> - <tr> - <th width="26%" align="right">${uiLabelMap.ManufacturingRoutingTask}:</th> + <td width="26%" align="right">${uiLabelMap.ManufacturingRoutingTask}</td> <td> </td> <td width="74%"> <input type="text" name="routingWorkEffortId" <#if useValues>value="${(productAssoc.routingWorkEffortId)?if_exists}"<#else>value="${(request.getParameter("routingWorkEffortId"))?if_exists}"</#if> size="10" maxlength="15"/> <a href="javascript:call_fieldlookup(document.editProductAssocForm.routingWorkEffortId,'<@ofbizUrl>LookupRoutingTask</@ofbizUrl>','none',640,460);"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> </td> </tr> - <tr> <td colspan="2"> </td> <td align="left"><input type="submit" <#if !(productAssoc?exists)>value="${uiLabelMap.CommonAdd}"<#else>value="${uiLabelMap.CommonEdit}"</#if>/></td> </tr> </table> </form> - <br/> - <#if productId?exists && product?exists> - <hr/> - <a name="components"></a> - <h2>${uiLabelMap.ManufacturingProductComponents}</h2> - - <table border="1" cellpadding="2" cellspacing="0"> - <tr> - <td><b>${uiLabelMap.ProductProductId}</b></td> - <td><b>${uiLabelMap.ProductProductName}</b></td> - <td><b>${uiLabelMap.CommonFromDate}</b></td> - <td><b>${uiLabelMap.CommonThruDate}</b></td> - <td><b>${uiLabelMap.CommonSequenceNum}</b></td> - <td><b>${uiLabelMap.CommonQuantity}</b></td> - <td><b>${uiLabelMap.ManufacturingScrapFactor}</b></td> - <td><b>${uiLabelMap.ManufacturingFormula}</b></td> - <td><b>${uiLabelMap.ManufacturingRoutingTask}</b></td> - <td><b> </b></td> - <td><b> </b></td> - </tr> - <#list assocFromProducts as assocFromProduct> - <#assign listToProduct = assocFromProduct.getRelatedOneCache("AssocProduct")> - <#assign curProductAssocType = assocFromProduct.getRelatedOneCache("ProductAssocType")> - <tr valign="middle"> - <td><a href="<@ofbizUrl>EditProductBom?productId=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td> - <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProductBom?productId=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td> - <td<#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> class="alert"</#if>> - ${(assocFromProduct.fromDate)?if_exists} </td> - <td<#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> class="alert"</#if>> - ${(assocFromProduct.thruDate)?if_exists} </td> - <td> ${(assocFromProduct.sequenceNum)?if_exists}</td> - <td> ${(assocFromProduct.quantity)?if_exists}</td> - <td> ${(assocFromProduct.scrapFactor)?if_exists}</td> - <td> ${(assocFromProduct.estimateCalcMethod)?if_exists}</td> - <td> ${(assocFromProduct.routingWorkEffortId)?if_exists}</td> - <td> - <a href="<@ofbizUrl>UpdateProductBom?UPDATE_MODE=DELETE&productId=${productId}&productIdTo=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(assocFromProduct.getTimestamp("fromDate").toString())}&useValues=true</@ofbizUrl>" class="buttontext"> - ${uiLabelMap.CommonDelete}</a> - </td> - <td> - <a href="<@ofbizUrl>EditProductBom?productId=${productId}&productIdTo=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(assocFromProduct.getTimestamp("fromDate").toString())}&useValues=true</@ofbizUrl>" class="buttontext"> - ${uiLabelMap.CommonEdit}</a> - </td> - </tr> - </#list> - </table> - - <hr/> - <h2>${uiLabelMap.ManufacturingProductComponentOf}</h2> - <table border="1" cellpadding="2" cellspacing="0"> - <tr> - <td><b>${uiLabelMap.ProductProductId}</b></td> - <td><b>${uiLabelMap.ProductProductName}</b></td> - <td><b>${uiLabelMap.CommonFromDate}</b></td> - <td><b>${uiLabelMap.CommonThruDate}</b></td> - <td><b>${uiLabelMap.CommonQuantity}</b></td> - <td><b> </b></td> - </tr> - <#list assocToProducts as assocToProduct> - <#assign listToProduct = assocToProduct.getRelatedOneCache("MainProduct")> - <#assign curProductAssocType = assocToProduct.getRelatedOneCache("ProductAssocType")> - <tr valign="middle"> - <td><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(assocToProduct.productId)?if_exists}</a></td> + </div> +</div> +<#if productId?exists && product?exists> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ManufacturingProductComponents}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <a name="components"></a> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.ProductProductId}</td> + <td>${uiLabelMap.ProductProductName}</td> + <td>${uiLabelMap.CommonFromDate}</td> + <td>${uiLabelMap.CommonThruDate}</td> + <td>${uiLabelMap.CommonSequenceNum}</td> + <td>${uiLabelMap.CommonQuantity}</td> + <td>${uiLabelMap.ManufacturingScrapFactor}</td> + <td>${uiLabelMap.ManufacturingFormula}</td> + <td>${uiLabelMap.ManufacturingRoutingTask}</td> + <td> </td> + <td> </td> + </tr> + <#assign alt_row = false> + <#list assocFromProducts as assocFromProduct> + <#assign listToProduct = assocFromProduct.getRelatedOneCache("AssocProduct")> + <#assign curProductAssocType = assocFromProduct.getRelatedOneCache("ProductAssocType")> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>EditProductBom?productId=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td> + <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProductBom?productId=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td> + <td<#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> class="alert"</#if>> + ${(assocFromProduct.fromDate)?if_exists} </td> + <td<#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> class="alert"</#if>> + ${(assocFromProduct.thruDate)?if_exists} </td> + <td> ${(assocFromProduct.sequenceNum)?if_exists}</td> + <td> ${(assocFromProduct.quantity)?if_exists}</td> + <td> ${(assocFromProduct.scrapFactor)?if_exists}</td> + <td> ${(assocFromProduct.estimateCalcMethod)?if_exists}</td> + <td> ${(assocFromProduct.routingWorkEffortId)?if_exists}</td> + <td> + <a href="<@ofbizUrl>UpdateProductBom?UPDATE_MODE=DELETE&productId=${productId}&productIdTo=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(assocFromProduct.getTimestamp("fromDate").toString())}&useValues=true</@ofbizUrl>" class="buttontext"> + ${uiLabelMap.CommonDelete}</a> + </td> + <td> + <a href="<@ofbizUrl>EditProductBom?productId=${productId}&productIdTo=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(assocFromProduct.getTimestamp("fromDate").toString())}&useValues=true</@ofbizUrl>" class="buttontext"> + ${uiLabelMap.CommonEdit}</a> + </td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </div> +</div> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ManufacturingProductComponentOf}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.ProductProductId}</td> + <td>${uiLabelMap.ProductProductName}</td> + <td>${uiLabelMap.CommonFromDate}</td> + <td>${uiLabelMap.CommonThruDate}</td> + <td>${uiLabelMap.CommonQuantity}</td> + <td> </td> + </tr> + <#assign alt_row = false> + <#list assocToProducts as assocToProduct> + <#assign listToProduct = assocToProduct.getRelatedOneCache("MainProduct")> + <#assign curProductAssocType = assocToProduct.getRelatedOneCache("ProductAssocType")> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(assocToProduct.productId)?if_exists}</a></td> <!-- <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProduct?productId=${(assocToProduct.productId)?if_exists}</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td> --> - <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td> - <td>${(assocToProduct.getTimestamp("fromDate"))?if_exists} </td> - <td>${(assocToProduct.getTimestamp("thruDate"))?if_exists} </td> - <td>${(assocToProduct.quantity)?if_exists} </td> - <td> + <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td> + <td>${(assocToProduct.getTimestamp("fromDate"))?if_exists} </td> + <td>${(assocToProduct.getTimestamp("thruDate"))?if_exists} </td> + <td>${(assocToProduct.quantity)?if_exists} </td> + <td> <a href="<@ofbizUrl>UpdateProductBom?UPDATE_MODE=DELETE&productId=${(assocToProduct.productId)?if_exists}&productIdTo=${(assocToProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(assocToProduct.getTimestamp("fromDate").toString())}&useValues=true</@ofbizUrl>" class="buttontext"> ${uiLabelMap.CommonDelete}</a> - </td> - </tr> - </#list> - </table> - - <br/> - NOTE: <b class="alert">Red</b> date/time entries denote that the current time is before the From Date or after the Thru Date. If the From Date is <b style="color: red;">red</b>, association has not started yet; if Thru Date is <b style="color: red;">red</b>, association has expired (<u>and should probably be deleted</u>). - </#if> + </td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + <br/> + ${uiLabelMap.CommonNote}: <b class="alert">${uiLabelMap.CommonRed}</b> ${uiLabelMap.ManufacturingNote1} <b style="color: red;">${uiLabelMap.CommonRed}</b>${uiLabelMap.ManufacturingNote2} <b style="color: red;">${uiLabelMap.CommonRed}</b>${uiLabelMap.ManufacturingNote3} + </div> +</div> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml?rev=614715&r1=614714&r2=614715&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml Wed Jan 23 14:31:35 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="lookupRouting" target="LookupRouting" title="" type="single"> + <form name="lookupRouting" target="LookupRouting" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="lookupRoutingTask" default-field-type="hidden"/> <field name="workEffortName"><text-find/></field> <field name="workEffortTypeId"><hidden value="ROUTING"/></field> @@ -30,7 +31,7 @@ <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> </form> <form name="listLookupRouting" list-name="listIt" title="" type="list" - paginate-target="LookupRouting" > + paginate-target="LookupRouting" 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"/> @@ -45,7 +46,8 @@ <field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityMinimum}"><display/></field> </form> - <form name="lookupRoutingTask" target="LookupRoutingTask" title="" type="single"> + <form name="lookupRoutingTask" target="LookupRoutingTask" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="lookupRoutingTask" default-field-type="find"/> <field name="workEffortTypeId"><hidden value="ROU_TASK"/></field> <field name="fixedAssetId" > @@ -62,7 +64,7 @@ <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> </form> <form name="listLookupRoutingTask" list-name="listIt" title="" type="list" - paginate-target="LookupRoutingTask" > + paginate-target="LookupRoutingTask" 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"/> @@ -77,4 +79,4 @@ <field name="estimatedSetupMillis" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}"><display/></field> <field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}"><display/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=614715&r1=614714&r2=614715&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Wed Jan 23 14:31:35 2008 @@ -52,7 +52,6 @@ <screen name="EditProductBom"> <section> <actions> - <set field="title" value="Edit Product Bill of Materials"/> <set field="titleProperty" value="PageTitleEditProductBom"/> <set field="tabButtonItem" value="EditProductBom"/> <!--<set field="labelTitleProperty" value="ProductProductBom"/>--> @@ -76,7 +75,6 @@ <screen name="EditProductManufacturingRules"> <section> <actions> - <set field="title" value="Edit Product Manufacturing rules"/> <set field="titleProperty" value="PageTitleEditProductManufacturingRules"/> <set field="tabButtonItem" value="productManufacturingRules"/> <!--<set field="labelTitleProperty" value="ProductProductBom"/>--> @@ -92,8 +90,34 @@ <widgets> <decorator-screen name="CommonBomDecorator"> <decorator-section name="body"> - <include-form name="UpdateProductManufacturingRule" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> - <include-form name="ListProductManufacturingRules" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductManufacturingRules}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="UpdateProductManufacturingRule" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductManufacturingRules}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListProductManufacturingRules" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -102,7 +126,6 @@ <screen name="BomSimulation"> <section> <actions> - <set field="title" value="Bill Of Materials Simulation"/> <set field="titleProperty" value="ManufacturingBomSimulation"/> <set field="tabButtonItem" value="findBom"/> <set field="headerItem" value="bom"/> @@ -126,7 +149,20 @@ <widgets> <decorator-screen name="CommonBomDecorator"> <decorator-section name="body"> - <include-form name="RunBomSimulation" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ManufacturingBomSimulation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="RunBomSimulation" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> + </widgets> + </section> + </container> + </container> <platform-specific> <html><html-template location="component://manufacturing/webapp/manufacturing/bom/BomSimulation.ftl"/></html> </platform-specific> @@ -135,5 +171,4 @@ </widgets> </section> </screen> -</screens> - +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml?rev=614715&r1=614714&r2=614715&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml Wed Jan 23 14:31:35 2008 @@ -40,8 +40,21 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <include-form name="lookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> - <include-form name="listLookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleLookupRouting}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="lookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + <include-form name="listLookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -67,11 +80,24 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <include-form name="lookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> - <include-form name="listLookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleLookupRoutingTask}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="lookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + <include-form name="listLookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |