svn commit: r684548 [3/4] - in /ofbiz/trunk: applications/content/template/
Locked
svn commit: r684548 [3/4] - in /ofbiz/trunk: applications/content/template/
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Sun Aug 10 09:28:14 2008 @@ -29,8 +29,8 @@ </div> <div class="screenlet-body"> <table width="100%" border="0" cellpadding="0"> - <tr align="left" valign="bottom"> - <td width="65%" align="left"><span><b>${uiLabelMap.ProductProduct}</b></span></td> + <tr valign="bottom"> + <td width="65%"><span><b>${uiLabelMap.ProductProduct}</b></span></td> <td width="5%" align="right"><span><b>${uiLabelMap.OrderQuantity}</b></span></td> <td width="10%" align="right"><span><b>${uiLabelMap.CommonUnitPrice}</b></span></td> <td width="10%" align="right"><span><b>${uiLabelMap.OrderAdjustments}</b></span></td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl Sun Aug 10 09:28:14 2008 @@ -61,7 +61,7 @@ <div> <b>${uiLabelMap.AccountingCreditCard}</b></div> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <div> <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}<br/></#if> <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> @@ -81,7 +81,7 @@ <div> <b>${uiLabelMap.AccountingEFTAccount}</b></div> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <div> ${eftAccount.nameOnAccount}<br/> <#if eftAccount.companyNameOnAccount?has_content>${eftAccount.companyNameOnAccount}<br/></#if> @@ -103,7 +103,7 @@ <div> <b>${uiLabelMap.AccountingBillingAccount}</b></div> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <div> #${billingAccount.billingAccountId?if_exists} - ${billingAccount.description?if_exists} </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Sun Aug 10 09:28:14 2008 @@ -128,7 +128,7 @@ ${uiLabelMap.ProductChooseCatalog} </td> <td> </td> - <td align="left"> + <td> <select name='CURRENT_CATALOG_ID'> <option value='${currentCatalogId}'>${currentCatalogName}</option> <option value='${currentCatalogId}'></option> @@ -146,7 +146,7 @@ ${uiLabelMap.WorkEffortWorkEffortId} </td> <td> </td> - <td align="left"> + <td> <input type="text" name="workEffortId" size="15"/> <a href="javascript:call_fieldlookup2(document.agreementForm.workEffortId,'LookupWorkEffort');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl Sun Aug 10 09:28:14 2008 @@ -20,7 +20,7 @@ <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <#-- left side --> - <td width="50%" valign="top" align="left"> + <td width="50%" valign="top"> <#-- header box --> <div class="screenlet"> @@ -56,7 +56,7 @@ <#-- end of left/right spacer --> <#-- right side --> - <td width="50%" valign="top" align="left"> + <td width="50%" valign="top"> <#-- contact box --> <div class="screenlet"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Sun Aug 10 09:28:14 2008 @@ -121,7 +121,7 @@ </select> </td> <td> </td> - <td align="left"> + <td> <input type="hidden" name="additionalPartyId" value="${additionalPartyId}"> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Sun Aug 10 09:28:14 2008 @@ -59,7 +59,7 @@ <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" <#if i == 0>checked</#if> /> </td> <td nowrap> </td> - <td align="left" valign="top" width="100%" nowrap> + <td valign="top" width="100%" nowrap> <div> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br/></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br/></#if> @@ -156,10 +156,10 @@ </#if> </#if> <tr> - <td align="left" valign="top" width="1%" nowrap> + <td valign="top" width="1%" nowrap> <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" ${checkedValue} /> </td> - <td align="left" valign="top" width="99%" nowrap> + <td valign="top" width="99%" nowrap> <div> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br/></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br/></#if> @@ -188,10 +188,10 @@ <#list shipToPartyShippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> <tr> - <td align="left" valign="top" width="1%" nowrap> + <td valign="top" width="1%" nowrap> <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/> </td> - <td align="left" valign="top" width="99%" nowrap> + <td valign="top" width="99%" nowrap> <div> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br/></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br/></#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Sun Aug 10 09:28:14 2008 @@ -418,27 +418,27 @@ <table class="basic-table hover-bar" cellspacing='0'> <tr class="header-row"> - <td width="1%" align="left"> + <td width="1%"> <input type="checkbox" name="checkAllOrders" value="1" onchange="javascript:toggleOrderId(this);"/> </td> - <td width="5%" align="left">${uiLabelMap.OrderOrderType}</td> - <td width="5%" align="left">${uiLabelMap.OrderOrderId}</td> - <td width="20%" align="left">${uiLabelMap.PartyName}</td> + <td width="5%">${uiLabelMap.OrderOrderType}</td> + <td width="5%">${uiLabelMap.OrderOrderId}</td> + <td width="20%">${uiLabelMap.PartyName}</td> <td width="5%" align="right">${uiLabelMap.OrderSurvey}</td> <td width="5%" align="right">${uiLabelMap.OrderItemsOrdered}</td> <td width="5%" align="right">${uiLabelMap.OrderItemsBackOrdered}</td> <td width="5%" align="right">${uiLabelMap.OrderItemsReturned}</td> <td width="10%" align="right">${uiLabelMap.OrderRemainingSubTotal}</td> <td width="10%" align="right">${uiLabelMap.OrderOrderTotal}</td> - <td width="5%" align="left"> </td> + <td width="5%"> </td> <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")> - <td width="15%" align="left">${uiLabelMap.CommonStatus}</td> + <td width="15%">${uiLabelMap.CommonStatus}</td> <td width="5%">${uiLabelMap.CommonFilter}</td> <#else> - <td width="20%" align="left">${uiLabelMap.CommonStatus}</td> + <td width="20%">${uiLabelMap.CommonStatus}</td> </#if> - <td width="20%" align="left">${uiLabelMap.OrderDate}</td> - <td width="5%" align="left">${uiLabelMap.PartyPartyId}</td> + <td width="20%">${uiLabelMap.OrderDate}</td> + <td width="5%">${uiLabelMap.PartyPartyId}</td> <td width="10%"> </td> </tr> <#if orderList?has_content> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Sun Aug 10 09:28:14 2008 @@ -44,7 +44,7 @@ <tr> <td align="right" valign="top" width="19%"><span class="label"> ${uiLabelMap.CommonName}</span></td> <td width="1%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <div> <#if displayParty?has_content> <#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> @@ -71,7 +71,7 @@ <span class="label"> ${contactMechPurpose.get("description",locale)}</span> </td> <td width="1%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS"> <#assign postalAddress = orderContactMechValueMap.postalAddress> <#if postalAddress?has_content> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Sun Aug 10 09:28:14 2008 @@ -45,7 +45,7 @@ <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOrderName}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%">${orderHeader.orderName}</td> + <td valign="top" width="80%">${orderHeader.orderName}</td> </tr> <tr><td colspan="3"><hr/></td></tr> </#if> @@ -53,7 +53,7 @@ <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderStatusHistory}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)} <#if orderHeaderStatuses?has_content> <hr/> @@ -73,27 +73,27 @@ <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDateOrdered}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%">${orderHeader.orderDate.toString()}</td> + <td valign="top" width="80%">${orderHeader.orderDate.toString()}</td> </tr> <tr><td colspan="3"><hr/></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCurrency}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%">${orderHeader.currencyUom?default("???")}</td> + <td valign="top" width="80%">${orderHeader.currencyUom?default("???")}</td> </tr> <#if orderHeader.internalCode?has_content> <tr><td colspan="3"><hr/></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderInternalCode}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%">${orderHeader.internalCode}</td> + <td valign="top" width="80%">${orderHeader.internalCode}</td> </tr> </#if> <tr><td colspan="3"><hr/></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderSalesChannel}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if orderHeader.salesChannelEnumId?has_content> <#assign channel = orderHeader.getRelatedOne("SalesChannelEnumeration")> ${(channel.get("description",locale))?default("N/A")} @@ -106,7 +106,7 @@ <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderProductStore}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if orderHeader.productStoreId?has_content> <a href="/catalog/control/EditProductStore?productStoreId=${orderHeader.productStoreId}${externalKeyParam}" target="catalogmgr" class="buttontext">${orderHeader.productStoreId}</a> <#else> @@ -118,7 +118,7 @@ <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOriginFacility}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if orderHeader.originFacilityId?has_content> <a href="/facility/control/EditFacility?facilityId=${orderHeader.originFacilityId}${externalKeyParam}" target="facilitymgr" class="buttontext">${orderHeader.originFacilityId}</a> <#else> @@ -130,7 +130,7 @@ <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderCreatedBy}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if orderHeader.createdBy?has_content> <a href="/partymgr/control/viewprofile?userlogin_id=${orderHeader.createdBy}${externalKeyParam}" target="partymgr" class="buttontext">${orderHeader.createdBy}</a> <#else> @@ -143,7 +143,7 @@ <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDistributor}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#assign distPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", distributorId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> ${distPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} </td> @@ -154,7 +154,7 @@ <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderAffiliate}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#assign affPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", affiliateId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> ${affPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} </div> @@ -166,7 +166,7 @@ <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderImage}</td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sun Aug 10 09:28:14 2008 @@ -27,10 +27,10 @@ </div> <div class="screenlet-body"> <table class="basic-table" cellspacing='0'> - <tr align="left" valign="bottom" class="header-row"> - <td width="30%" align="left">${uiLabelMap.ProductProduct}</td> - <td width="33%" align="left">${uiLabelMap.CommonStatus}</td> - <td width="5%" align="left">${uiLabelMap.OrderQuantity}</td> + <tr valign="bottom" class="header-row"> + <td width="30%">${uiLabelMap.ProductProduct}</td> + <td width="33%">${uiLabelMap.CommonStatus}</td> + <td width="5%">${uiLabelMap.OrderQuantity}</td> <td width="10%" align="right">${uiLabelMap.OrderUnitList}</td> <td width="10%" align="right">${uiLabelMap.OrderAdjustments}</td> <td width="10%" align="right">${uiLabelMap.OrderSubTotal}</td> @@ -91,25 +91,25 @@ <tr><td style="text-align: right; padding-bottom: 10px;"> <a class="buttontext" href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y&externalLoginKey=${externalLoginKey}" target="_blank">${uiLabelMap.ProductInventory}</a> </td><td> </td></tr> - <tr><td align="left">${uiLabelMap.OrderRequiredForSO}</td> + <tr><td>${uiLabelMap.OrderRequiredForSO}</td> <td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td></tr> <#if availableToPromiseByFacilityMap?exists && quantityOnHandByFacilityMap?exists && quantityOnHandByFacilityMap.get(productId)?exists && availableToPromiseByFacilityMap.get(productId)?exists> <#assign atpQuantityByFacility = availableToPromiseByFacilityMap.get(productId)?default(0)> <#assign qohQuantityByFacility = quantityOnHandByFacilityMap.get(productId)?default(0)> - <tr><td align="left">${uiLabelMap.ProductInInventory} [${facility.facilityName?if_exists}] ${uiLabelMap.ProductQoh}</td> + <tr><td>${uiLabelMap.ProductInInventory} [${facility.facilityName?if_exists}] ${uiLabelMap.ProductQoh}</td> <td style="padding-left: 15px; text-align: left;">${qohQuantityByFacility} (${uiLabelMap.ProductAtp}: ${atpQuantityByFacility})</td></tr> </#if> - <tr><td align="left">${uiLabelMap.ProductInInventory} [${uiLabelMap.CommonAll} ${uiLabelMap.ProductFacilities}] ${uiLabelMap.ProductQoh}</td> + <tr><td>${uiLabelMap.ProductInInventory} [${uiLabelMap.CommonAll} ${uiLabelMap.ProductFacilities}] ${uiLabelMap.ProductQoh}</td> <td style="padding-left: 15px; text-align: left;">${qohQuantity} (${uiLabelMap.ProductAtp}: ${atpQuantity})</td></tr> <#if (product != null) && (product.productTypeId != null) && (product.productTypeId == "MARKETING_PKG_AUTO" || product.productTypeId == "MARKETING_PKG_PICK")> - <tr><td align="left">${uiLabelMap.ProductMarketingPackageQOH}</td> + <tr><td>${uiLabelMap.ProductMarketingPackageQOH}</td> <td style="padding-left: 15px; text-align: left;">${mktgPkgQOH} (${uiLabelMap.ProductAtp}: ${mktgPkgATP})</td></tr> </#if> - <tr><td align="left">${uiLabelMap.OrderOnOrder}</td> + <tr><td>${uiLabelMap.OrderOnOrder}</td> <td style="padding-left: 15px; text-align: left;">${onOrderQuantity}</td></tr> - <tr><td align="left">${uiLabelMap.OrderInProduction}</td> + <tr><td>${uiLabelMap.OrderInProduction}</td> <td style="padding-left: 15px; text-align: left;">${inProductionQuantity}</td></tr> - <tr><td align="left">${uiLabelMap.OrderUnplanned}</td> + <tr><td>${uiLabelMap.OrderUnplanned}</td> <td style="padding-left: 15px; text-align: left;">${unplannedQuantity}</td></tr> </table> </div> @@ -119,7 +119,7 @@ <#-- now show status details per line item --> <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")> - <td align="left" colspan="1" valign="top"> + <td colspan="1" valign="top"> <div><span class="label">${uiLabelMap.CommonCurrent}</span> ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</div> <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)> <#list orderItemStatuses as orderItemStatus> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl Sun Aug 10 09:28:14 2008 @@ -37,11 +37,11 @@ <table class="basic-table" cellspacing='0'> <#list orderNotes as note> <tr> - <td align="left" valign="top" width="35%"> + <td valign="top" width="35%"> <div> <span class="label">${uiLabelMap.CommonBy}</span> ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div> <div> <span class="label">${uiLabelMap.CommonAt}</span> ${note.noteDateTime?string?if_exists}</div> </td> - <td align="left" valign="top" width="50%"> + <td valign="top" width="50%"> ${note.noteInfo?if_exists} </td> <td align="right" valign="top" width="15%"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Sun Aug 10 09:28:14 2008 @@ -75,7 +75,7 @@ </div> </td> <td width="1%"> </td> - <td align="left" valign="top" width="60%"> + <td valign="top" width="60%"> <div> <#if (finAccountType?has_content)> ${finAccountType.description?default(finAccountType.finAccountTypeId)} @@ -132,7 +132,7 @@ </td> <td width="1%"> </td> <#if paymentMethodType.paymentMethodTypeId != "EXT_OFFLINE" && paymentMethodType.paymentMethodTypeId != "EXT_PAYPAL" && paymentMethodType.paymentMethodTypeId != "EXT_COD"> - <td align="left" width="60%"> + <td width="60%"> <div> <#if orderPaymentPreference.maxAmount?has_content> <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> @@ -174,7 +174,7 @@ </div> </td> <td width="1%"> </td> - <td align="left" valign="top" width="60%"> + <td valign="top" width="60%"> <div> <#if creditCard?has_content> <#if creditCard.companyNameOnCard?exists>${creditCard.companyNameOnCard}<br/></#if> @@ -248,7 +248,7 @@ </div> </td> <td width="1%"> </td> - <td align="left" valign="top" width="60%"> + <td valign="top" width="60%"> <div> <#if eftAccount?has_content> ${eftAccount.nameOnAccount?if_exists}<br/> @@ -282,7 +282,7 @@ </div> </td> <td width="1%"> </td> - <td align="left" valign="top" width="60%"> + <td valign="top" width="60%"> <div> <#if giftCard?has_content> <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> @@ -327,7 +327,7 @@ <tr> <td align="right" valign="top" width="29%"> </td> <td width="1%"> </td> - <td align="left" valign="top" width="60%"> + <td valign="top" width="60%"> <div> <#if pmBillingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${pmBillingAddress.toName}<br/></#if> <#if pmBillingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${pmBillingAddress.attnName}<br/></#if> @@ -358,7 +358,7 @@ </div> </td> <td width="1%"> </td> - <td align="left" valign="top" width="60%"> + <td valign="top" width="60%"> #<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists} </td> <td width="10%"> </td> @@ -369,7 +369,7 @@ <tr> <td align="right" valign="top" width="29%"><span class="label">${uiLabelMap.OrderPONumber}</span></td> <td width="1%"> </td> - <td align="left" valign="top" width="60%">${customerPoNumber?if_exists}</td> + <td valign="top" width="60%">${customerPoNumber?if_exists}</td> <td width="10%"> </td> </tr> </#if> @@ -380,7 +380,7 @@ <tr> <td align="right" valign="top" width="29%"> <span class="label">${uiLabelMap.OrderInvoices}</span></td> <td width="1%"> </td> - <td align="left" valign="top" width="60%"> + <td valign="top" width="60%"> <#list invoices as invoice> <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a> (<a href="/accounting/control/invoice.pdf?invoiceId=${invoice}" class="buttontext">PDF</a>)</div> @@ -440,7 +440,7 @@ <tr> <td align="right" valign="top" width="29%"> </td> <td width="1%"> </td> - <td align="left" valign="top" width="60%"> + <td valign="top" width="60%"> <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/> </td> <td width="10%"> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sun Aug 10 09:28:14 2008 @@ -113,7 +113,7 @@ <span class="label"> ${uiLabelMap.OrderAddress}</span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <div> <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> <select name="contactMechId"> @@ -143,7 +143,7 @@ <span class="label"> <b>${uiLabelMap.CommonMethod}</span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if shipGroup.carrierPartyId?has_content || shipmentMethodType?has_content> <div> <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> @@ -175,7 +175,7 @@ <tr> <td align="right" valign="top" width="15%"> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/> </td> </tr> @@ -197,7 +197,7 @@ <span class="label"> ${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if supplier?has_content> - ${supplier.description?default(shipGroup.supplierPartyId)}</#if> </td> </tr> @@ -211,7 +211,7 @@ <span class="label"> ${uiLabelMap.OrderTrackingNumber}</span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId --> <#if shipGroup.trackingNumber?has_content> ${shipGroup.trackingNumber} @@ -238,7 +238,7 @@ <span class="label"> ${uiLabelMap.OrderSplittingPreference}</span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <div> <#if shipGroup.maySplit?upper_case == "N"> ${uiLabelMap.FacilityWaitEntireOrderReady} @@ -259,7 +259,7 @@ <span class="label"> ${uiLabelMap.OrderInstructions}</span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <div>${shipGroup.shippingInstructions}</div> </td> </tr> @@ -271,7 +271,7 @@ <span class="label"> ${uiLabelMap.OrderGift}</span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if shipGroup.isGift?upper_case == "N">${uiLabelMap.OrderThisOrderNotGift}<#else>${uiLabelMap.OrderThisOrderGift}</#if> </td> </tr> @@ -283,7 +283,7 @@ <span class="label"> ${uiLabelMap.OrderGiftMessage}</span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${shipGroup.giftMessage} </td> </tr> @@ -295,7 +295,7 @@ <span class="label"> ${uiLabelMap.OrderShipAfterDate}<span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${shipGroup.shipAfterDate} </td> </tr> @@ -307,7 +307,7 @@ <span class="label"> ${uiLabelMap.OrderShipBeforeDate}<span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${shipGroup.shipByDate} </td> </tr> @@ -320,7 +320,7 @@ <span class="label"> ${uiLabelMap.FacilityShipments}<span> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#list shipGroupShipments as shipment> <div>${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a> <a href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a></div> </#list> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl Sun Aug 10 09:28:14 2008 @@ -36,7 +36,7 @@ <td colspan="2"> </td> <td colspan="4"><hr/></td></tr> <tr> - <td align="left" class="label">${uiLabelMap.OrderOrdersTotals}</td> + <td class="label">${uiLabelMap.OrderOrdersTotals}</td> <td colspan="5"> </td> </tr> <tr> @@ -65,7 +65,7 @@ </tr> <tr><td colspan="6"><hr/></td></tr> <tr> - <td align="left" class="label">${uiLabelMap.OrderOrdersItemCounts}</td> + <td class="label">${uiLabelMap.OrderOrdersItemCounts}</td> <td colspan="5"> </td> </tr> <tr class="alternate-row"> @@ -94,7 +94,7 @@ </tr> <tr><td colspan="6"><hr/></td></tr> <tr> - <td align="left" class="label">${uiLabelMap.OrderOrdersPending}</td> + <td class="label">${uiLabelMap.OrderOrdersPending}</td> <td colspan="5"> </td> </tr> <tr> @@ -123,7 +123,7 @@ </tr> <tr><td colspan="6"><hr/></td></tr> <tr> - <td align="left" class="label">${uiLabelMap.OrderStatusChanges}</td> + <td class="label">${uiLabelMap.OrderStatusChanges}</td> <td colspan="5"> </td> </tr> <tr class="alternate-row"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl Sun Aug 10 09:28:14 2008 @@ -28,14 +28,14 @@ <div class="screenlet-body"> <table class="basic-table" cellspacing='0'> <tr class="header-row"> - <td width="35%" align="left">${uiLabelMap.OrderOrderTermType}</td> + <td width="35%">${uiLabelMap.OrderOrderTermType}</td> <td width="15%" align="center">${uiLabelMap.OrderOrderTermValue}</td> <td width="15%" align="center">${uiLabelMap.OrderOrderTermDays}</td> <td width="35%" align="center">${uiLabelMap.CommonDescription}</td> </tr> <#list orderTerms as orderTerm> <tr> - <td width="35%" align="left">${orderTerm.getRelatedOne("TermType").get("description", locale)}</td> + <td width="35%">${orderTerm.getRelatedOne("TermType").get("description", locale)}</td> <td width="15%" align="center">${orderTerm.termValue?default("")}</td> <td width="15%" align="center">${orderTerm.termDays?default("")}</td> <td width="35%" align="center">${orderTerm.textValue?default("")}</td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl Sun Aug 10 09:28:14 2008 @@ -37,9 +37,9 @@ <tr class="header-row"> <td width="30%" align="right">${uiLabelMap.OrderPaymentType}</td> <td width="1"> </td> - <td width="1" align="left">${uiLabelMap.OrderAmount}</td> + <td width="1">${uiLabelMap.OrderAmount}</td> <td width="1"> </td> - <td width="70%" align="left">${uiLabelMap.OrderReference}</td> + <td width="70%">${uiLabelMap.OrderReference}</td> </tr> <#list paymentMethodTypes as payType> <tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Sun Aug 10 09:28:14 2008 @@ -27,9 +27,9 @@ </div> <div class="screenlet-body"> <table cellspacing="0" class="basic-table"> - <tr align="left" valign="bottom" class="header-row"> - <td width="10%" align="left">${uiLabelMap.ProductItem}</td> - <td width="35%" align="left">${uiLabelMap.EcommerceProduct}</td> + <tr valign="bottom" class="header-row"> + <td width="10%">${uiLabelMap.ProductItem}</td> + <td width="35%">${uiLabelMap.EcommerceProduct}</td> <td width="10%" align="right">${uiLabelMap.ProductQuantity}</td> <td width="10%" align="right">${uiLabelMap.OrderAmount}</td> <td width="10%" align="right">${uiLabelMap.OrderOrderQuoteUnitPrice}</td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl Sun Aug 10 09:28:14 2008 @@ -27,7 +27,7 @@ ${uiLabelMap.OrderOrderQuoteIssueDate} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${(quote.issueDate.toString())?if_exists} </td> </tr> @@ -37,7 +37,7 @@ ${uiLabelMap.CommonValidFromDate} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${(quote.validFromDate.toString())?if_exists} </td> </tr> @@ -47,7 +47,7 @@ ${uiLabelMap.CommonValidThruDate} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${(quote.validThruDate.toString())?if_exists} </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl Sun Aug 10 09:28:14 2008 @@ -28,7 +28,7 @@ ${uiLabelMap.CommonType} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)} </td> </tr> @@ -40,7 +40,7 @@ ${uiLabelMap.OrderSalesChannel}</div> </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${(salesChannel.get("description",locale))?default(quote.salesChannelEnumId?if_exists)} </td> </tr> @@ -52,7 +52,7 @@ ${uiLabelMap.CommonStatus} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${(statusItem.get("description", locale))?default(quote.statusId?if_exists)} </td> </tr> @@ -63,7 +63,7 @@ ${uiLabelMap.PartyPartyId} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${quote.partyId?if_exists} </td> </tr> @@ -74,7 +74,7 @@ ${uiLabelMap.OrderOrderQuoteName} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${quote.quoteName?if_exists} </td> </tr> @@ -85,7 +85,7 @@ ${uiLabelMap.CommonDescription} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${quote.description?if_exists} </td> </tr> @@ -96,7 +96,7 @@ ${uiLabelMap.CommonCurrency} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if currency?exists>${currency.get("description",locale)?default(quote.currencyUomId?if_exists)}</#if> </td> </tr> @@ -107,7 +107,7 @@ ${uiLabelMap.ProductProductStore} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if store?exists>${store.storeName?default(quote.productStoreId?if_exists)}</#if> </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl Sun Aug 10 09:28:14 2008 @@ -32,7 +32,7 @@ ${roleType.get("description",locale)?if_exists} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${rolePartyNameResult.fullName?default("Name Not Found")} </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl Sun Aug 10 09:28:14 2008 @@ -23,9 +23,9 @@ </div> <div class="screenlet-body"> <table cellspacing="0" class="basic-table"> - <tr align="left" valign="bottom" class="header-row"> - <td width="10%" align="left">${uiLabelMap.ProductItem}</td> - <td width="35%" align="left">${uiLabelMap.OrderProduct}</td> + <tr valign="bottom" class="header-row"> + <td width="10%">${uiLabelMap.ProductItem}</td> + <td width="35%">${uiLabelMap.OrderProduct}</td> <td width="10%" align="right">${uiLabelMap.ProductQuantity}</td> <td width="10%" align="right">${uiLabelMap.OrderAmount}</td> <td width="10%" align="right">${uiLabelMap.OrderRequestMaximumAmount}</td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl Sun Aug 10 09:28:14 2008 @@ -41,7 +41,7 @@ ${label?default(uiLabelMap.PartyUnknown)} </td> <td width="5%"> </td> - <td align="left" valign="top" width="70%"> + <td valign="top" width="70%"> <div> <#if emailAddress?has_content>${emailAddress}</#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl Sun Aug 10 09:28:14 2008 @@ -27,7 +27,7 @@ ${uiLabelMap.OrderRequestDate} </td> <td width="5%"> </td> - <td align="left" valign="top" width="70%"> + <td valign="top" width="70%"> ${(custRequest.custRequestDate.toString())?if_exists} </td> </tr> @@ -37,7 +37,7 @@ ${uiLabelMap.OrderRequestCreatedDate} </td> <td width="5%"> </td> - <td align="left" valign="top" width="70%"> + <td valign="top" width="70%"> ${(custRequest.createdDate.toString())?if_exists} </td> </tr> @@ -47,7 +47,7 @@ ${uiLabelMap.OrderRequestLastModifiedDate} </td> <td width="5%"> </td> - <td align="left" valign="top" width="70%"> + <td valign="top" width="70%"> ${(custRequest.lastModifiedDate.toString())?if_exists} </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl Sun Aug 10 09:28:14 2008 @@ -28,7 +28,7 @@ ${uiLabelMap.CommonType} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${(custRequestType.get("description",locale))?default(custRequest.custRequestTypeId?if_exists)} </td> </tr> @@ -39,7 +39,7 @@ ${uiLabelMap.CommonStatus} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${(statusItem.get("description", locale))?default(custRequest.statusId?if_exists)} </td> </tr> @@ -50,7 +50,7 @@ ${uiLabelMap.PartyPartyId} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${custRequest.fromPartyId?if_exists} </td> </tr> @@ -61,7 +61,7 @@ ${uiLabelMap.CommonName} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${custRequest.custRequestName?if_exists} </td> </tr> @@ -72,7 +72,7 @@ ${uiLabelMap.CommonDescription} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${custRequest.description?if_exists} </td> </tr> @@ -83,7 +83,7 @@ ${uiLabelMap.CommonCurrency} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if currency?exists>${currency.get("description", locale)?default(custRequest.maximumAmountUomId?if_exists)}</#if> </td> </tr> @@ -94,7 +94,7 @@ ${uiLabelMap.ProductProductStore} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> <#if store?exists>${store.storeName?default(custRequest.productStoreId?if_exists)}</#if> </td> </tr> @@ -105,7 +105,7 @@ ${uiLabelMap.CommonInternalComment} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${custRequest.internalComment?if_exists} </td> </tr> @@ -116,7 +116,7 @@ ${uiLabelMap.CommonReason} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${custRequest.reason?if_exists} </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl Sun Aug 10 09:28:14 2008 @@ -31,7 +31,7 @@ ${roleType.get("description", locale)?if_exists} </td> <td width="5%"> </td> - <td align="left" valign="top" width="80%"> + <td valign="top" width="80%"> ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(party)} </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl Sun Aug 10 09:28:14 2008 @@ -80,7 +80,7 @@ <td align="right" width="1%" valign="top" nowrap> <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}" <#if (shippingContactMechList?size == 1)>checked</#if>> </td> - <td align="left" width="99%" valign="top" nowrap> + <td width="99%" valign="top" nowrap> <div> <#if shippingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${shippingAddress.toName}<br/></#if> <#if shippingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span></b> ${shippingAddress.attnName}<br/></#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl Sun Aug 10 09:28:14 2008 @@ -241,11 +241,11 @@ </tr> <#else> <tr> - <td colspan="9" align="left" class="label">${uiLabelMap.OrderReturnNoReturnableItems} #${orderId}</td> + <td colspan="9" class="label">${uiLabelMap.OrderReturnNoReturnableItems} #${orderId}</td> </tr> </#if> <tr> - <td colspan="3" align="left" class="tooltip">*${uiLabelMap.OrderReturnPriceNotIncludeTax}</td> + <td colspan="3" class="tooltip">*${uiLabelMap.OrderReturnPriceNotIncludeTax}</td> <td colspan="6"> </td> </tr> </table> \ No newline at end of file Modified: ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl Sun Aug 10 09:28:14 2008 @@ -99,7 +99,7 @@ <td width='100%'> <table width='100%' border='0' cellpadding='0' cellspacing='0' class='boxtop'> <tr> - <td align="left" width='90%'> + <td width='90%'> <#if webSitePayment?has_content> <div class='boxhead'> Update Setting</div> <#else> @@ -190,7 +190,7 @@ </tr> <tr> <td colspan='2'> </td> - <td colspan='1' align="left"><input type="submit" value="Update"></td> + <td colspan='1'><input type="submit" value="Update"></td> </tr> </table> </form> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl Sun Aug 10 09:28:14 2008 @@ -77,14 +77,14 @@ </tr> <#else> <#-- <tr> - <td align="left" valign="top" colspan="2"> + <td valign="top" colspan="2"> ${uiLabelMap.PartyBillingAddressNotSelected} </td> </tr> --> </#if> <#-- is confusing <tr> - <td align="left" valign="top" colspan="2"> + <td valign="top" colspan="2"> <b>Select a New Billing Address:</b> </td> </tr> @@ -125,7 +125,7 @@ <td align="right" valigh="top" width="1%"> <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked</#if>> </td> - <td align="left" valign="middle" width="80%"> + <td valign="middle" width="80%"> ${uiLabelMap.PartyCreateNewBillingAddress}. </td> </tr> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl Sun Aug 10 09:28:14 2008 @@ -123,14 +123,14 @@ </tr> <#else> <#-- <tr> - <td align="left" valign="top" colspan='2'> + <td valign="top" colspan='2'> ${uiLabelMap.PartyNoBillingAddress}</div> </td> </tr> --> </#if> <#-- is confusing <tr> - <td align="left" valign="top" colspan='2'> + <td valign="top" colspan='2'> <b>Select a New Billing Address:</b></div> </td> </tr> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl Sun Aug 10 09:28:14 2008 @@ -33,8 +33,8 @@ </tr> <#list partyRoles as userRole> <tr> - <td align="left">${userRole.roleTypeId}</td> - <td align="left">${userRole.get("description",locale)}</td> + <td>${userRole.roleTypeId}</td> + <td>${userRole.get("description",locale)}</td> <#if hasDeletePermission> <td class="button-col align-float"> <a href="<@ofbizUrl>deleterole?partyId=${partyId}&roleTypeId=${userRole.roleTypeId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonRemove}</a> Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl Sun Aug 10 09:28:14 2008 @@ -145,7 +145,7 @@ <#assign alt_row = !alt_row> </#list> <#else/> - <tr align="left"> + <tr> <td colspan="6">${uiLabelMap.PartyNoServerHitsFound}</td> </tr> </#if> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Sun Aug 10 09:28:14 2008 @@ -69,7 +69,7 @@ <table cellspacing="0" class="basic-table"> <tr> - <td align="left"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);"/> <b>${uiLabelMap.ProductProduct}</b></td> + <td><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);"/> <b>${uiLabelMap.ProductProduct}</b></td> <td align="right"> <b> <#if 0 < viewIndex?int> Modified: ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Sun Aug 10 09:28:14 2008 @@ -33,7 +33,7 @@ <#assign productPriceActions = productPriceRule.getRelated("ProductPriceAction")> <tr valign="middle"> <td class="label"><b>${productPriceRule.productPriceRuleId}</b></td> - <td align="left"> + <td> <form method="post" action="<@ofbizUrl>updateProductPriceRule</@ofbizUrl>" name="updateProductPriceRule"> <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}"> <input type="text" size="15" name="ruleName" value="${productPriceRule.ruleName}"> @@ -60,7 +60,7 @@ </tr> <tr valign="top"> <td align="right" class="label">${uiLabelMap.ProductConditions}</td> - <td align="left" colspan="2"> + <td colspan="2"> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td width="5%"><b>${uiLabelMap.ProductSeqId}</b></td> @@ -75,7 +75,7 @@ <#assign curCondSeqId = productPriceCond.productPriceCondSeqId?number> <#if (curCondSeqId >= maxCondSeqId)><#assign maxCondSeqId = curCondSeqId + 1></#if> <td><b>${productPriceCond.productPriceCondSeqId}</b></td> - <td align="left"> + <td> <form method="post" action="<@ofbizUrl>updateProductPriceCond</@ofbizUrl>"> <input type="hidden" name="productPriceRuleId" value="${productPriceCond.productPriceRuleId}"/> <input type="hidden" name="productPriceCondSeqId" value="${productPriceCond.productPriceCondSeqId}"/> @@ -120,7 +120,7 @@ </#if> </#list> <tr> - <td align="left" colspan="3"> + <td colspan="3"> <form method="post" action="<@ofbizUrl>createProductPriceCond</@ofbizUrl>"> <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}"> <span class="label"><b>${uiLabelMap.CommonNew}</b> </span> @@ -144,7 +144,7 @@ </tr> <tr valign="top"> <td align="right" class="label">${uiLabelMap.ProductActions}</td> - <td align="left" colspan="2"> + <td colspan="2"> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td width="5%"><b>${uiLabelMap.ProductSeqId}</b></td> @@ -155,7 +155,7 @@ <#list productPriceActions as productPriceAction> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td class="label"><b>${productPriceAction.productPriceActionSeqId}</b></td> - <td align="left"> + <td> <form method="post" action="<@ofbizUrl>updateProductPriceAction</@ofbizUrl>"> <input type="hidden" name="productPriceRuleId" value="${productPriceAction.productPriceRuleId}"> <input type="hidden" name="productPriceActionSeqId" value="${productPriceAction.productPriceActionSeqId}"> @@ -188,7 +188,7 @@ </#if> </#list> <tr> - <td align="left" colspan="3"> + <td colspan="3"> <form method="post" action="<@ofbizUrl>createProductPriceAction</@ofbizUrl>"> <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}"> <span class="label"><b>${uiLabelMap.CommonNew}</b> </span> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Sun Aug 10 09:28:14 2008 @@ -168,7 +168,7 @@ <tr> <td colspan="2"> </td> - <td align="left"><input type="submit" <#if isCreate>value="${uiLabelMap.CommonCreate}"<#else>value="${uiLabelMap.CommonUpdate}"</#if>></td> + <td><input type="submit" <#if isCreate>value="${uiLabelMap.CommonCreate}"<#else>value="${uiLabelMap.CommonUpdate}"</#if>></td> </tr> </table> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Sun Aug 10 09:28:14 2008 @@ -71,7 +71,7 @@ <tr> <td><h2>${productId?if_exists}<h2></td> <td><input type="text" name="productName" size="40" maxlength="40" value="${product.productName?if_exists}"/></td> - <td align="left"><input type="submit" value="${uiLabelMap.UpdateName}"/></td> + <td><input type="submit" value="${uiLabelMap.UpdateName}"/></td> </tr> </table> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Sun Aug 10 09:28:14 2008 @@ -35,7 +35,7 @@ <#assign productPromoActions = productPromoRule.getRelated("ProductPromoAction")> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td class="label"><b>${(productPromoRule.productPromoRuleId)?if_exists}</b></td> - <td align="left"> + <td> <form method="post" action="<@ofbizUrl>updateProductPromoRule</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}"> <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}"> @@ -52,7 +52,7 @@ </tr> <tr valign="top"> <td align="right" class="label">${uiLabelMap.ProductConditions}</td> - <td align="left" colspan="2"> + <td colspan="2"> <table cellspacing="0" class="basic-table"> <#assign maxCondSeqId = 1> <#list productPromoConds as productPromoCond> @@ -65,7 +65,7 @@ </#if> </#if> <td class="label"><b>${(productPromoCond.productPromoCondSeqId)?if_exists}</b></td> - <td align="left"> + <td> <form method="post" action="<@ofbizUrl>updateProductPromoCond</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}"/> <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}"/> @@ -170,7 +170,7 @@ </tr> </#list> <tr> - <td align="left" colspan="3"> + <td colspan="3"> <form method="post" action="<@ofbizUrl>createProductPromoCond</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}"> <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}"> @@ -196,12 +196,12 @@ </tr> <tr valign="top"> <td align="right" class="label">${uiLabelMap.ProductActions} :</td> - <td align="left" colspan="2"> + <td colspan="2"> <table cellspacing="0" class="basic-table"> <#list productPromoActions as productPromoAction> <tr> <td class="label"><b>${(productPromoAction.productPromoActionSeqId)?if_exists}</b></td> - <td align="left"> + <td> <div> <form method="post" action="<@ofbizUrl>updateProductPromoAction</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}"> @@ -299,7 +299,7 @@ </tr> </#list> <tr> - <td align="left" colspan="3"> + <td colspan="3"> <div> <form method="post" action="<@ofbizUrl>createProductPromoAction</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}"> Modified: ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl Sun Aug 10 09:28:14 2008 @@ -66,7 +66,7 @@ </div> </form> </td> - <td align="left"> + <td> </#if> <div> <a href="<@ofbizUrl>deleteKeywordThesaurus?enteredKeyword=${keyword.enteredKeyword}&alternateKeyword=${keyword.alternateKeyword}</@ofbizUrl>" class="buttontext">X</a> 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?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Sun Aug 10 09:28:14 2008 @@ -230,9 +230,9 @@ <tr> <td colspan="2"> </td> <#if !(inventoryTransfer?exists)> - <td colspan="1" align="left"><input type="submit" value="${uiLabelMap.ProductTransfer}"></td> + <td colspan="1"><input type="submit" value="${uiLabelMap.ProductTransfer}"></td> <#else> - <td colspan="1" align="left"><input type="submit" value="${uiLabelMap.CommonUpdate}"></td> + <td colspan="1"><input type="submit" value="${uiLabelMap.CommonUpdate}"></td> </#if> </tr> </table> Modified: ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl Sun Aug 10 09:28:14 2008 @@ -26,7 +26,7 @@ <td>${uiLabelMap.ProductAtp}</td> <td>${uiLabelMap.FormFieldTitle_unitCost}</td> </tr> - <tr><td colspan="6"><hr class="sepbar"/></td></tr> + <tr><td colspan="6"><hr/></td></tr> <#if (inventoryItemsForPo?exists && inventoryItemsForPo?has_content)> <tr class="header-row-2"><td colspan="6"><span class="label"> ${uiLabelMap.ProductInventoryItemsFor} ${uiLabelMap.ProductPurchaseOrder} - ${orderId}</span></td></tr> <#list inventoryItemsForPo as inventoryItem> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl Sun Aug 10 09:28:14 2008 @@ -73,7 +73,7 @@ <br/> <div> <div align="right"><h2>${uiLabelMap.ProductShipmentTotalWeight}: ${totWeight} ${uiLabelMap.ProductShipmentTotalVolume}: ${totVolume}</h2></div> - <div align="left">${shipmentPlanToOrderItemsForm.renderFormString(context)}</div> + <div>${shipmentPlanToOrderItemsForm.renderFormString(context)}</div> </div> </div> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Sun Aug 10 09:28:14 2008 @@ -169,12 +169,12 @@ <div class="screenlet-body"> <table cellspacing="0" cellpadding="2" class="basic-table hover-bar"> <tr class="header-row"> - <td width="5%" align="left">${uiLabelMap.ProductShipmentId}</td> - <td width="15%" align="left">${uiLabelMap.ProductShipmentType}</td> - <td width="10%" align="left">${uiLabelMap.ProductStatus}</td> - <td width="25%" align="left">${uiLabelMap.ProductOriginFacility}</td> - <td width="25%" align="left">${uiLabelMap.ProductDestFacility}</td> - <td width="15%" align="left">${uiLabelMap.ProductShipDate}</td> + <td width="5%">${uiLabelMap.ProductShipmentId}</td> + <td width="15%">${uiLabelMap.ProductShipmentType}</td> + <td width="10%">${uiLabelMap.ProductStatus}</td> + <td width="25%">${uiLabelMap.ProductOriginFacility}</td> + <td width="25%">${uiLabelMap.ProductDestFacility}</td> + <td width="15%">${uiLabelMap.ProductShipDate}</td> <td width="5%"> </td> </tr> <#if shipmentList?has_content> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?rev=684548&r1=684547&r2=684548&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Sun Aug 10 09:28:14 2008 @@ -58,7 +58,7 @@ <tr> <td width="20%" align="right"><span class="label">${uiLabelMap.ProductCarrier}</span></td> <td> </td> - <td width="1%" align="left" nowrap> + <td width="1%" nowrap> <select name="carrierPartyId"> <#if shipmentRoute.carrierPartyId?has_content> <option value="${shipmentRoute.carrierPartyId}">${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRoute.carrierPartyId}]</option> @@ -79,7 +79,7 @@ <tr> <td width="20%" align="right"><span class="label">${uiLabelMap.ProductShipMethod}</span></td> <td> </td> - <td width="1%" align="left" nowrap> + <td width="1%" nowrap> <select name="shipmentMethodTypeId"> <#if shipmentMethodType?has_content> <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.get("description",locale)}</option> @@ -100,7 +100,7 @@ <tr> <td width="20%" align="right"> </td> <td> </td> - <td width="1%" align="left" nowrap> + <td width="1%" nowrap> </td> <td> </td> @@ -131,7 +131,7 @@ <tr> <td width="20%" align="right"><span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackage.shipmentPackageSeqId} ${uiLabelMap.ProductWeight}</td> <td> </td> - <td width="80%" align="left"> + <td width="80%"> <input type="text" name="weight"> <select name="weightUomId"> <#if weightUom?has_content> @@ -146,7 +146,7 @@ </tr> <tr> <td colspan="2"> </td> - <td width="80%" align="left"> + <td width="80%"> <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.weightForm.submit();"/> <a href="javascript:document.weightForm.submit();" class="buttontext">${uiLabelMap.ProductSetWeight}</a> </td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |