svn commit: r608607 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: mrisaliti
Date: Thu Jan 3 11:39:12 2008 New Revision: 608607 URL: http://svn.apache.org/viewvc?rev=608607&view=rev Log: Facility/Groups/Locations/Roles/Inventory/Inventory Items forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1556) Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=608607&r1=608606&r2=608607&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Thu Jan 3 11:39:12 2008 @@ -197,6 +197,7 @@ PageTitleFindConfigItems=Find Config Items PageTitleFindFacility=Find Facility PageTitleFindFacilityGroup=Find Facility Group +PageTitleFindFacilityInventoryItems=Find Facility Inventory Items PageTitleFindFacilityLocation=Find Facility Location PageTitleFindFacilityPhysicalInventory=Find Facility Physical Inventory PageTitleFindFacilityTransfers=Find Facility Transfers @@ -235,6 +236,7 @@ PageTitlePickingViewStartedPicks=Picking : View Started Picks PageTitleQuickAddProductVariants=Quick Add Product Variants PageTitleSearchInventoryItems=Search Inventory Items +PageTitleSearchInventoryItemsByLabels=Search Inventory Items By Labels PageTitleSearchResults=Search Results PageTitleTransferInventoryItem=Transfer Inventory Item PageTitleViewFacilityContactMechanism=View Facility Contact Mechanism @@ -1514,6 +1516,7 @@ ProductWeight=Weight ProductWeightUnit=Weight Unit ProductWeightUomId=Weight Uom Id +ProductWholeSalePrice=Whole Sale Price ProductWidth=Width ProductWidthUomId=Width Uom Id ProductWorkEffort=Work Effort @@ -1972,4 +1975,7 @@ FormFieldTitle_addToCartReplaceUpsell=Add To Cart Replace Upsell FormFieldTitle_splitPayPrefPerShpGrp=Split Pay Pref Per Shp Grp FormFieldTitle_manualOnly=Manual Only -FormFieldTitle_creditCardEnumId=Credit Card Enum Id \ No newline at end of file +FormFieldTitle_creditCardEnumId=Credit Card Enum Id +FormFieldTitle_datetimeReceived=Date Time Received +FormFieldTitle_softIdentifier=Soft Identifier +FormFieldTitle_quantityOnHandTotal=Quantity On Hand Total \ No newline at end of file Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=608607&r1=608606&r2=608607&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Thu Jan 3 11:39:12 2008 @@ -195,6 +195,7 @@ PageTitleFindConfigItems=Ricerca Righe Configurazioni PageTitleFindFacility=Ricerca Stabilimento PageTitleFindFacilityGroup=Ricerca Gruppo Stabilimento +PageTitleFindFacilityInventoryItems=Ricerca Righe Inventario PageTitleFindFacilityLocation=Ricerca Posizione Stabilimento PageTitleFindFacilityPhysicalInventory=Ricerca Stabilimento Inventario Fisico PageTitleFindFacilityTransfers=Ricerca Trasferimenti Stabilimento @@ -233,6 +234,7 @@ PageTitlePickingViewStartedPicks=Prelievo : Mostra Inizio Prelievo PageTitleQuickAddProductVariants=Aggiunta Veloce Varianti Prodotto PageTitleSearchInventoryItems=Ricerca Righe Inventario +PageTitleSearchInventoryItemsByLabels=Ricerca Righe Inventario Per Etichetta PageTitleSearchResults=Risultati Ricerca PageTitleTransferInventoryItem=Trasferimento Riga Inventario PageTitleViewFacilityContactMechanism=Mostra Contatto Stabilimento @@ -499,7 +501,7 @@ ProductCreateNewCategory=Creare Nuova Categoria ProductCreateNewFacility=Creare Nuova Stabilimento ProductCreateNewFeature=Creare Nuova Caratteristica -ProductCreateNewInventoryItemFacility=Creare Nuova Riga Inventario per questa Stabilimento +ProductCreateNewInventoryItemFacility=Creare Nuova Riga Inventario per questo Stabilimento ProductCreateNewInventoryItemProduct=Creare Nuova Riga Inventario per questo Prodotto ProductCreateNewProdCatalog=Creare Nuovo Prodotto Catalogo ProductCreateNewProduct=Creare Nuovo Prodotto @@ -531,6 +533,7 @@ ProductDateReceived=Data Ricezione ProductDaysToShip=Giorni Alla Spedizione ProductDefaultAmount=Importo di Default +ProductDefaultDaysToShip=Giorni di Default per la Spedizione ProductDefaultPrice=Prezzo di Default ProductDefaultSequenceNumber=Numero di Sequenza Default ProductDefaultsTo=Default \u00e8 @@ -744,6 +747,9 @@ ProductInventoryItemsDetails=Movimenti ProductInventoryItemsDetailsFor=Movimenti per ProductInventoryItemsToPick=Righe Inventario da Prelevare +ProductInventoryItemTotals=Totali Righe Inventario +ProductInventoryItemTotalsExport=Esporta Totali Righe Inventario +ProductInventoryItemGrandTotals=Totale Generale Righe Inventario ProductInventoryMessage=Messaggio Inventario ProductInventoryReceive=Ricevi Inventario ProductInventoryRequiredProduct=L'inventario dovrebbe essere richiesto per acquistare questo prodotto? Se non specificato defaults \u00e8 dalle impostazioni del Catalogo. @@ -1250,6 +1256,7 @@ ProductSearchResultsFound=Il Codice \u00e8 il valore attuale di questo prodotto. ProductSearchResultsWithIdValue=Risultati Ricerca per Prodotto con Codice ProductSearchinCategory=Ricerca nella Categoria +ProductSearchInventoryItemsByLabels=Ricerca per Etichetta ProductSection=Sezione ProductSegment=Segmento ProductSegmentGroupId=Codice Gruppo Segmento @@ -1485,6 +1492,7 @@ ProductWeight=Peso ProductWeightUnit=Unit\u00e0 Peso ProductWeightUomId=UdM Peso +ProductWholeSalePrice=Prezzo all\'Ingrosso ProductWidth=Larghezza ProductWidthUomId=UdM Larghezza ProductWorkEffort=Impegno di Lavoro @@ -1942,4 +1950,7 @@ FormFieldTitle_addToCartReplaceUpsell=Aggiunta al Carrello Sostituisce Upsell FormFieldTitle_splitPayPrefPerShpGrp=Suddividere Preferenze Pagamento Per Gruppo di Spedizione FormFieldTitle_manualOnly=Solo Manuale -FormFieldTitle_creditCardEnumId=Tipo Carta di Credito \ No newline at end of file +FormFieldTitle_creditCardEnumId=Tipo Carta di Credito +FormFieldTitle_datetimeReceived=Data Ora Ricezione +FormFieldTitle_softIdentifier=Identificativo +FormFieldTitle_quantityOnHandTotal=Totale Quantit\u00e0 Disponibile \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=608607&r1=608606&r2=608607&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Thu Jan 3 11:39:12 2008 @@ -18,8 +18,7 @@ --> <#if security.hasEntityPermission("FACILITY", "_VIEW", session)> - -<span class="head1">${uiLabelMap.ProductFacility}</span> <span class='head2'>${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span> +<span class="head1">${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span> <br/> <div class="button-bar"> <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" name="EditFacilityForm" class="buttontext">${uiLabelMap.ProductNewFacility}</a> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=608607&r1=608606&r2=608607&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Thu Jan 3 11:39:12 2008 @@ -16,92 +16,92 @@ specific language governing permissions and limitations under the License. --> - -<style type="text/css"> -.button-col form a, -.button-col form input { -float: left; -} -</style> - - <span class="head1">${uiLabelMap.ProductLocationFor}</span> <span class="head2"><#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}: ${facilityId?if_exists}]</span> - <div class="button-bar"> - <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> - <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a> - <#if facilityId?exists && locationSeqId?exists> - <a href="<@ofbizUrl>EditInventoryItem?facilityId=${facilityId}&locationSeqId=${locationSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewInventoryItem}</a> - </#if> - </div> - - <#if facilityId?exists && !(facilityLocation?exists)> - <form action="<@ofbizUrl>CreateFacilityLocation</@ofbizUrl>" method="post" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${facilityId}"> - <table class="basic-table" cellspacing="0"> - <#elseif facilityLocation?exists> - <form action="<@ofbizUrl>UpdateFacilityLocation</@ofbizUrl>" method="post" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> - <input type="hidden" name="locationSeqId" value="${locationSeqId}"> - <table class="basic-table" cellspacing="0"> - <tr> - <td class="label">${uiLabelMap.ProductFacilityId}</td> - <td>${facilityId?if_exists}</td> - </tr> - <tr> - <td class="label">${uiLabelMap.ProductLocationSeqId}</td> - <td>${locationSeqId}</td> - </tr> - <#else> - <h1>${uiLabelMap.ProductNotCreateLocationFacilityId}</h1> - </#if> - - <#if facilityId?exists> - <tr> - <td class="label">${uiLabelMap.ProductType}</td> - <td> - <select name="locationTypeEnumId"> - <#if (facilityLocation.locationTypeEnumId)?has_content> - <#assign locationTypeEnum = facilityLocation.getRelatedOneCache("TypeEnumeration")?if_exists> - <option value="${facilityLocation.locationTypeEnumId}">${(locationTypeEnum.get("description",locale))?default(facilityLocation.locationTypeEnumId)}</option> - <option value="${facilityLocation.locationTypeEnumId}">----</option> - </#if> - <#list locationTypeEnums as locationTypeEnum> - <option value="${locationTypeEnum.enumId}">${locationTypeEnum.get("description",locale)}</option> - </#list> - </select> - </td> - </tr> - <tr> - <td class="label">${uiLabelMap.CommonArea}</td> - <td><input type="text" name="areaId" value="${(facilityLocation.areaId)?if_exists}" size="19" maxlength="20"></td> - </tr> - <tr> - <td class="label">${uiLabelMap.ProductAisle}</td> - <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)?if_exists}" size="19" maxlength="20"></td> - </tr> - <tr> - <td class="label">${uiLabelMap.ProductSection}</td> - <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)?if_exists}" size="19" maxlength="20"></td> - </tr> - <tr> - <td class="label">${uiLabelMap.ProductLevel}</td> - <td><input type="text" name="levelId" value="${(facilityLocation.levelId)?if_exists}" size="19" maxlength="20"></td> - </tr> - <tr> - <td class="label">${uiLabelMap.ProductPosition}</td> - <td><input type="text" name="positionId" value="${(facilityLocation.positionId)?if_exists}" size="19" maxlength="20"></td> - </tr> - <tr> - <td> </td> - <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td> - </tr> - </table> - </form> - - <hr/> - +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.PageTitleEditFacilityLocation}</h3> + </div> + <div class="screenlet-body"> + <span class="head1">${uiLabelMap.ProductLocationFor}</span> <span class="head2"><#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}: ${facilityId?if_exists}]</span> + <div class="button-bar"> + <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> + <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a> + <#if facilityId?exists && locationSeqId?exists> + <a href="<@ofbizUrl>EditInventoryItem?facilityId=${facilityId}&locationSeqId=${locationSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewInventoryItem}</a> + </#if> + </div> + + <#if facilityId?exists && !(facilityLocation?exists)> + <form action="<@ofbizUrl>CreateFacilityLocation</@ofbizUrl>" method="post" style="margin: 0;"> + <input type="hidden" name="facilityId" value="${facilityId}"> + <table class="basic-table" cellspacing="0"> + <#elseif facilityLocation?exists> + <form action="<@ofbizUrl>UpdateFacilityLocation</@ofbizUrl>" method="post" style="margin: 0;"> + <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> + <input type="hidden" name="locationSeqId" value="${locationSeqId}"> + <table class="basic-table" cellspacing="0"> + <tr> + <td class="label">${uiLabelMap.ProductFacilityId}</td> + <td>${facilityId?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.ProductLocationSeqId}</td> + <td>${locationSeqId}</td> + </tr> + <#else> + <h1>${uiLabelMap.ProductNotCreateLocationFacilityId}</h1> + </#if> + + <#if facilityId?exists> + <tr> + <td class="label">${uiLabelMap.ProductType}</td> + <td> + <select name="locationTypeEnumId"> + <#if (facilityLocation.locationTypeEnumId)?has_content> + <#assign locationTypeEnum = facilityLocation.getRelatedOneCache("TypeEnumeration")?if_exists> + <option value="${facilityLocation.locationTypeEnumId}">${(locationTypeEnum.get("description",locale))?default(facilityLocation.locationTypeEnumId)}</option> + <option value="${facilityLocation.locationTypeEnumId}">----</option> + </#if> + <#list locationTypeEnums as locationTypeEnum> + <option value="${locationTypeEnum.enumId}">${locationTypeEnum.get("description",locale)}</option> + </#list> + </select> + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonArea}</td> + <td><input type="text" name="areaId" value="${(facilityLocation.areaId)?if_exists}" size="19" maxlength="20"></td> + </tr> + <tr> + <td class="label">${uiLabelMap.ProductAisle}</td> + <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)?if_exists}" size="19" maxlength="20"></td> + </tr> + <tr> + <td class="label">${uiLabelMap.ProductSection}</td> + <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)?if_exists}" size="19" maxlength="20"></td> + </tr> + <tr> + <td class="label">${uiLabelMap.ProductLevel}</td> + <td><input type="text" name="levelId" value="${(facilityLocation.levelId)?if_exists}" size="19" maxlength="20"></td> + </tr> + <tr> + <td class="label">${uiLabelMap.ProductPosition}</td> + <td><input type="text" name="positionId" value="${(facilityLocation.positionId)?if_exists}" size="19" maxlength="20"></td> + </tr> + <tr> + <td> </td> + <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td> + </tr> + </table> + </form> + </div> +</div> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.ProductLocationProduct}</h3> + </div> + <div class="screenlet-body"> <#-- ProductFacilityLocation stuff --> - <h2>${uiLabelMap.ProductLocationProduct}:</h2> - <table class="basic-table" cellspacing="0"> + <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.ProductProduct}</td> <td>${uiLabelMap.ProductMinimumStockAndMoveQuantity}</td> @@ -110,7 +110,7 @@ <#assign product = productFacilityLocation.getRelatedOne("Product")?if_exists> <tr> <td><#if product?exists>${(product.internalName)?if_exists}</#if>[${productFacilityLocation.productId}]</td> - <td class="button-col"> + <td> <form method="post" action="<@ofbizUrl>updateProductFacilityLocation</@ofbizUrl>" name="lineForm${productFacilityLocation_index}"> <input type="hidden" name="productId" value="${(productFacilityLocation.productId)?if_exists}"/> <input type="hidden" name="facilityId" value="${(productFacilityLocation.facilityId)?if_exists}"/> @@ -118,21 +118,28 @@ <input type="text" size="10" name="minimumStock" value="${(productFacilityLocation.minimumStock)?if_exists}"/> <input type="text" size="10" name="moveQuantity" value="${(productFacilityLocation.moveQuantity)?if_exists}"/> <input type="submit" value="${uiLabelMap.CommonUpdate}"/> - <a href="<@ofbizUrl>deleteProductFacilityLocation?productId=${(productFacilityLocation.productId)?if_exists}&facilityId=${(productFacilityLocation.facilityId)?if_exists}&locationSeqId=${(productFacilityLocation.locationSeqId)?if_exists}</@ofbizUrl>">${uiLabelMap.CommonDelete}</a> + <a href="<@ofbizUrl>deleteProductFacilityLocation?productId=${(productFacilityLocation.productId)?if_exists}&facilityId=${(productFacilityLocation.facilityId)?if_exists}&locationSeqId=${(productFacilityLocation.locationSeqId)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </td> </tr> </#list> </table> - <br/> - <h2>${uiLabelMap.ProductAddProduct}:</h2> + </div> +</div> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.ProductAddProduct}</h3> + </div> + <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>createProductFacilityLocation</@ofbizUrl>" style="margin: 0;" name="createProductFacilityLocationForm"> <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> <input type="hidden" name="locationSeqId" value="${locationSeqId?if_exists}"> <input type="hidden" name="useValues" value="true"> - ${uiLabelMap.ProductProductId}: <input type="text" size="10" name="productId"> - ${uiLabelMap.ProductMinimumStock}: <input type="text" size="10" name="minimumStock"> - ${uiLabelMap.ProductMoveQuantity}: <input type="text" size="10" name="moveQuantity"> + <span class="label">${uiLabelMap.ProductProductId}</span><input type="text" size="10" name="productId"> + <span class="label">${uiLabelMap.ProductMinimumStock}</span><input type="text" size="10" name="minimumStock"> + <span class="label">${uiLabelMap.ProductMoveQuantity}</span><input type="text" size="10" name="moveQuantity"> <input type="submit" value="${uiLabelMap.CommonAdd}"> </form> - </#if> + </div> +</div> + </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=608607&r1=608606&r2=608607&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Thu Jan 3 11:39:12 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="FindFacility" type="list" list-name="facilities"> + <form name="FindFacility" type="list" list-name="facilities" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="facilityId" widget-style="buttontext"> <hyperlink target="EditFacility?facilityId=${facilityId}" description="${facilityId}"/> </field> @@ -35,7 +36,8 @@ <hyperlink target="EditFacility?facilityId=${facilityId}" description="${uiLabelMap.CommonEdit}"/> </field> </form> - <form name="SearchInventoryItemsParams" type="single" target="EditFacilityInventoryItems"> + <form name="SearchInventoryItemsParams" type="single" target="EditFacilityInventoryItems" + header-row-style="header-row" default-table-style="basic-table"> <field name="facilityId"> <drop-down allow-empty="false"> <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName} [${facilityId}]"> @@ -59,7 +61,7 @@ </field> </form> <form name="ListFacilityInventoryItems" type="list" target="" title="" list-name="listIt" - paginate-target="EditFacilityInventoryItems"> + paginate-target="EditFacilityInventoryItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="results" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -70,12 +72,12 @@ <field name="inventoryItemId" widget-style="buttontext"> <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/> </field> - <field name="inventoryItemTypeId"> + <field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}"> <display-entity entity-name="InventoryItemType"/> </field> <field name="statusId"><display/></field> <field name="datetimeReceived"><display/></field> - <field name="expireDate"><display/></field> + <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field> <field name="productId"> <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> </field> @@ -86,37 +88,39 @@ <field name="enumId" entry-name="locationTypeEnumId" title="${uiLabelMap.CommonType}"> <display-entity entity-name="Enumeration"/> </field> - <field name="lotId"><display/></field> - <field name="binNumber"><display/></field> + <field name="lotId" title="${uiLabelMap.ProductLotId}"><display/></field> + <field name="binNumber" title="${ProductBinNumber}"><display/></field> <field name="serialNumber"><display/></field> <field name="softIdentifier"><display/></field> <field name="quantityOnHandTotal"><display description="${availableToPromiseTotal} / ${quantityOnHandTotal}"/></field> - <field name="transfer" entry-name="inventoryItemId" widget-style="buttontext"> + <field name="transfer" title="${uiLabelMap.ProductTransfer}" entry-name="inventoryItemId" widget-style="buttontext"> <hyperlink target="TransferInventoryItem?facilityId=${facilityId}&inventoryItemId=${inventoryItemId}" description="${uiLabelMap.ProductTransfer}"/> </field> </form> <form name="ListFacilityInventoryItemsNoLocations" type="list" target="" title="" list-name="inventoryItems" - override-list-size="${inventoryItemsSize}" paginate-target="SearchInventoryItemsByLabels"> + override-list-size="${inventoryItemsSize}" paginate-target="SearchInventoryItemsByLabels" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="inventoryItemId" widget-style="buttontext"> <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/> </field> - <field name="inventoryItemTypeId"> + <field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}"> <display-entity entity-name="InventoryItemType"/> </field> <field name="statusId"><display/></field> <field name="datetimeReceived"><display/></field> - <field name="expireDate"><display/></field> + <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field> <field name="productId"> <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> </field> - <field name="lotId"><display/></field> - <field name="binNumber"><display/></field> + <field name="lotId" title="${uiLabelMap.ProductLotId}"><display/></field> + <field name="binNumber" title="${ProductBinNumber}"><display/></field> <field name="serialNumber"><display/></field> <field name="softIdentifier"><display/></field> <field name="quantityOnHandTotal"><display description="${availableToPromiseTotal} / ${quantityOnHandTotal}"/></field> </form> - <form name="SearchInventoryItemsDetailsParams" type="single" target="ViewFacilityInventoryItemsDetails"> + <form name="SearchInventoryItemsDetailsParams" type="single" target="ViewFacilityInventoryItemsDetails" + header-row-style="header-row" default-table-style="basic-table"> <field name="facilityId"> <drop-down allow-empty="false"> <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName} [${facilityId}]"> @@ -160,7 +164,8 @@ <submit button-type="button"/> </field> </form> - <form name="ListFacilityInventoryItemsDetailsByItem" type="list" target="" title="" list-name="listIt"> + <form name="ListFacilityInventoryItemsDetailsByItem" type="list" target="" title="" list-name="listIt" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="results" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -210,7 +215,8 @@ <field name="returnId" position="2"><display/></field> <field name="returnItemSeqId" position="2"><display/></field> </form> - <form name="ListFacilityInventoryItemsDetailsByProduct" type="list" target="" title="" list-name="listIt"> + <form name="ListFacilityInventoryItemsDetailsByProduct" type="list" target="" title="" list-name="listIt" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="results" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -252,7 +258,8 @@ <field name="returnId" position="2"><display/></field> <field name="returnItemSeqId" position="2"><display/></field> </form> - <form name="ListFacilityInventoryItemsDetailsByDate" type="list" target="" title="" list-name="listIt"> + <form name="ListFacilityInventoryItemsDetailsByDate" type="list" target="" title="" list-name="listIt" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="results" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -292,16 +299,16 @@ </form> <form name="FindFacilityInventoryByProduct" type="single" target="${facilityInventoryByProductScreen}" title="" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <field name="facilityId"><hidden/></field> <field name="action"><hidden value="SEARCH"/></field> - <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="inputBox"> + <field name="productId" title="${uiLabelMap.ProductProductId}"> <text/> </field> - <field name="internalName" title="${uiLabelMap.ProductInternalName}" widget-style="inputBox"> + <field name="internalName" title="${uiLabelMap.ProductInternalName}"> <text/> </field> - <field name="productTypeId" title="${uiLabelMap.ProductProductType}" widget-style="selectBox"> + <field name="productTypeId" title="${uiLabelMap.ProductProductType}"> <drop-down allow-empty="true" no-current-selected-key="FINISHED_GOOD"> <entity-options entity-name="ProductType" description="${description}"> <!-- [${productTypeId}] --> <entity-constraint name="isPhysical" value="Y" operator="equals"/> @@ -311,7 +318,7 @@ </drop-down> </field> <field name="searchInProductCategoryId" title="${uiLabelMap.ProductCategory}"><lookup target-form-name="LookupProductCategory"></lookup></field> - <field name="productSupplierId" title="${uiLabelMap.ProductSupplier}" widget-style="selectBox"> + <field name="productSupplierId" title="${uiLabelMap.ProductSupplier}"> <drop-down allow-empty="true"> <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} [${partyId}]"> <entity-constraint name="roleTypeId" value="SUPPLIER" operator="equals"/> @@ -319,19 +326,19 @@ </entity-options> </drop-down> </field> - <field name="offsetQOHQty" title="${uiLabelMap.ProductQtyOffsetQOHBelow}" widget-style="inputBox"><text/></field> - <field name="offsetATPQty" title="${uiLabelMap.ProductQtyOffsetATPBelow}" widget-style="inputBox"><text/></field> - <field name="productsSoldThruTimestamp" title="${uiLabelMap.ProductShowProductsSoldThruTimestamp}" widget-style="inputBox"> + <field name="offsetQOHQty" title="${uiLabelMap.ProductQtyOffsetQOHBelow}"><text/></field> + <field name="offsetATPQty" title="${uiLabelMap.ProductQtyOffsetATPBelow}"><text/></field> + <field name="productsSoldThruTimestamp" title="${uiLabelMap.ProductShowProductsSoldThruTimestamp}"> <date-time default-value="${bsh: org.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/> </field> - <field name="VIEW_SIZE" entry-name="viewSize" title="${uiLabelMap.ProductShowProductsPerPage}" widget-style="inputBox"><text/></field> - <field name="monthsInPastLimit" entry-name="monthsInPastLimit" title="monthsInPastLimit" widget-style="inputBox"><text/></field> + <field name="VIEW_SIZE" entry-name="viewSize" title="${uiLabelMap.ProductShowProductsPerPage}"><text/></field> + <field name="monthsInPastLimit" entry-name="monthsInPastLimit"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> <submit button-type="button"/> </field> </form> <form name="ListFacilityInventoryByProduct" type="list" target="" title="" list-name="inventoryByProduct" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="${facilityInventoryByProductScreen}" override-list-size="${overrideListSize}"> <row-actions> <service service-name="getProductInventoryAndFacilitySummary" result-map-name="resultMap"> @@ -344,28 +351,28 @@ <field name="items" title="${uiLabelMap.ProductProductId}" widget-style="buttontext"> <hyperlink target="EditFacilityInventoryItems?productId=${productId}&facilityId=${facilityId}" description="${productId}"/> </field> - <field name="productId" title="${uiLabelMap.CommonDescription}" widget-area-style="tabletext"> + <field name="productId" title="${uiLabelMap.CommonDescription}"> <display-entity entity-name="Product" description="${internalName}"> <sub-hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${uiLabelMap.ProductCatalog}" link-style="buttontext"/> </display-entity> </field> - <field name="totalAvailableToPromise" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductAtp}" widget-area-style="tabletextright"><display description="${resultMap.totalAvailableToPromise}"/></field> - <field name="totalQuantityOnHand" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductQoh}" widget-area-style="tabletextright"><display description="${resultMap.totalQuantityOnHand}"/></field> - <field name="quantityOnOrder" title="${uiLabelMap.ProductOrderedQuantity}" widget-area-style="tabletextright"><display description="${resultMap.quantityOnOrder}"/></field> - <field name="minimumStock" title="${uiLabelMap.ProductMinimumStock}" widget-area-style="tabletextright"><display /></field> - <field name="reorderQuantity" title="${uiLabelMap.ProductReorderQuantity}" widget-area-style="tabletextright"><display/></field> - <field name="daysToShip" title="${uiLabelMap.ProductDaysToShip}" widget-area-style="tabletextright"><display/></field> - <field name="offsetQOHQtyAvailable" title="${uiLabelMap.ProductQtyOffsetQOH}" widget-area-style="tabletextright"><display description="${resultMap.offsetQOHQtyAvailable}"/></field> - <field name="offsetATPQtyAvailable" title="${uiLabelMap.ProductQtyOffsetATP}" widget-area-style="tabletextright"><display description="${resultMap.offsetATPQtyAvailable}"/></field> - <field name="usageQuantity" title="${uiLabelMap.ProductUsage}" widget-area-style="tabletextright"><display description="${resultMap.usageQuantity}"/></field> - <field name="defultPrice" title="Default Price" widget-area-style="tabletextright"><display description="${resultMap.defultPrice}"/></field> - <field name="listPrice" title="List Price" widget-area-style="tabletextright"><display description="${resultMap.listPrice}"/></field> - <field name="wholeSalePrice" title="Whole Sale Price" widget-area-style="tabletextright"><display description="${resultMap.wholeSalePrice}"/></field> + <field name="totalAvailableToPromise" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductAtp}"><display description="${resultMap.totalAvailableToPromise}"/></field> + <field name="totalQuantityOnHand" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductQoh}"><display description="${resultMap.totalQuantityOnHand}"/></field> + <field name="quantityOnOrder" title="${uiLabelMap.ProductOrderedQuantity}"><display description="${resultMap.quantityOnOrder}"/></field> + <field name="minimumStock" title="${uiLabelMap.ProductMinimumStock}"><display /></field> + <field name="reorderQuantity" title="${uiLabelMap.ProductReorderQuantity}"><display/></field> + <field name="daysToShip" title="${uiLabelMap.ProductDaysToShip}"><display/></field> + <field name="offsetQOHQtyAvailable" title="${uiLabelMap.ProductQtyOffsetQOH}"><display description="${resultMap.offsetQOHQtyAvailable}"/></field> + <field name="offsetATPQtyAvailable" title="${uiLabelMap.ProductQtyOffsetATP}"><display description="${resultMap.offsetATPQtyAvailable}"/></field> + <field name="usageQuantity" title="${uiLabelMap.ProductUsage}"><display description="${resultMap.usageQuantity}"/></field> + <field name="defaultPrice" title="${uiLabelMap.ProductDefaultPrice}"><display description="${resultMap.defultPrice}"/></field> + <field name="listPrice" title="${uiLabelMap.ProductListPrice}"><display description="${resultMap.listPrice}"/></field> + <field name="wholeSalePrice" title="${uiLabelMap.ProductWholeSalePrice}"><display description="${resultMap.wholeSalePrice}"/></field> </form> <!-- multi-form for list of packages ready to be weighted and scheduled for shipment --> <form name="SchedulingList" type="multi" use-row-submit="true" list-name="shipmentRouteSegments" title="${uiLabelMap.PageTitlePackageShipmentScheduling}" target="BatchScheduleShipmentRouteSegments?facilityId=${facilityId}" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" separate-columns="true"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <field name="shipmentId" title="${uiLabelMap.ProductShipmentId}"> <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}"/> </field> @@ -401,7 +408,7 @@ <!-- multi-form to print confirmed shipping labels and to mark shipment route segments as accepted (to see how this dual-action multi form works, see batchPrintMarkAsAccepted.ftl) --> <form name="Labels" type="multi" use-row-submit="true" list-name="shipmentPackageRouteSegments" title="" target="BatchPrintShippingLabels" separate-columns="true" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="shipmentId" title="${uiLabelMap.ProductShipmentId}"> <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}"/> </field> @@ -428,7 +435,7 @@ </form> <form name="FindPhysicalInventory" type="single" target="FindFacilityPhysicalInventory" title="" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <field name="facilityId"><hidden/></field> <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="inputBox"> <text/> @@ -441,7 +448,7 @@ </field> </form> <form name="ListPhysicalInventory" type="multi" list-name="physicalInventory" target="createPhysicalVariances?facilityId=${parameters.facilityId}&productId=${parameters.productId}&internalName=${parameters.internalName}" use-row-submit="true" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" separate-columns="true"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <field name="inventoryItemId" widget-style="buttontext"> <hyperlink description="${inventoryItemId}" target="EditInventoryItem?inventoryItemId=${inventoryItemId}"/> </field> @@ -466,25 +473,27 @@ </field> </form> <!-- FacilityGroups --> - <form name="EditFacilityGroups" type="list" target="updateGroupToFacility" paginate-target="EditFacilityGroups" title="" list-name="facilityGroupMembers"> + <form name="EditFacilityGroups" type="list" target="updateGroupToFacility" paginate-target="EditFacilityGroups" title="" list-name="facilityGroupMembers" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="FacilityGroupMember"/> <field name="facilityId"><hidden/></field> - <field name="facilityGroupId"> + <field name="facilityGroupId" title="${uiLabelMap.ProductFacilityGroupId}"> <display-entity entity-name="FacilityGroup" key-field-name="facilityGroupId" description="${facilityGroupName}"> <sub-hyperlink target="EditFacilityGroup?facilityGroupId=${facilityGroupId}" description="[${facilityGroupId}]"/> </display-entity> </field> <field name="fromDate"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="deleteLink" title="" widget-style="buttontext"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="removeGroupFromFacility?facilityId=${facilityId}&facilityGroupId=${facilityGroupId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="addGroupToFacility" type="single" target="addGroupToFacility" title=""> + <form name="addGroupToFacility" type="single" target="addGroupToFacility" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="FacilityGroupMember"/> <field name="facilityId"><hidden/></field> - <field name="facilityGroupId"> + <field name="facilityGroupId" title="${uiLabelMap.ProductFacilityGroupId}"> <drop-down allow-empty="true"> <entity-options entity-name="FacilityGroup" key-field-name="facilityGroupId" description="${facilityGroupName}"/> </drop-down> @@ -492,7 +501,8 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> <!-- FacilityRoles --> - <form name="EditFacilityRoles" type="list" paginate-target="EditFacilityRoles" title="" list-name="facilityRoles"> + <form name="EditFacilityRoles" type="list" paginate-target="EditFacilityRoles" title="" list-name="facilityRoles" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="FacilityRole" default-field-type="display"/> <field name="facilityId"><hidden/></field> <field name="partyId"> @@ -506,7 +516,8 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="AddPartyToFacility" type="single" target="addPartyToFacility" title=""> + <form name="AddPartyToFacility" type="single" target="addPartyToFacility" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="FacilityRole"/> <field name="facilityId"><hidden/></field> <field name="partyId"> @@ -520,7 +531,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> <form name="ListInventoryItemTotals" type="list" target="" title="" list-name="inventoryItemTotals" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="InventoryItemTotals" override-list-size="${overrideListSize}"> <field name="inventoryItemGrandTotals"><hidden/></field> @@ -532,14 +543,15 @@ <field name="totalCostPrice" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductCostPrice}" widget-area-style="tabletextright"><display/></field> <field name="totalRetailPrice" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductRetailPrice}" widget-area-style="tabletextright"><display/></field> </form> - <form name="ListInventoryItemGrandTotals" type="list" list-name="inventoryItemGrandTotals"> + <form name="ListInventoryItemGrandTotals" type="list" list-name="inventoryItemGrandTotals" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="qohGrandTotal" title="${uiLabelMap.ProductQoh} ${uiLabelMap.CommonTotal} ${uiLabelMap.CommonQty}" widget-area-style="tabletextright"><display/></field> <field name="atpGrandTotal" title="${uiLabelMap.ProductAtp} ${uiLabelMap.CommonTotal} ${uiLabelMap.CommonQty}" widget-area-style="tabletextright"><display/></field> <field name="totalCostPriceGrandTotal" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductCostPrice}" widget-area-style="tabletextright"><display/></field> <field name="totalRetailPriceGrandTotal" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductRetailPrice}" widget-area-style="tabletextright"><display/></field> </form> - <form name="InventoryItemTotalsExport" type="list" list-name="inventoryItemTotals"> - + <form name="InventoryItemTotalsExport" type="list" list-name="inventoryItemTotals" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="productId" title="${uiLabelMap.ProductProductId}"><display/></field> <field name="separator0" title=","><display description=","/></field> <field name="quot0" title="""><display description="""/></field> @@ -566,7 +578,8 @@ <field name="totalRetailPrice" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductRetailPrice}"><display/></field> <field name="quot11" title="""><display description="""/></field> </form> - <form name="InventoryItemGrandTotalsExport" type="list" list-name="inventoryItemGrandTotals"> + <form name="InventoryItemGrandTotalsExport" type="list" list-name="inventoryItemGrandTotals" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="quot0" title="""><display description="""/></field> <field name="qohGrandTotal" title="${uiLabelMap.ProductQoh} ${uiLabelMap.CommonTotal} ${uiLabelMap.CommonQty}"><display/></field> <field name="quot1" title="""><display description="""/></field> @@ -584,7 +597,8 @@ <field name="quot7" title="""><display description="""/></field> </form> - <form name="ToFacilityTransfers" type="list" target="" title="" list-name="toTransfers"> + <form name="ToFacilityTransfers" type="list" target="" title="" list-name="toTransfers" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> <entity-one entity-name="InventoryItem" value-name="inventoryItem"> <field-map field-name="inventoryItemId"/> @@ -620,7 +634,8 @@ <display-entity entity-name="StatusItem"/> </field> </form> - <form name="FromFacilityTransfers" type="list" target="" title="" list-name="fromTransfers"> + <form name="FromFacilityTransfers" type="list" target="" title="" list-name="fromTransfers" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> <entity-one entity-name="InventoryItem" value-name="inventoryItem"> <field-map field-name="inventoryItemId"/> @@ -656,7 +671,8 @@ </field> </form> - <form name="FromFacilityTransfersComplete" type="multi" target="CompleteRequestedTransfers?completeRequested=true&facilityId=${facilityId}" title="" list-name="fromTransfers"> + <form name="FromFacilityTransfersComplete" type="multi" target="CompleteRequestedTransfers?completeRequested=true&facilityId=${facilityId}" title="" list-name="fromTransfers" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> <entity-one entity-name="InventoryItem" value-name="inventoryItem"> <field-map field-name="inventoryItemId"/> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=608607&r1=608606&r2=608607&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Thu Jan 3 11:39:12 2008 @@ -78,7 +78,7 @@ <br/> <span class="head1">${uiLabelMap.CommonFound}: </span><span class="head2"><b>${foundLocations.size()}</b> ${uiLabelMap.ProductLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [ID:${facilityId?if_exists}]</span> <br/> - <table class="basic-table hover-bar" cellspacing="0"> + <table class="basic-table hover-bar hover-bar" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.ProductFacility}</td> <td>${uiLabelMap.ProductLocationSeqId}</td> @@ -90,10 +90,10 @@ <td>${uiLabelMap.ProductPosition}</td> <td> </td> </tr> - <#assign alt_row = false> + <#assign rowClass = "2"> <#list foundLocations as location> <#assign locationTypeEnum = location.getRelatedOneCache("TypeEnumeration")?if_exists> - <tr<#if alt_row> class="alternate-row"</#if>> + <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td><a href="<@ofbizUrl>EditFacility?facilityId=${(location.facilityId)?if_exists}</@ofbizUrl>">${(location.facilityId)?if_exists}</a></td> <td><a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>">${(location.locationSeqId)?if_exists}</a></td> <td>${(locationTypeEnum.get("description",locale))?default(location.locationTypeEnumId?if_exists)}</td> @@ -110,7 +110,12 @@ <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${(location.facilityId)?if_exists}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> </td> </tr> - <#assign alt_row = !alt_row> + <#-- toggle the row color --> + <#if rowClass == "2"> + <#assign rowClass = "1"> + <#else> + <#assign rowClass = "2"> + </#if> </#list> </table> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=608607&r1=608606&r2=608607&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Thu Jan 3 11:39:12 2008 @@ -17,7 +17,7 @@ under the License. --> -<span class="head1">${uiLabelMap.ProductFacility}</span> <span class='head2'>${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span> +<span class="head1">${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span> <div class="button-bar"> <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> <#if facilityId?has_content> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=608607&r1=608606&r2=608607&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Thu Jan 3 11:39:12 2008 @@ -23,24 +23,35 @@ <screen name="FindFacility"> <section> <actions> + <set field="titleProperty" value="ProductFacilitiesList"/> <set field="headerItem" value="facility"/> <entity-condition list-name="facilities" entity-name="Facility"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <label style="head1">${uiLabelMap.ProductFacilitiesList}</label> - <container> - <link style="buttontext" target="EditFacility" text="${uiLabelMap.ProductCreateNewFacility}"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductFacilitiesList}"/> + </container> + </container> + <container> + <link style="buttontext" target="EditFacility" text="${uiLabelMap.ProductCreateNewFacility}"/> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="FindFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="FindFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/> </decorator-section> </decorator-screen> </widgets> </section> </screen> - - <screen name="EditFacility"> <section> <actions> @@ -58,18 +69,44 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductEditFacility}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html> + </platform-specific> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> <fail-widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductEditFacility}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html> + </platform-specific> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </fail-widgets> @@ -139,9 +176,22 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/FindFacilityLocation.ftl"/></html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindFacilityLocation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://product/webapp/facility/facility/FindFacilityLocation.ftl"/></html> + </platform-specific> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -183,16 +233,28 @@ <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <container> - <label style="head1">${uiLabelMap.ProductInventoryItemsFor}</label> - <label style="head2">${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label> + <label style="head1">${uiLabelMap.ProductInventoryItemsFor} ${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label> </container> <container> <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/> <link target="EditInventoryItem?facilityId=${parameters.facilityId}" text="${uiLabelMap.ProductCreateNewInventoryItemFacility}" style="buttontext"/> <link target="SearchInventoryItemsByLabels?facilityId=${parameters.facilityId}" text="${uiLabelMap.ProductSearchInventoryItemsByLabels}" style="buttontext"/> </container> - <include-form name="SearchInventoryItemsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/> - <include-form name="ListFacilityInventoryItems" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditFacilityInventoryItems}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="SearchInventoryItemsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <include-form name="ListFacilityInventoryItems" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -216,21 +278,30 @@ <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <container> - <label style="head1">${uiLabelMap.ProductInventoryItemsFor}</label> - <label style="head2">${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label> + <label style="head1">${uiLabelMap.ProductInventoryItemsFor} ${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label> </container> <container> <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/> <link target="EditInventoryItem?facilityId=${parameters.facilityId}" text="${uiLabelMap.ProductCreateNewInventoryItemFacility}" style="buttontext"/> <link target="EditFacilityInventoryItems?facilityId=${parameters.facilityId}" text="${uiLabelMap.ProductInventoryItems}" style="buttontext"/> </container> - <container> - <label style="head2">${uiLabelMap.ProductSearchInventoryItemsByLabels}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductSearchInventoryItemsByLabels}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl"/></html> + </platform-specific> + <include-form name="ListFacilityInventoryItemsNoLocations" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> </container> - <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl"/></html> - </platform-specific> - <include-form name="ListFacilityInventoryItemsNoLocations" location="component://product/webapp/facility/facility/FacilityForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -239,7 +310,7 @@ <screen name="ViewFacilityInventoryByProduct"> <section> <actions> - <set field="titleProperty" value="PageTitleEditFacilityInventoryItems"/> + <set field="titleProperty" value="PageTitleFindFacilityInventoryItems"/> <set field="headerItem" value="facility"/> <set field="tabButtonItem" value="ViewFacilityInventoryByProduct"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> @@ -288,9 +359,21 @@ </widgets> </section> </container> - - <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> - <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindFacilityInventoryItems}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -556,10 +639,34 @@ <label style="head1">${facility.facilityName} [${uiLabelMap.CommonId}:${facilityId}]</label> </container> <container><link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/></container> - <container><label style="head2">${uiLabelMap.ProductGroupMemberMaintenance}</label></container> - <include-form name="EditFacilityGroups" location="component://product/webapp/facility/facility/FacilityForms.xml"/> - <container><label style="head2">${uiLabelMap.ProductAddFacilityGroupMember}</label></container> - <include-form name="addGroupToFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductGroupMemberMaintenance}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditFacilityGroups" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductAddFacilityGroupMember}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="addGroupToFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -587,10 +694,34 @@ <label style="head1">${facility.facilityName} [${uiLabelMap.CommonId}:${facilityId}]</label> </container> <container><link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/></container> - <container><label style="head2">${uiLabelMap.ProductFacilityRoleMemberMaintenance}</label></container> - <include-form name="EditFacilityRoles" location="component://product/webapp/facility/facility/FacilityForms.xml"/> - <container><label style="head2">${uiLabelMap.ProductAddFacilityPartyRole}</label></container> - <include-form name="AddPartyToFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductFacilityRoleMemberMaintenance}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditFacilityRoles" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductAddFacilityPartyRole}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddPartyToFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |