svn commit: r560814 [1/2] - in /ofbiz/trunk/applications: party/webapp/partymgr/visit/ product/webapp/facility/facili
Locked
 
|
Author: adrianc
Date: Sun Jul 29 13:52:05 2007 New Revision: 560814 URL: http://svn.apache.org/viewvc?view=rev&rev=560814 Log: Facility Manager UI refactoring.Removed deprecated CSS styles, fixed up some UI issues. The Facility Manager UI still needs more work. Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl 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/EditFacilityRoles.ftl ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl ofbiz/trunk/applications/product/widget/facility/Menus.xml Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl Sun Jul 29 13:52:05 2007 @@ -22,7 +22,7 @@ <#else> <#assign title = uiLabelMap.PartyActive> </#if> - <div class="head1">${title} ${uiLabelMap.PartyVisitListing}</div> + <h1>${title} ${uiLabelMap.PartyVisitListing}</h1> <#if !partyId?exists && showAll?lower_case == "true"> <a href="<@ofbizUrl>showvisits?showAll=false</@ofbizUrl>" class="smallSubmit">[${uiLabelMap.PartyShowActive}]</a> <#elseif !partyId?exists> @@ -45,7 +45,7 @@ <br class="clear" /> <br/> - <table class="basic-table" cellspacing="0"> + <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> <td><a href="<@ofbizUrl>showvisits?sort=visitId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitId}</a></td> <td><a href="<@ofbizUrl>showvisits?sort=visitorId&showAll=${showAll}<#if visitorId?has_content>&visitorId=${visitorId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitorId}</a></td> @@ -57,10 +57,9 @@ <td><a href="<@ofbizUrl>showvisits?sort=fromDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonFromDate}</a></td> <td><a href="<@ofbizUrl>showvisits?sort=thruDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonThruDate}</a></td> </tr> - <#-- set initial row color --> - <#assign rowClass = "2"> + <#assign alt_row = false> <#list visitList as visitObj> - <tr<#if rowClass == "1"> class="alternate-row"</#if>> + <tr<#if alt_row> class="alternate-row"</#if>> <td class="button-col"><a href="<@ofbizUrl>visitdetail?visitId=${visitObj.visitId}</@ofbizUrl>">${visitObj.visitId}</a></td> <td>${visitObj.visitorId?if_exists}</td> <td class="button-col"><a href="<@ofbizUrl>viewprofile?partyId=${visitObj.partyId?if_exists}</@ofbizUrl>">${visitObj.partyId?if_exists}</a></td> @@ -71,12 +70,7 @@ <td>${(visitObj.fromDate?string)?if_exists}</td> <td>${(visitObj.thruDate?string)?if_exists}</td> </tr> - <#-- toggle the row color --> - <#if rowClass == "2"> - <#assign rowClass = "1"> - <#else> - <#assign rowClass = "2"> - </#if> + <#assign alt_row = !alt_row> </#list> </table> 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?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Sun Jul 29 13:52:05 2007 @@ -19,35 +19,36 @@ <#if security.hasEntityPermission("FACILITY", "_VIEW", session)> -<div class="head1">${uiLabelMap.ProductFacility} <span class='head2'>${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> -<a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> -<#if facilityId?has_content> +<span class="head1">${uiLabelMap.ProductFacility}</span> <span class='head2'>${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span> +<br/> +<div class="button-bar"> + <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> + <#if facilityId?has_content> <a href="/workeffort/control/month?facilityId=${facilityId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.CommonViewCalendar}</a> -</#if> + </#if> +</div> <#if facility?exists && facilityId?has_content> - <form action="<@ofbizUrl>UpdateFacility</@ofbizUrl>" method="post" style='margin: 0;'> - <table border='0' cellpadding='2' cellspacing='0'> + <form action="<@ofbizUrl>UpdateFacility</@ofbizUrl>" method="post"> + <table class="basic-table" cellspacing='0'> <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> <tr> - <td align="right"><div class="tabletext">${uiLabelMap.ProductFacilityId}</div></td> - <td> </td> + <td class="label">${uiLabelMap.ProductFacilityId}</td> <td> - <b>${facilityId?if_exists}</b> (${uiLabelMap.ProductNotModificationRecrationFacility}.) + ${facilityId?if_exists} <span class="tooltip">${uiLabelMap.ProductNotModificationRecrationFacility}</span> </td> </tr> <#else> <form action="<@ofbizUrl>CreateFacility</@ofbizUrl>" method="post" style='margin: 0;'> - <table border='0' cellpadding='2' cellspacing='0'> <#if facilityId?exists> <h3>${uiLabelMap.ProductCouldNotFindFacilityWithId} "${facilityId?if_exists}".</h3> </#if> + <table class="basic-table" cellspacing='0'> </#if> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductFacilityTypeId}</div></td> - <td> </td> - <td width="74%"> - <select name="facilityTypeId" size="1" class='selectBox'> + <td class="label">${uiLabelMap.ProductFacilityTypeId}</td> + <td> + <select name="facilityTypeId"> <option selected value='${facilityType.facilityTypeId?if_exists}'>${facilityType.get("description",locale)?if_exists}</option> <option value='${facilityType.facilityTypeId?if_exists}'>----</option> <#list facilityTypes as nextFacilityType> @@ -57,10 +58,9 @@ </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductFacilityOwner}</div></td> - <td> </td> - <td width="74%"> - <select name="ownerPartyId" size="1" class='selectBox'> + <td class="label">${uiLabelMap.ProductFacilityOwner}</td> + <td> + <select name="ownerPartyId"> <#if ownerParties?has_content> <#list ownerParties as party> <option value='${party.partyId?if_exists}' <#if facility.ownerPartyId?exists && party.partyId = facility.ownerPartyId>selected</#if>>${Static['org.ofbiz.party.party.PartyHelper'].getPartyName(party)} (${party.partyId})</option> @@ -70,10 +70,9 @@ </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductFacilityDefaultWeightUnit}</div></td> - <td> </td> - <td width="74%"> - <select name="defaultWeightUomId" size="1" class='selectBox'> + <td class="label">${uiLabelMap.ProductFacilityDefaultWeightUnit}</td> + <td> + <select name="defaultWeightUomId"> <option value=''>${uiLabelMap.CommonNone}</option> <#list weightUomList as uom> <option value='${uom.uomId}' @@ -86,10 +85,9 @@ </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductFacilityDefaultInventoryItemType}</div></td> - <td> </td> - <td width="74%"> - <select name="defaultInventoryItemTypeId" size="1" class='selectBox'> + <td class="label">${uiLabelMap.ProductFacilityDefaultInventoryItemType}</td> + <td> + <select name="defaultInventoryItemTypeId"> <#list inventoryItemTypes as nextInventoryItemType> <option value='${nextInventoryItemType.inventoryItemTypeId}' <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)> @@ -102,29 +100,25 @@ </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductName}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60"></td> + <td class="label">${uiLabelMap.ProductName}</td> + <td><input type="text" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60"></td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductSquareFootage}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="squareFootage" value="${facility.squareFootage?if_exists}" size="10" maxlength="20"></td> + <td class="label">${uiLabelMap.ProductSquareFootage}</td> + <td><input type="text" name="squareFootage" value="${facility.squareFootage?if_exists}" size="10" maxlength="20"></td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductDescription}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="description" value="${facility.description?if_exists}" size="60" maxlength="250"></td> + <td class="label">${uiLabelMap.ProductDescription}</td> + <td ><input type="text" name="description" value="${facility.description?if_exists}" size="60" maxlength="250"></td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductDefaultDaysToShip}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="defaultDaysToShip" value="${facility.defaultDaysToShip?if_exists}" size="10" maxlength="20"></td> + <td class="label">${uiLabelMap.ProductDefaultDaysToShip}</td> + <td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip?if_exists}" size="10" maxlength="20"></td> </tr> <tr> - <td colspan='2'> </td> - <td colspan='1' align="left"><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td> + <td> </td> + <td align="left"><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td> </tr> </table> </form> 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?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Sun Jul 29 13:52:05 2007 @@ -17,45 +17,47 @@ under the License. --> - <div class="head1">${uiLabelMap.ProductLocationFor} <span class="head2"><#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> - <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> +<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;"> - <table border="0" cellpadding="2" cellspacing="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;"> - <table border="0" cellpadding="2" cellspacing="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 align="right"><div class="tabletext">${uiLabelMap.ProductFacilityId}</div></td> - <td> </td> - <td> - <b>${facilityId?if_exists}</b> - </td> + <td class="label">${uiLabelMap.ProductFacilityId}</td> + <td>${facilityId?if_exists}</td> </tr> <tr> - <td align="right"><div class="tabletext">${uiLabelMap.ProductLocationSeqId}</div></td> - <td> </td> - <td> - <b>${locationSeqId}</b> - </td> + <td class="label">${uiLabelMap.ProductLocationSeqId}</td> + <td>${locationSeqId}</td> </tr> <#else> - <div class="head1">${uiLabelMap.ProductNotCreateLocationFacilityId}</div> + <h1>${uiLabelMap.ProductNotCreateLocationFacilityId}</h1> </#if> <#if facilityId?exists> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductType}</div></td> - <td> </td> - <td width="74%"> + <td class="label">${uiLabelMap.ProductType}</td> + <td> <select name="locationTypeEnumId"> <#if (facilityLocation.locationTypeEnumId)?has_content> <#assign locationTypeEnum = facilityLocation.getRelatedOneCache("TypeEnumeration")?if_exists> @@ -69,79 +71,68 @@ </td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonArea}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="areaId" value="${(facilityLocation.areaId)?if_exists}" size="19" maxlength="20"></td> + <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 width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductAisle}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="aisleId" value="${(facilityLocation.aisleId)?if_exists}" size="19" maxlength="20"></td> + <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 width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductSection}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="sectionId" value="${(facilityLocation.sectionId)?if_exists}" size="19" maxlength="20"></td> + <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 width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductLevel}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="levelId" value="${(facilityLocation.levelId)?if_exists}" size="19" maxlength="20"></td> + <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 width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductPosition}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="positionId" value="${(facilityLocation.positionId)?if_exists}" size="19" maxlength="20"></td> + <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 colspan="2"> </td> - <td colspan="1" align="left"><input type="submit" value="${uiLabelMap.CommonUpdate}"></td> + <td> </td> + <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td> </tr> </table> </form> - <hr class="sepbar"/> + <hr/> <#-- ProductFacilityLocation stuff --> - <div class="head2">${uiLabelMap.ProductLocationProduct}:</div> - <table border="1" width="100%" cellpadding="2" cellspacing="0"> - <tr> - <td><div class="tabletext"><b>${uiLabelMap.ProductProduct}</b></div></td> - <td align="center"><div class="tabletext"><b>${uiLabelMap.ProductMinimumStockAndMoveQuantity}</b></div></td> - <td><div class="tabletext"><b> </b></div></td> + <h2>${uiLabelMap.ProductLocationProduct}:</h2> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.ProductProduct}</td> + <td>${uiLabelMap.ProductMinimumStockAndMoveQuantity}</td> </tr> <#list productFacilityLocations?if_exists as productFacilityLocation> <#assign product = productFacilityLocation.getRelatedOne("Product")?if_exists> - <tr valign="middle"> - <td><div class="tabletext"><#if product?exists>${(product.internalName)?if_exists}</#if>[${productFacilityLocation.productId}]</div></td> - <td align="center"> + <tr> + <td><#if product?exists>${(product.internalName)?if_exists}</#if>[${productFacilityLocation.productId}]</td> + <td class="button-col"> <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}"/> <input type="hidden" name="locationSeqId" value="${(productFacilityLocation.locationSeqId)?if_exists}"/> - <input type="text" size="10" name="minimumStock" value="${(productFacilityLocation.minimumStock)?if_exists}" class="inputBox"/> - <input type="text" size="10" name="moveQuantity" value="${(productFacilityLocation.moveQuantity)?if_exists}" class="inputBox"/> - <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"/> + <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> </form> </td> - <td align="center"> - <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> - </td> </tr> </#list> </table> <br/> + <h2>${uiLabelMap.ProductAddProduct}:</h2> <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"> - <div class="head2">${uiLabelMap.ProductAddProduct}:</div> - <div class="tabletext"> - ${uiLabelMap.ProductProductId}: <input type="text" size="10" name="productId" class="inputBox"> - ${uiLabelMap.ProductMinimumStock}: <input type="text" size="10" name="minimumStock" class="inputBox"> - ${uiLabelMap.ProductMoveQuantity}: <input type="text" size="10" name="moveQuantity" class="inputBox"> - <input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;"> - </div> + ${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"> + <input type="submit" value="${uiLabelMap.CommonAdd}"> </form> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityRoles.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityRoles.ftl?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityRoles.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityRoles.ftl Sun Jul 29 13:52:05 2007 @@ -17,43 +17,45 @@ under the License. --> - <div class="head1">${uiLabelMap.PartyRoleFor} <span class="head2"><#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> - <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewFacility}]</a> - <p> - - <p class="head2">${uiLabelMap.ProductFacilityRoleMemberMaintenance}</p> - <table border="1" cellpadding="2" cellspacing="0"> - <tr> - <td><div class="tabletext"><b>${uiLabelMap.PartyPartyId}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.PartyRoleType}</b></div></td> - <td><div class="tabletext"><b> </b></div></td> +<span class="head1">${uiLabelMap.PartyRoleFor}</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> +</div> + +<div class="screenlet"> + <div class="screenlet-title-bar"><h3>${uiLabelMap.ProductFacilityRoleMemberMaintenance}</h3></div> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.PartyPartyId}</td> + <td>${uiLabelMap.PartyRoleType}</td> + <td> </td> </tr> <#list facilityRoles as facilityRole> <#assign roleType = facilityRole.getRelatedOne("RoleType")> <tr valign="middle"> <td><a href="/partymgr/control/viewprofile?party_id=${(facilityRole.partyId)?if_exists}" class="buttontext">${(facilityRole.partyId)?if_exists}</a></td> - <td><div class="tabletext">${(roleType.get("description",locale))?if_exists}</div></td> + <td>${(roleType.get("description",locale))?if_exists}</td> <td align="center"> <a href="<@ofbizUrl>removePartyFromFacility?facilityId=${(facilityRole.facilityId)?if_exists}&partyId=${(facilityRole.partyId)?if_exists}&roleTypeId=${(facilityRole.roleTypeId)?if_exists}</@ofbizUrl>" class="buttontext"> - [${uiLabelMap.CommonDelete}]</a> + ${uiLabelMap.CommonDelete}</a> </td> </tr> </#list> - </table> + </table> +</div> <br/> - <form method="post" action="<@ofbizUrl>addPartyToFacility</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${facilityId}"> - <div class="head2">${uiLabelMap.ProductAddFacilityPartyRole}:</div> - <div class="tabletext"> - ${uiLabelMap.PartyPartyId}: <input type="text" class="inputBox" size="20" name="partyId"> + <h2>${uiLabelMap.ProductAddFacilityPartyRole}:</h2> + <form method="post" action="<@ofbizUrl>addPartyToFacility</@ofbizUrl>"> + <input type="hidden" name="facilityId" value="${facilityId}"> + ${uiLabelMap.PartyPartyId}: <input type="text" size="20" name="partyId"> ${uiLabelMap.PartyRoleType}: - <select name="roleTypeId" class="selectBox"><option></option> - <#list roles as role> - <option value="${(role.roleTypeId)?if_exists}">${(role.get("description",locale))?if_exists}</option> - </#list> + <select name="roleTypeId"> + <option></option> + <#list roles as role> + <option value="${(role.roleTypeId)?if_exists}">${(role.get("description",locale))?if_exists}</option> + </#list> </select> <input type="submit" value="${uiLabelMap.CommonAdd}"> - </div> </form> 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?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Sun Jul 29 13:52:05 2007 @@ -17,26 +17,27 @@ under the License. --> - <div class="head1">${uiLabelMap.ProductFindLocationsFor} <span class="head2"><#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> - <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewFacility}]</a> - <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewFacilityLocation}]</a> + <span class="head1">${uiLabelMap.ProductFindLocationsFor}</span> <span class="head2"><#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span> + <br/> + <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> + </div> - <form action="<@ofbizUrl>FindFacilityLocation</@ofbizUrl>" method="GET" style="margin: 0;" name="findFacilityLocation"> - <table border="0" cellpadding="2" cellspacing="0"> + <form action="<@ofbizUrl>FindFacilityLocation</@ofbizUrl>" method="GET" name="findFacilityLocation"> + <table class="basic-table" cellspacing="0"> <#if !(facilityId?exists)> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductFacility}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" value="" size="19" maxlength="20"></td> + <td class="label">${uiLabelMap.ProductFacility}</td> + <td><input type="text" value="" size="19" maxlength="20"></td> </tr> <#else> <input type="hidden" name="facilityId" value="${facilityId}"> </#if> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductLocationSeqId}</div></td> - <td> </td> - <td width="74%"> - <input type="text" class="inputBox" name="locationSeqId" value="" size="19" maxlength="20"> + <td class="label">${uiLabelMap.ProductLocationSeqId}</td> + <td> + <input type="text" name="locationSeqId" value="" size="19" maxlength="20"> <span class="tabletext"> <a href="javascript:call_fieldlookup2(document.findFacilityLocation.locationSeqId,'LookupFacilityLocation<#if (facilityId?exists)>?facilityId=${facilityId}</#if>');"> <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> @@ -46,79 +47,70 @@ </tr> <tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonArea}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="areaId" value="" size="19" maxlength="20"></td> + <td class="label">${uiLabelMap.CommonArea}</td> + <td><input type="text" name="areaId" value="" size="19" maxlength="20"></td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductAisle}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="aisleId" value="" size="19" maxlength="20"></td> + <td class="label">${uiLabelMap.ProductAisle}</td> + <td><input type="text" name="aisleId" value="" size="19" maxlength="20"></td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductSection}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="sectionId" value="" size="19" maxlength="20"></td> + <td class="label">${uiLabelMap.ProductSection}</td> + <td><input type="text" name="sectionId" value="" size="19" maxlength="20"></td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductLevel}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="levelId" value="" size="19" maxlength="20"></td> + <td class="label">${uiLabelMap.ProductLevel}</td> + <td><input type="text" name="levelId" value="" size="19" maxlength="20"></td> </tr> <tr> - <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductPosition}</div></td> - <td> </td> - <td width="74%"><input type="text" class="inputBox" name="positionId" value="" size="19" maxlength="20"></td> + <td class="label">${uiLabelMap.ProductPosition}</td> + <td><input type="text" name="positionId" value="" size="19" maxlength="20"></td> </tr> <tr> - <td colspan="2"> </td> - <td colspan="1" align="left"><input type="submit" name="look_up" value="${uiLabelMap.CommonFind}"></td> + <td> </td> + <td><input type="submit" name="look_up" value="${uiLabelMap.CommonFind}"></td> </tr> </table> </form> <#if foundLocations?exists> + <#-- TODO: Put this in a screenlet - make it look more like the party find screen --> <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> - <table border="1" cellpadding="2" cellspacing="0"> - <tr> - <td><div class="tabletext"><b>${uiLabelMap.ProductFacility}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductLocationSeqId}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductType}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.CommonArea}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductAisle}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductSection}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductLevel}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductPosition}</b></div></td> - <td> </td> + <br/> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.ProductFacility}</td> + <td>${uiLabelMap.ProductLocationSeqId}</td> + <td>${uiLabelMap.ProductType}</td> + <td>${uiLabelMap.CommonArea}</td> + <td>${uiLabelMap.ProductAisle}</td> + <td>${uiLabelMap.ProductSection}</td> + <td>${uiLabelMap.ProductLevel}</td> + <td>${uiLabelMap.ProductPosition}</td> <td> </td> - <#if itemId?exists> - <td> </td> - </#if> </tr> + <#assign alt_row = false> <#list foundLocations as location> <#assign locationTypeEnum = location.getRelatedOneCache("TypeEnumeration")?if_exists> - <tr> - <td><div class="tabletext"><a href="<@ofbizUrl>EditFacility?facilityId=${(location.facilityId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(location.facilityId)?if_exists}</a></div></td> - <td><div class="tabletext"> <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>" class="buttontext">${(location.locationSeqId)?if_exists}</a></div></td> - <td><div class="tabletext"> ${(locationTypeEnum.get("description",locale))?default(location.locationTypeEnumId?if_exists)}</div></td> - <td><div class="tabletext"> ${(location.areaId)?if_exists}</div></td> - <td><div class="tabletext"> ${(location.aisleId)?if_exists}</div></td> - <td><div class="tabletext"> ${(location.sectionId)?if_exists}</div></td> - <td><div class="tabletext"> ${(location.levelId)?if_exists}</div></td> - <td><div class="tabletext"> ${(location.positionId)?if_exists}</div></td> - <td> - <a href="<@ofbizUrl>EditInventoryItem?facilityId=${(location.facilityId)?if_exists}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewInventoryItem}]</a> - </td> - <#if itemId?exists> - <td> - <a href="<@ofbizUrl>UpdateInventoryItem?inventoryItemId=${itemId}&facilityId=${facilityId}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductSetItem} ${itemId}]</a> - </td> - </#if> - <td> - <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${(location.facilityId)?if_exists}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a> + <tr<#if alt_row> 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> + <td>${(location.areaId)?if_exists}</td> + <td>${(location.aisleId)?if_exists}</td> + <td>${(location.sectionId)?if_exists}</td> + <td>${(location.levelId)?if_exists}</td> + <td>${(location.positionId)?if_exists}</td> + <td class="button-col"> + <a href="<@ofbizUrl>EditInventoryItem?facilityId=${(location.facilityId)?if_exists}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>">${uiLabelMap.ProductNewInventoryItem}</a> + <#if itemId?exists> + <a href="<@ofbizUrl>UpdateInventoryItem?inventoryItemId=${itemId}&facilityId=${facilityId}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>">${uiLabelMap.ProductSetItem} ${itemId}</a> + </#if> + <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> </#list> </table> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl Sun Jul 29 13:52:05 2007 @@ -17,97 +17,98 @@ under the License. --> - <div class="head1">${uiLabelMap.ProductInventoryTransfersFor} <span class="head2"><#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> - <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewFacility}]</a> - <#if activeOnly> - <a href="<@ofbizUrl>FindFacilityTransfers?facilityId=${facilityId}&activeOnly=false</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductActiveAndInactive}]</a> - <#else> - <a href="<@ofbizUrl>FindFacilityTransfers?facilityId=${facilityId}&activeOnly=true</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductActiveOnly}]</a> - </#if> - <a href="<@ofbizUrl>FindFacilityTransfers?facilityId=${facilityId}&completeRequested=true</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductCompleteRequestedTransfers}]</a> - <a href="<@ofbizUrl>TransferInventoryItem?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductInventoryTransfer}]</a> + <span class="head1">${uiLabelMap.ProductInventoryTransfersFor}</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> + <#if activeOnly> + <a href="<@ofbizUrl>FindFacilityTransfers?facilityId=${facilityId}&activeOnly=false</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveAndInactive}</a> + <#else> + <a href="<@ofbizUrl>FindFacilityTransfers?facilityId=${facilityId}&activeOnly=true</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveOnly}</a> + </#if> + <a href="<@ofbizUrl>FindFacilityTransfers?facilityId=${facilityId}&completeRequested=true</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCompleteRequestedTransfers}</a> + <a href="<@ofbizUrl>TransferInventoryItem?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductInventoryTransfer}</a> + </div> <br/> <#if (toTransfers.size() > 0)> - <br/> - <div class="head1">${uiLabelMap.CommonTo}:<span class="head2"> <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> - <table border="1" cellpadding="2" cellspacing="0" width="100%"> - <tr> - <td><div class="tabletext"><b>${uiLabelMap.ProductTransferId}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductItem}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.CommonFrom}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.CommonSendDate}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div></td> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.CommonTo}: <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h3> + </div> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row"> + <td><${uiLabelMap.ProductTransferId}</td> + <td>${uiLabelMap.ProductItem}</td> + <td>${uiLabelMap.CommonFrom}</td> + <td>${uiLabelMap.CommonSendDate}</td> + <td>${uiLabelMap.CommonStatus}</td> <td> </td> - </tr> - - <#list toTransfers as transfer> - <tr> - <td><div class="tabletext"><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(transfer.inventoryTransferId)?if_exists}</a></div></td> - <td><div class="tabletext"><a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${(transfer.inventoryItemId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(transfer.inventoryItemId)?if_exists}</a></div></td> - <td> + </tr> + <#assign alt_row = false> + <#list toTransfers as transfer> + <tr<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(transfer.inventoryTransferId)?if_exists}</a></td> + <td><a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${(transfer.inventoryItemId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(transfer.inventoryItemId)?if_exists}</a></td> + <td> <#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", transfer.getString("facilityId")))> - <div class="tabletext"><a href="<@ofbizUrl>EditFacility?facilityId=${(transfer.facilityId)?if_exists}</@ofbizUrl>" class="buttontext"> <#if fac?exists>${(fac.facilityName)?if_exists}</#if> [${(transfer.facilityId)?if_exists}]</a></div> - </td> - <td><div class="tabletext"> ${(transfer.sendDate)?if_exists}</div></td> - <td> + <a href="<@ofbizUrl>EditFacility?facilityId=${(transfer.facilityId)?if_exists}</@ofbizUrl>" class="buttontext"> <#if fac?exists>${(fac.facilityName)?if_exists}</#if> [${(transfer.facilityId)?if_exists}]</a> + </td> + <td>${(transfer.sendDate)?if_exists}</td> + <td> <#if (transfer.statusId)?exists> <#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))> - <div class="tabletext"> ${(transferStatus.get("description",locale))?if_exists}</div> + ${(transferStatus.get("description",locale))?if_exists} </#if> - </td> - <td align="center"><div class="tabletext"><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a></div></td> + </td> + <td align="center"><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a></td> </tr> - </#list> + <#assign alt_row = !alt_row> + </#list> </table> + </div> </#if> <#if (fromTransfers.size() > 0)> <#if completeRequested> <form name="CompleteRequested" method="post" action="CompleteRequestedTransfers?completeRequested=true&facilityId=${facility.facilityId}"> </#if> - <br/> - <div class="head1">${uiLabelMap.CommonFrom}:<span class="head2"> <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> - <table border="1" cellpadding="2" cellspacing="0" width="100%"> - <tr> - <td><div class="tabletext"><b>${uiLabelMap.ProductTransferId}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductItem}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductProductId}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductInternalName}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.ProductSerialAtpQoh}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.CommonTo}</b></div></td> - <td><div class="tabletext"><b>${uiLabelMap.CommonSendDate}</b></div></td> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.CommonFrom}: <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h3> + </div> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.ProductTransferId}<</td> + <td>${uiLabelMap.ProductItem}</td> + <td>${uiLabelMap.ProductProductId}</td> + <td>${uiLabelMap.ProductInternalName}<</td> + <td>${uiLabelMap.ProductSerialAtpQoh}</td> + <td>${uiLabelMap.CommonTo}</td> + <td><${uiLabelMap.CommonSendDate}</td> <#if !completeRequested> - <td><div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div></td> + <td><${uiLabelMap.CommonStatus}</td> </#if> <td align="center"> <#if completeRequested> - <span class="tableheadtext">Select<br><input name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'CompleteRequested');" type="checkbox"></span> + Select<br><input name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'CompleteRequested');" type="checkbox"> <#else> - + </#if> </td> - </tr> + </tr> - <#list fromTransfers as transfer> + <#assign alt_row = false> + <#list fromTransfers as transfer> <#assign inventoryItem = transfer.getRelatedOne("InventoryItem")?if_exists> <#if inventoryItem?has_content> <#assign product = inventoryItem.getRelatedOne("Product")?if_exists> </#if> - <tr> - <td><div class="tabletext"><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(transfer.inventoryTransferId)?if_exists}</a></div></td> - <td><div class="tabletext"><a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${(transfer.inventoryItemId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(transfer.inventoryItemId)?if_exists}</a></div></td> - <td> - <#if product?exists> - <span class="tabletext">${product.productId}</span> - </#if> - </td> + <tr<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(transfer.inventoryTransferId)?if_exists}</a></td> + <td><a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${(transfer.inventoryItemId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(transfer.inventoryItemId)?if_exists}</a></td> + <td>${(product.productId)?default(" ")}</td> + <td>${(product.internalName)?default(" ")}</td> <td> - <#if product?exists> - <span class="tabletext">${product.internalName?if_exists}</span> - </#if> - </td> - <td class="tabletext"> <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")> ${(inventoryItem.availableToPromiseTotal)?if_exists} / ${(inventoryItem.quantityOnHandTotal)?if_exists} <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")> @@ -116,38 +117,42 @@ </td> <td> <#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", transfer.getString("facilityIdTo")))> - <div class="tabletext"><a href="<@ofbizUrl>EditFacility?facilityId=${(transfer.facilityIdTo)?if_exists}</@ofbizUrl>" class="buttontext"> <#if fac?exists>${(fac.facilityName)?if_exists}</#if> [${(transfer.facilityIdTo)?if_exists}]</a></div> + <a href="<@ofbizUrl>EditFacility?facilityId=${(transfer.facilityIdTo)?if_exists}</@ofbizUrl>" class="buttontext"> <#if fac?exists>${(fac.facilityName)?if_exists}</#if> [${(transfer.facilityIdTo)?if_exists}]</a> </td> - <td><div class="tabletext"> ${(transfer.sendDate)?if_exists}</div></td> + <td>${(transfer.sendDate)?default(" ")}</td> <#if !completeRequested> <td> <#if (transfer.statusId)?exists> <#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))> - <div class="tabletext"> ${(transferStatus.get("description",locale))?if_exists}</div> + ${(transferStatus.get("description",locale))?default(" ")} </#if> </td> </#if> - <td align="center"><div class="tabletext"> + <td align="center"> <#if completeRequested> <input type="hidden" name="inventoryTransferId_o_${transfer_index}" value="${transfer.inventoryTransferId}"> <input type="hidden" name="inventoryItemId_o_${transfer_index}" value="${transfer.inventoryItemId}"> <input type="hidden" name="statusId_o_${transfer_index}" value="IXF_COMPLETE"> <input name="_rowSubmit_o_${transfer_index}" value="Y" type="checkbox"> <#else> - <a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a> + <a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> </#if> - </div></td> + </td> </tr> + <#assign alt_row = !alt_row> <#assign rowCount = transfer_index + 1> - </#list> - <#if completeRequested> - <tr><td colspan="8" align="right"> + </#list> + <#if completeRequested> + <tr> + <td colspan="8" align="right"> <input type="hidden" name="_rowCount" value="${rowCount}"> <input type="hidden" name="_useRowSubmit" value="Y"/> - <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductComplete}"/> - </td></tr> - </#if> + <input type="submit" value="${uiLabelMap.ProductComplete}"/> + </td> + </tr> + </#if> </table> + </div> <#if completeRequested> </form> </#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?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Sun Jul 29 13:52:05 2007 @@ -17,37 +17,30 @@ under the License. --> -<div class="head1">${uiLabelMap.ProductFacility} <span class='head2'>${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> -<a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewFacility}]</a> -<#if facilityId?has_content> - <a href="/workeffort/control/month?facilityId=${facilityId}&externalLoginKey=${externalLoginKey?if_exists}" class="buttontext">[${uiLabelMap.CommonViewCalendar}]</a> - <a href="<@ofbizUrl>EditContactMech?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewContactMech}]</a> -</#if> +<span class="head1">${uiLabelMap.ProductFacility}</span> <span class='head2'>${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> + <a href="/workeffort/control/month?facilityId=${facilityId}&externalLoginKey=${externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.CommonViewCalendar}</a> + <a href="<@ofbizUrl>EditContactMech?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewContactMech}</a> + </#if> +</div> -<br/><br/> -<table width='100%' border='0' cellspacing='0' cellpadding='0'> - <tr> - <td> +<div class="screenlet"> + <div class="screenlet-title-bar"><h3>${uiLabelMap.ProductContactTypeInformation}</h3></div> <#if contactMeches?has_content> - <table width="100%" border="0" cellpadding="0"> - <tr align="left" valign='bottom'> - <td colspan="7"> - <span class="head2">${uiLabelMap.ProductContactTypeInformation}</span> - </td> - </tr> + <table class="basic-table" cellspacing="0"> <#list contactMeches as contactMechMap> <#assign contactMech = contactMechMap.contactMech> <#assign facilityContactMech = contactMechMap.facilityContactMech> - <tr><td colspan="7"><hr class='sepbar'></td></tr> + <tr><td colspan="3"><hr></td></tr> <tr> - <td align="right" valign="top" width="10%"> - <div class="tabletext"> <b>${contactMechMap.contactMechType.get("description",locale)}</b></div> + <td class="label" valign="top"> + ${contactMechMap.contactMechType.get("description",locale)} </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top"> <#list contactMechMap.facilityContactMechPurposes as facilityContactMechPurpose> <#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> - <div class="tabletext"> <#if contactMechPurposeType?has_content> <b>${contactMechPurposeType.get("description",locale)}</b> <#else> @@ -56,11 +49,10 @@ <#if facilityContactMechPurpose.thruDate?has_content> (${uiLabelMap.CommonExpire}: ${facilityContactMechPurpose.thruDate.toString()}) </#if> - </div> + <br/> </#list> <#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId> <#assign postalAddress = contactMechMap.postalAddress> - <div class="tabletext"> <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br/></#if> <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${postalAddress.attnName}<br/></#if> ${postalAddress.address1?if_exists}<br/> @@ -69,65 +61,50 @@ ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} <#if postalAddress.countryGeoId?has_content><br/>${postalAddress.countryGeoId}</#if> - </div> <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA"> <#assign addr1 = postalAddress.address1?if_exists> <#if (addr1.indexOf(" ") > 0)> <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> - <a target='_blank' href='http://www.whitepages.com/find_person_results.pl?fid=a&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18' class='buttontext'>(lookup:whitepages.com)</a> + <br/><a target='_blank' href='http://www.whitepages.com/find_person_results.pl?fid=a&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18' class='buttontext'>lookup:whitepages.com</a> </#if> </#if> <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> - <div class="tabletext"> ${telecomNumber.countryCode?if_exists} <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber?if_exists} <#if facilityContactMech.extension?has_content>${uiLabelMap.CommonExt} ${facilityContactMech.extension}</#if> <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011"> - <a target='_blank' href='http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8' class='buttontext'>(lookup:anywho.com)</a> - <a target='_blank' href='http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode?if_exists}&s=&p=${telecomNumber.contactNumber?if_exists}&pt=b&x=40&y=9' class='buttontext'>(lookup:whitepages.com)</a> + <br/><a target='_blank' href='http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8' class='buttontext'>lookup:anywho.com</a> + <a target='_blank' href='http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode?if_exists}&s=&p=${telecomNumber.contactNumber?if_exists}&pt=b&x=40&y=9' class='buttontext'>lookup:whitepages.com</a> </#if> - </div> <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> - <div class="tabletext"> ${contactMech.infoString?if_exists} - <a href='mailto:${contactMech.infoString?if_exists}' class='buttontext'>(${uiLabelMap.CommonSendEmail})</a> - </div> + <a href='mailto:${contactMech.infoString?if_exists}' class='buttontext'>${uiLabelMap.CommonSendEmail}</a> <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId> - <div class="tabletext"> ${contactMech.infoString?if_exists} <#assign openAddress = contactMech.infoString?default("")> <#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress></#if> <a target='_blank' href='${openAddress}' class='buttontext'>((${uiLabelMap.CommonOpenPageNewWindow})</a> - </div> <#else> - <div class="tabletext"> ${contactMech.infoString?if_exists} - </div> </#if> - <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()})</div> - <#if facilityContactMech.thruDate?has_content><div class='tabletext'><b>${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}</b></div></#if> - </td> - <td width="5"> </td> - <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> - <td align="right" valign="top" nowrap width="1%"> - <div><a href='<@ofbizUrl>EditContactMech?facilityId=${facilityId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>' class="buttontext"> - [${uiLabelMap.CommonUpdate}]</a> </div> + <br/>(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()}) + <#if facilityContactMech.thruDate?has_content><br/><b>${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}</b></#if> </td> - </#if> - <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session)> - <td align="right" valign="top" width="1%"> - <div><a href='<@ofbizUrl>deleteContactMech/ViewContactMechs?facilityId=${facilityId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>' class="buttontext"> - [${uiLabelMap.CommonExpire}]</a> </div> + <td class="button-col"> + + <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> + <a href='<@ofbizUrl>EditContactMech?facilityId=${facilityId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>'>${uiLabelMap.CommonUpdate}</a> + </#if> + <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session)> + <a href='<@ofbizUrl>deleteContactMech/ViewContactMechs?facilityId=${facilityId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>'>${uiLabelMap.CommonExpire}</a> + </#if> </td> - </#if> </tr> </#list> </table> <#else> - <div class="tabletext">${uiLabelMap.CommonNoContactInformationOnFile}.</div> + <div class="screenlet-body">${uiLabelMap.CommonNoContactInformationOnFile}.</div> </#if> - </td> - </tr> -</table> +</div> Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Sun Jul 29 13:52:05 2007 @@ -20,8 +20,10 @@ <div class="errorMessage">${illegalInventoryItem}</div> </#if> - <div class="head1">${uiLabelMap.ProductInventoryTransfer} <span class="head2">${uiLabelMap.CommonFrom} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> - <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewFacility}]</a> + <span class="head1">${uiLabelMap.ProductInventoryTransfer}</span> <span class="head2">${uiLabelMap.CommonFrom} <#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> + </div> <#-- <table border="0" cellpadding="2" cellspacing="0"> --> @@ -29,10 +31,10 @@ <form method="post" action="<@ofbizUrl>TransferInventoryItem</@ofbizUrl>" style="margin: 0;"> <table border="0" cellpadding="2" cellspacing="0"> <tr> - <td width="25%" align="right"><div class="tabletext">${uiLabelMap.ProductInventoryItemId}</div></td> + <td width="25%" align="right">${uiLabelMap.ProductInventoryItemId}</td> <td width="6%"> </td> <td width="25%"> - <input type="text" class="inputBox" name="inventoryItemId" size="20" maxlength="20"> + <input type="text" name="inventoryItemId" size="20" maxlength="20"> <input type="hidden" name="facilityId" value="${facilityId}"> </td> <td width="50%"> @@ -59,7 +61,7 @@ <input type="hidden" name="locationSeqId" value="${(inventoryItem.locationSeqId)?if_exists}"> <tr> <td width="14%"> </td> - <td width="6%"align="right"><div class="tabletext">${uiLabelMap.ProductInventoryItemId}</div></td> + <td width="6%"align="right">${uiLabelMap.ProductInventoryItemId}</td> <td width="6%"> </td> <td width="74%"> <b>${inventoryItemId}</b> @@ -68,11 +70,11 @@ <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductInventoryItemTypeId}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductInventoryItemTypeId}</td> <td width="6%"> </td> <td width="74%"> <#if inventoryItemType?exists> - <div class="tabletext">${(inventoryItemType.get("description",locale))?if_exists}</div> + ${(inventoryItemType.get("description",locale))?if_exists} </#if> </td> </tr> @@ -90,26 +92,14 @@ <td width="14%"> </td> <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductStatus}</div></td> <td width="6%"> </td> - <td width="74%"> - <#if inventoryStatus?exists> - <div class="tabletext">${(inventoryStatus.get("description",locale))?if_exists}</div> - <#else> - <div class="tabletext">--</div> - </#if> - </td> + <td width="74%">${(inventoryStatus.get("description",locale))?default("--")}</td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductComments}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductComments}</td> <td width="6%"> </td> - <td width="74%"> - <#if (inventoryItem.comments)?exists> - <div class="tabletext">${inventoryItem.comments}</td></div> - <#else> - <div class="tabletext">--</div> - </#if> - </td> + <td width="74%">${(inventoryItem.comments)?default("--")}</td> </tr> <tr> @@ -118,25 +108,25 @@ <td width="6%"> </td> <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")> <td width="74%"> - <div class="tabletext">${(inventoryItem.availableToPromiseTotal)?if_exists} - / ${(inventoryItem.quantityOnHandTotal)?if_exists}</div> + ${(inventoryItem.availableToPromiseTotal)?if_exists} + / ${(inventoryItem.quantityOnHandTotal)?if_exists} </td> <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")> - <td width="74%"><div class="tabletext">${(inventoryItem.serialNumber)?if_exists}</div></td> + <td width="74%">${(inventoryItem.serialNumber)?if_exists}</td> <#elseif inventoryItem?exists> - <td width="74%"><div class="tabletext" style="color: red;">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</div></td> + <td class="alert" width="74%">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</td> </#if> </tr> <tr> <td width="14%"> </td> - <td colspan="3"><hr class="sepbar"></td> + <td colspan="3"><hr/></td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="left" nowrap><div class="tabletext">${uiLabelMap.ProductTransferStatus}</div></td> + <td width="6%" align="left" nowrap>${uiLabelMap.ProductTransferStatus}</td> <td width="6%"> </td> <td width="74%"> - <select name="statusId" class="selectBox"> + <select name="statusId"> <#if (inventoryTransfer.statusId)?exists> <#assign curStatusItem = inventoryTransfer.getRelatedOneCache("StatusItem")> <option value="${(inventoryTransfer.statusId)?if_exists}">${(curStatusItem.get("description",locale))?if_exists}</option> @@ -149,102 +139,98 @@ </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductTransferSendDate}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductTransferSendDate}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="sendDate" value="${(inventoryTransfer.sendDate)?if_exists}" size="22" class="inputBox"> - <a href="#" onclick="setNow('sendDate')" class="buttontext">[${uiLabelMap.CommonNow}]</a> + <input type="text" name="sendDate" value="${(inventoryTransfer.sendDate)?if_exists}" size="22"> + <a href="#" onclick="setNow('sendDate')" class="buttontext">${uiLabelMap.CommonNow}</a> </td> </tr> <#if !(inventoryTransfer?exists)> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductToFacilityContainer}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductToFacilityContainer}</td> <td width="6%"> </td> <td width="74%"> - <span class="tabletext">${uiLabelMap.ProductSelectFacility}:</span> - <select name="facilityIdTo" class="selectBox"> + ${uiLabelMap.ProductSelectFacility}: + <select name="facilityIdTo"> <#list facilities as nextFacility> <option value="${(nextFacility.facilityId)?if_exists}">${(nextFacility.facilityName)?if_exists} [${(nextFacility.facilityId)?if_exists}]</option> </#list> </select> <br/> - <span class="tabletext">${uiLabelMap.ProductOrEnterContainerId}:</span> - <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)?if_exists}" size="20" maxlength="20" class="inputBox"> + ${uiLabelMap.ProductOrEnterContainerId}: + <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)?if_exists}" size="20" maxlength="20"> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductToLocation}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductToLocation}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20" class="inputBox"> - <span class="tabletext"> + <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20"> <a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation');"> <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> </a> - </span> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductComments}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductComments}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="comments" size="60" maxlength="250" class="inputBox"> + <input type="text" name="comments" size="60" maxlength="250"> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductQuantityToTransfer}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductQuantityToTransfer}</td> <td width="6%"> </td> <td width="74%"> <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")> - <input type="text" size="5" name="xferQty" value="${(inventoryItem.availableToPromiseTotal)?if_exists}" class="inputBox"> + <input type="text" size="5" name="xferQty" value="${(inventoryItem.availableToPromiseTotal)?if_exists}"> <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")> <input type="hidden" name="xferQty" value="1"> - <div class="tabletext">1</div> + 1 <#elseif inventoryItem?exists> - <div class="tabletext" style="color: red;">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</div> + <span class="alert">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</span> </#if> </td> </tr> <#else> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductTransferReceiveDate}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductTransferReceiveDate}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="receiveDate" value="${(inventoryTransfer.receiveDate)?if_exists}" size="22" class="inputBox"> - <a href="#" onclick="setNow('receiveDate')" class="buttontext">[${uiLabelMap.CommonNow}]</a> + <input type="text" name="receiveDate" value="${(inventoryTransfer.receiveDate)?if_exists}" size="22"> + <a href="#" onclick="setNow('receiveDate')" class="buttontext">${uiLabelMap.CommonNow}</a> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductToFacilityContainer}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductToFacilityContainer}</td> <td width="6%"> </td> <#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", inventoryTransfer.facilityIdTo))> - <td width="74%"><div class="tabletext">${(fac.facilityName)?if_exists}</div></td> + <td width="74%">${(fac.facilityName)?default(" ")}</td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductToLocation}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductToLocation}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20" class="inputBox"> - <span class="tabletext"> + <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20"> <a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation?facilityId=${inventoryTransfer.facilityIdTo}');"> <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> </a> - </span> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductComments}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductComments}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="comments" value="${(inventoryTransfer.comments)?if_exists}" size="60" maxlength="250" class="inputBox"> + <input type="text" name="comments" value="${(inventoryTransfer.comments)?if_exists}" size="60" maxlength="250"> </td> </tr> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |