You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/01/20 21:28:47 UTC
svn commit: r613672 [3/4] - in /ofbiz/trunk/applications/order:
webapp/ordermgr/lookup/ webapp/ordermgr/order/ webapp/ordermgr/quote/
webapp/ordermgr/request/ webapp/ordermgr/requirement/
webapp/ordermgr/return/ webapp/ordermgr/task/ widget/ordermgr/
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=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Sun Jan 20 12:28:45 2008
@@ -20,15 +20,13 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul><li class="head3"> ${uiLabelMap.AccountingPaymentInformation}</li></ul>
- <br class="clear" />
+ <br class="clear"/>
</div>
<div class="screenlet-body">
- <table width="100%" border="0" cellpadding="1" cellspacing="0"><tbody>
+ <table class="basic-table" cellspacing='0'>
<#-- order payment status -->
<tr>
- <td align="center" valign="top" width="25%">
- <div class="tabletext"> <b>${uiLabelMap.OrderStatusHistory}</b></div>
- </td>
+ <td align="center" valign="top" width="25%" class="label"> ${uiLabelMap.OrderStatusHistory}</td>
<td width="15"> </td>
<td>
<#assign orderPaymentStatuses = orderReadHelper.getOrderPaymentStatuses()>
@@ -36,7 +34,7 @@
<#list orderPaymentStatuses as orderPaymentStatus>
<#assign statusItem = orderPaymentStatus.getRelatedOne("StatusItem")?if_exists>
<#if statusItem?has_content>
- <div class="tabletext">
+ <div>
${statusItem.get("description",locale)} - ${orderPaymentStatus.statusDatetime?default("0000-00-00 00:00:00")?string}
${uiLabelMap.CommonBy} - [${orderPaymentStatus.statusUserLogin?if_exists}]
@@ -46,13 +44,13 @@
</#if>
</td>
</tr>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
<#list orderPaymentPreferences as orderPaymentPreference>
<#assign pmBillingAddress = {}>
<#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")>
<#if outputted?default("false") == "true">
- <tr><td colspan="4"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="4"><hr/></td></tr>
</#if>
<#assign outputted = "true">
<#-- try the paymentMethod first; if paymentMethodId is specified it overrides paymentMethodTypeId -->
@@ -68,7 +66,8 @@
<#assign finAccountType = finAccount.getRelatedOne("FinAccountType")?if_exists/>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.AccountingFinAccount}</b>
+ <div>
+ <span class="label"> ${uiLabelMap.AccountingFinAccount}</span>
<#if orderPaymentPreference.maxAmount?has_content>
<br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
@@ -78,7 +77,7 @@
<td align="left" valign="top" width="80%">
<div class="tabletext">
<#if (finAccountType?has_content)>
- <b>${finAccountType.description?default(finAccountType.finAccountTypeId)}</b>
+ ${finAccountType.description?default(finAccountType.finAccountTypeId)}
</#if>
#${finAccount.finAccountCode?default(finAccount.finAccountId)} (<a href="/accounting/control/EditFinAccount?finAccountId=${finAccount.finAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${finAccount.finAccountId}</a>)
<br/>
@@ -86,7 +85,7 @@
<br/>
<#-- Authorize and Capture transactions -->
- <div class="tabletext">
+ <div>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
</#if>
@@ -96,18 +95,18 @@
</div>
</div>
<#if gatewayResponses?has_content>
- <div class="tabletext">
- <hr class="sepbar"/>
+ <div>
+ <hr/>
<#list gatewayResponses as gatewayResponse>
<#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")>
${(transactionCode.get("description",locale))?default("Unknown")}:
${gatewayResponse.transactionDate.toString()}
<@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br/>
- (<b>${uiLabelMap.OrderReference}:</b> ${gatewayResponse.referenceNum?if_exists}
- <b>${uiLabelMap.OrderAvs}:</b> ${gatewayResponse.gatewayAvsResult?default("N/A")}
- <b>${uiLabelMap.OrderScore}:</b> ${gatewayResponse.gatewayScoreResult?default("N/A")})
+ (<span class"label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists}
+ <span class"label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")}
+ <span class"label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")})
<a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a>
- <#if gatewayResponse_has_next><hr class="sepbar"/></#if>
+ <#if gatewayResponse_has_next><hr/></#if>
</#list>
</div>
</#if>
@@ -124,7 +123,7 @@
<#else>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${paymentMethodType.get("description",locale)?if_exists}</b>
+ <div> <span class"label">${paymentMethodType.get("description",locale)?if_exists}</span>
<#if orderPaymentPreference.maxAmount?has_content>
<br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
@@ -133,7 +132,7 @@
<td width="5"> </td>
<#if paymentMethodType.paymentMethodTypeId != "EXT_OFFLINE" && paymentMethodType.paymentMethodTypeId != "EXT_PAYPAL" && paymentMethodType.paymentMethodTypeId != "EXT_COD">
<td align="left">
- <div class="tabletext">
+ <div>
<#if orderPaymentPreference.maxAmount?has_content>
<br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
@@ -167,7 +166,7 @@
</#if>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.AccountingCreditCard}</b>
+ <div> <span class="label">${uiLabelMap.AccountingCreditCard}</span>
<#if orderPaymentPreference.maxAmount?has_content>
<br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
@@ -175,7 +174,7 @@
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
<#if creditCard?has_content>
<#if creditCard.companyNameOnCard?exists>${creditCard.companyNameOnCard}<br/></#if>
<#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
@@ -197,7 +196,7 @@
<br/>
<#-- Authorize and Capture transactions -->
- <div class="tabletext">
+ <div>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
</#if>
@@ -205,24 +204,23 @@
<a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
</#if>
</div>
-
<#else>
${uiLabelMap.CommonInformation} ${uiLabelMap.CommonNot} ${uiLabelMap.CommonAvailable}
</#if>
</div>
<#if gatewayResponses?has_content>
- <div class="tabletext">
- <hr class="sepbar"/>
+ <div>
+ <hr/>
<#list gatewayResponses as gatewayResponse>
<#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")>
${(transactionCode.get("description",locale))?default("Unknown")}:
${gatewayResponse.transactionDate.toString()}
<@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br/>
- (<b>${uiLabelMap.OrderReference}:</b> ${gatewayResponse.referenceNum?if_exists}
- <b>${uiLabelMap.OrderAvs}:</b> ${gatewayResponse.gatewayAvsResult?default("N/A")}
- <b>${uiLabelMap.OrderScore}:</b> ${gatewayResponse.gatewayScoreResult?default("N/A")})
+ (<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists}
+ <span class="label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")}
+ <span class="label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")})
<a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a>
- <#if gatewayResponse_has_next><hr class="sepbar"/></#if>
+ <#if gatewayResponse_has_next><hr/></#if>
</#list>
</div>
</#if>
@@ -242,7 +240,7 @@
</#if>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.AccountingEFTAccount}</b>
+ <div> <span class="label">${uiLabelMap.AccountingEFTAccount}</span>
<#if orderPaymentPreference.maxAmount?has_content>
<br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
@@ -276,7 +274,7 @@
</#if>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderGiftCard}</b>
+ <div> <span class="label">${uiLabelMap.OrderGiftCard}</span>
<#if orderPaymentPreference.maxAmount?has_content>
<br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
@@ -284,7 +282,7 @@
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
<#if giftCard?has_content>
<#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)>
${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}]
@@ -324,16 +322,14 @@
</#if>
</#if>
<#if pmBillingAddress?has_content>
- <tr><td> </td><td> </td><td colspan="2"><hr class="sepbar"/></td></tr>
+ <tr><td> </td><td> </td><td colspan="2"><hr/></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> </div>
- </td>
+ <td align="right" valign="top" width="15%"> </td>
<td width="5"> </td>
<td colspan="2" align="left" valign="top" width="80%">
- <div class="tabletext">
- <#if pmBillingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${pmBillingAddress.toName}<br/></#if>
- <#if pmBillingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${pmBillingAddress.attnName}<br/></#if>
+ <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>
${pmBillingAddress.address1}<br/>
<#if pmBillingAddress.address2?has_content>${pmBillingAddress.address2}<br/></#if>
${pmBillingAddress.city}<#if pmBillingAddress.stateProvinceGeoId?has_content>, ${pmBillingAddress.stateProvinceGeoId} </#if>
@@ -348,12 +344,12 @@
<#-- billing account -->
<#if billingAccount?exists>
<#if outputted?default("false") == "true">
- <tr><td colspan="4"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="4"><hr/></td></tr>
</#if>
<tr>
<td align="right" valign="top" width="15%">
<#-- billing accounts require a special OrderPaymentPreference because it is skipped from above section of OPPs -->
- <div class="tabletext"> <b>${uiLabelMap.AccountingBillingAccount}</b>
+ <div> <span class="label">${uiLabelMap.AccountingBillingAccount}</span>
<#if billingAccountMaxAmount?has_content>
<br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=billingAccountMaxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
@@ -361,36 +357,28 @@
</td>
<td width="5"> </td>
<td colspan="2" align="left" valign="top" width="80%">
- <div class="tabletext">
- #<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists}
- </div>
+ #<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists}
</td>
</tr>
</#if>
<#if customerPoNumber?has_content>
- <tr><td colspan="4"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="4"><hr/></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderPONumber}</b></div>
- </td>
+ <td align="right" valign="top" width="15%"><span class="label">${uiLabelMap.OrderPONumber}</span></td>
<td width="5"> </td>
- <td colspan="2" align="left" valign="top" width="80%">
- <div class="tabletext">${customerPoNumber?if_exists}</div>
- </td>
+ <td colspan="2" align="left" valign="top" width="80%">${customerPoNumber?if_exists}</td>
</tr>
</#if>
<#-- invoices -->
<#if invoices?has_content>
- <tr><td colspan="4"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="4"><hr/></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderInvoices}</b></div>
- </td>
+ <td align="right" valign="top" width="15%"> <span class="label">${uiLabelMap.OrderInvoices}</span></td>
<td width="5"> </td>
<td colspan="2" align="left" valign="top" width="80%">
<#list invoices as invoice>
- <div class="tabletext">${uiLabelMap.OrderNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a>
+ <div>${uiLabelMap.OrderNbr}<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>
</#list>
</td>
@@ -398,20 +386,20 @@
</#if>
<#else>
<tr>
- <td colspan="4" align="center" class="tabletext">${uiLabelMap.OrderNoOrderPaymentPreferences}</td>
+ <td colspan="4" align="center">${uiLabelMap.OrderNoOrderPaymentPreferences}</td>
</tr>
</#if>
<#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED")) && (paymentMethodValueMaps?has_content)>
- <tr><td colspan="4"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="4"><hr/></td></tr>
<tr><td colspan="4">
<form name="addPaymentMethodToOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId?if_exists}"/>
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <table class="basic-table" cellspacing='0'>
<tr>
- <td width="15%" align="right" nowrap="nowrap"><div class="tableheadtext">${uiLabelMap.AccountingPaymentMethod} </div></td>
+ <td width="15%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.AccountingPaymentMethod}</span></td>
<td width="5"> </td>
<td nowrap="nowrap">
- <select name="paymentMethodId" class="selectBox">
+ <select name="paymentMethodId">
<#list paymentMethodValueMaps as paymentMethodValueMap>
<#assign paymentMethod = paymentMethodValueMap.paymentMethod/>
<option value="${paymentMethod.get("paymentMethodId")?if_exists}">
@@ -436,29 +424,23 @@
</tr>
<#assign openAmount = orderReadHelper.getOrderOpenAmount()>
<tr>
- <td width="20%" align="right"><div class="tableheadtext">${uiLabelMap.AccountingAmount} </div></td>
+ <td width="20%" align="right"><span class="label">${uiLabelMap.AccountingAmount}</span></td>
<td width="2%"> </td>
<td nowrap="nowrap">
- <input type="text" class="inputBox" name="maxAmount" value="${openAmount}"/>
+ <input type="text" name="maxAmount" value="${openAmount}"/>
</td>
</tr>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> </div>
- </td>
+ <td align="right" valign="top" width="15%"> </td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
- <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>
- </div>
+ <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>
</td>
</tr>
</table>
</form>
</td></tr>
-
</#if>
-</tbody>
</table>
</div>
-</div>
+</div>
\ No newline at end of file
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=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sun Jan 20 12:28:45 2008
@@ -27,7 +27,7 @@
<li class="head3"> ${uiLabelMap.OrderShipmentInformation} - ${shipGroup.shipGroupSeqId}</li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderShipGroup} PDF</a></li>
</ul>
- <br class="clear" />
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<form name="updateOrderItemShipGroup" method="post" action="<@o...@ofbizUrl>">
@@ -35,17 +35,17 @@
<input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}"/>
<input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"/>
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <#if shipGroup.contactMechId?has_content>
+ <table class="basic-table" cellspacing='0'>
+ <#if shipGroup.contactMechId?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderAddress}</b></div>
+ <span class="label"> ${uiLabelMap.OrderAddress}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
- <select name="contactMechId" class="selectBox">
+ <select name="contactMechId">
<option selected="selected" value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option>
<#if shippingContactMechList?has_content>
<option disabled="disabled" value=""></option>
@@ -69,18 +69,18 @@
<#if orderHeader.orderTypeId == "SALES_ORDER" && shipGroup.shipmentMethodTypeId?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.CommonMethod}</b></div>
+ <span class="label"> <b>${uiLabelMap.CommonMethod}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
<#if shipGroup.carrierPartyId?has_content || shipmentMethodType?has_content>
- <div class="tabletext">
+ <div>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
<#-- passing the shipmentMethod value as the combination of two fields value
i.e shipmentMethodTypeId & carrierPartyId and this two field values are separated bye
"@" symbol.
-->
- <select name="shipmentMethod" class="selectBox">
+ <select name="shipmentMethod">
<option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId?if_exists}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId?if_exists}</#if> ${shipmentMethodType.get("description",locale)?default("")}</option>
<#list productStoreShipmentMethList as productStoreShipmentMethod>
<#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId>
@@ -102,23 +102,17 @@
</#if>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> </div>
- </td>
+ <td align="right" valign="top" width="15%"> </td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
- <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
- </div>
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
</td>
</tr>
</#if>
<#if !shipGroup.contactMechId?has_content && !shipGroup.shipmentMethodTypeId?has_content>
<#assign noShipment = "true">
<tr>
- <td colspan="3" align="center">
- <div class="tableheadtext">${uiLabelMap.OrderNotShipped}</div>
- </td>
+ <td colspan="3" align="center">${uiLabelMap.OrderNotShipped}</td>
</tr>
</#if>
</table>
@@ -126,35 +120,35 @@
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<#if shipGroup.supplierPartyId?has_content>
<#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId))?if_exists />
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</b></div>
+ <span class="label"> ${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext"><#if supplier?has_content> - ${supplier.description?default(shipGroup.supplierPartyId)}</#if></div>
+ <#if supplier?has_content> - ${supplier.description?default(shipGroup.supplierPartyId)}</#if>
</td>
</tr>
</#if>
<#-- tracking number -->
<#if shipGroup.trackingNumber?has_content || orderShipmentInfoSummaryList?has_content>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderTrackingNumber}</b></div>
+ <span class="label"> ${uiLabelMap.OrderTrackingNumber}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
<#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId -->
<#if shipGroup.trackingNumber?has_content>
- <div class="tabletext">${shipGroup.trackingNumber}</div>
+ ${shipGroup.trackingNumber}
</#if>
<#if orderShipmentInfoSummaryList?has_content>
<#list orderShipmentInfoSummaryList as orderShipmentInfoSummary>
<#if orderShipmentInfoSummary.shipGroupSeqId?if_exists == shipGroup.shipGroupSeqId?if_exists>
- <div class="tabletext">
+ <div>
<#if (orderShipmentInfoSummaryList?size > 1)>${orderShipmentInfoSummary.shipmentPackageSeqId}: </#if>
${uiLabelMap.CommonIdCode}: ${orderShipmentInfoSummary.trackingCode?default("[${uiLabelMap.OrderNotYetKnown}]")}
<#if orderShipmentInfoSummary.boxNumber?has_content> ${uiLabelMap.ProductBox} #${orderShipmentInfoSummary.boxNumber}</#if>
@@ -167,14 +161,14 @@
</tr>
</#if>
<#if shipGroup.maySplit?has_content && noShipment?default("false") != "true">
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderSplittingPreference}</b></div>
+ <span class="label"> ${uiLabelMap.OrderSplittingPreference}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
<#if shipGroup.maySplit?upper_case == "N">
${uiLabelMap.FacilityWaitEntireOrderReady}
<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
@@ -188,78 +182,76 @@
</tr>
</#if>
<#if shipGroup.shippingInstructions?has_content>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.CommonInstructions}</b></div>
+ <span class="label"> ${uiLabelMap.CommonInstructions}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${shipGroup.shippingInstructions}</div>
+ <span class="label">${shipGroup.shippingInstructions}</span>
</td>
</tr>
</#if>
<#if shipGroup.isGift?has_content && noShipment?default("false") != "true">
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderGift}</b></div>
+ <span class="label"> ${uiLabelMap.OrderGift}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
- <#if shipGroup.isGift?upper_case == "N">${uiLabelMap.OrderThisOrderNotGift}<#else>${uiLabelMap.OrderThisOrderGift}</#if>
- </div>
+ <#if shipGroup.isGift?upper_case == "N">${uiLabelMap.OrderThisOrderNotGift}<#else>${uiLabelMap.OrderThisOrderGift}</#if>
</td>
</tr>
</#if>
<#if shipGroup.giftMessage?has_content>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderGiftMessage}</b></div>
+ <span class="label"> ${uiLabelMap.OrderGiftMessage}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${shipGroup.giftMessage}</div>
+ ${shipGroup.giftMessage}
</td>
</tr>
</#if>
<#if shipGroup.shipAfterDate?has_content>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderShipAfterDate}</b></div>
+ <span class="label"> ${uiLabelMap.OrderShipAfterDate}<span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${shipGroup.shipAfterDate}</div>
+ ${shipGroup.shipAfterDate}
</td>
</tr>
</#if>
<#if shipGroup.shipByDate?has_content>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderShipBeforeDate}</b></div>
+ <span class="label"> ${uiLabelMap.OrderShipBeforeDate}<span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${shipGroup.shipByDate}</div>
+ ${shipGroup.shipByDate}
</td>
</tr>
</#if>
<#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment")>
<#if shipGroupShipments?has_content>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.FacilityShipments}</b></div>
+ <span class="label"> ${uiLabelMap.FacilityShipments}<span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
<#list shipGroupShipments as shipment>
- <div class="tabletext">${uiLabelMap.OrderNbr}<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>
+ <div>${uiLabelMap.OrderNbr}<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>
</td>
</tr>
@@ -270,14 +262,14 @@
<#-- Special shipment options -->
<#if security.hasEntityPermission("FACILITY", "_CREATE", session)>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <#if orderHeader.orderTypeId == "PURCHASE_ORDER"><b>${uiLabelMap.ProductDestinationFacility}</b></#if></div>
+ <span class="label"> <#if orderHeader.orderTypeId == "PURCHASE_ORDER">${uiLabelMap.ProductDestinationFacility}</#if></span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
<#if orderHeader.orderTypeId == "SALES_ORDER">
<#if !shipGroup.supplierPartyId?has_content>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickShipEntireOrder}</a>
@@ -290,7 +282,7 @@
<input type="hidden" name="orderId" value="${orderId}"/>
<#-- destination form (/facility/control/ReceiveInventory) wants purchaseOrderId instead of orderId, so we set it here as a workaround -->
<input type="hidden" name="purchaseOrderId" value="${orderId}"/>
- <select name="facilityId" class="selectBox">
+ <select name="facilityId">
<#list facilities as facility>
<option value="${facility.facilityId}">${facility.facilityName}</option>
</#list>
@@ -300,7 +292,7 @@
<#if orderHeader.statusId != "ORDER_COMPLETED">
<form action="<@o...@ofbizUrl>" method="POST">
<input type="hidden" name="orderId" value="${orderId}"/>
- <select name="facilityId" class="selectBox">
+ <select name="facilityId">
<#list facilities as facility>
<option value="${facility.facilityId}">${facility.facilityName}</option>
</#list>
@@ -316,30 +308,26 @@
</#if>
<#-- Manual shipment options -->
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> </div>
- </td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%">
-
+ <td colspan="3" valign="top" width="100%" align="center">
<#if orderHeader.orderTypeId == "SALES_ORDER">
<#if !shipGroup.supplierPartyId?has_content>
- <div class="tabletext"><a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div>
- <div class="tabletext"><a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&statusId=SHIPMENT_INPUT&originFacilityId=${storeFacilityId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div>
+ <a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a>
+ <br/>
+ <a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&statusId=SHIPMENT_INPUT&originFacilityId=${storeFacilityId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a>
</#if>
<#else>
<#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)>
<#if facilities?has_content>
- <div class="tabletext">
+ <div>
<form action="/facility/control/createShipment" method="GET">
<input type="hidden" name="primaryOrderId" value="${orderId}"/>
<input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
<input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/>
<input type="hidden" name="statusId" value="PURCH_SHIP_CREATED"/>
<input type="hidden" name="externalLoginKey" value="${externalLoginKey}"/>
- <select name="destinationFacilityId" class="selectBox">
+ <select name="destinationFacilityId">
<#list facilities as facility>
<option value="${facility.facilityId}">${facility.facilityName}</option>
</#list>
@@ -348,33 +336,27 @@
</form>
</div>
<#else>
- <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.ProductShipmentQuickComplete}</a></div>
- <div class="tabletext"><a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&shipmentTypeId=DROP_SHIPMENT&statusId=PURCH_SHIP_CREATED&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div>
+ <a href="<@o...@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.ProductShipmentQuickComplete}</a>
+ <a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&shipmentTypeId=DROP_SHIPMENT&statusId=PURCH_SHIP_CREATED&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a>
</#if>
</#if>
- </td>
+ </td>
</tr>
</#if>
<#-- Refunds/Returns for Sales Orders and Delivery Schedules -->
<#if !shipGroup_has_next>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext">
-
- </div>
- </td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%">
+ <td colspan="3" valign="top" width="100%" align="center">
<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
<#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED">
- <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewEditDeliveryScheduleInfo}</a></div>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewEditDeliveryScheduleInfo}</a>
</#if>
<#if security.hasEntityPermission("ORDERMGR", "_RETURN", session) && orderHeader.statusId == "ORDER_COMPLETED">
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></div>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a>
</#if>
</#if>
</td>
@@ -384,4 +366,4 @@
</div>
</div>
</#list>
-</#if>
+</#if>
\ No newline at end of file
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=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl Sun Jan 20 12:28:45 2008
@@ -19,28 +19,29 @@
<#if orderTerms?has_content>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.OrderOrderTerms}</div>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3"> ${uiLabelMap.OrderOrderTerms}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td width="35%" align="left"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermType}</b></div></td>
- <td width="15%" align="center"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermValue}</b></div></td>
- <td width="15%" align="center"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermDays}</b></div></td>
- <td width="35%" align="center"><div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div></td>
+ <table class="basic-table" cellspacing='0'>
+ <tr class="header-row">
+ <td width="35%" align="left">${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>
- <tr><td colspan="4"><hr class='sepbar'></td></tr>
- <#list orderTerms as orderTerm>
- <tr>
- <td width="35%" align="left"><div class="tabletext">${orderTerm.getRelatedOne("TermType").get("description", locale)}</div></td>
- <td width="15%" align="center"><div class="tabletext">${orderTerm.termValue?default("")}</div></td>
- <td width="15%" align="center"><div class="tabletext">${orderTerm.termDays?default("")}</div></td>
- <td width="35%" align="center"><div class="tabletext">${orderTerm.textValue?default("")}</div></td>
- </tr>
- <tr><td colspan="4"> </td></tr>
- </#list>
- </table>
+ <#list orderTerms as orderTerm>
+ <tr>
+ <td width="35%" align="left">${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>
+ </tr>
+ </#list>
+ </table>
</div>
</div>
-</#if>
+</#if>
\ No newline at end of file
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=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl Sun Jan 20 12:28:45 2008
@@ -18,39 +18,46 @@
-->
<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
- <h1>${uiLabelMap.OrderReceiveOfflinePayments}</h1>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.OrderReceiveOfflinePayments}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBack}</a>
+ <a href="javascript:document.paysetupform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonBack}]</a>
- <a href="javascript:document.paysetupform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a>
-
- <form method="post" action="<@o...@ofbizUrl>" name="paysetupform">
- <#if requestParameters.workEffortId?exists>
- <input type="hidden" name="workEffortId" value="${requestParameters.workEffortId}">
- </#if>
- <table width="100%" cellpadding="1" cellspacing="0" border="0">
- <tr>
- <td width="30%" align="right"><div class="tableheadtext"><u>${uiLabelMap.OrderPaymentType}</u></div></td>
- <td width="1"> </td>
- <td width="1" align="left"><div class="tableheadtext"><u>${uiLabelMap.OrderAmount}</u></div></td>
- <td width="1"> </td>
- <td width="70%" align="left"><div class="tableheadtext"><u>${uiLabelMap.OrderReference}</u></div></td>
- </tr>
- <#list paymentMethodTypes as payType>
- <tr>
- <td width="30%" align="right"><div class="tabletext">${payType.get("description",locale)?default(payType.paymentMethodTypeId)}</div></td>
- <td width="1"> </td>
- <td width="1"><input type="text" size="7" name="${payType.paymentMethodTypeId}_amount" class="inputBox"></td>
- <td width="1"> </td>
- <td width="70%"><input type="text" size="15" name="${payType.paymentMethodTypeId}_reference" class="inputBox"></td>
- </tr>
- </#list>
- </table>
- </form>
-
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonBack}]</a>
- <a href="javascript:document.paysetupform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a>
+ <form method="post" action="<@o...@ofbizUrl>" name="paysetupform">
+ <#if requestParameters.workEffortId?exists>
+ <input type="hidden" name="workEffortId" value="${requestParameters.workEffortId}">
+ </#if>
+ <table class="basic-table" cellspacing='0'>
+ <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"> </td>
+ <td width="70%" align="left">${uiLabelMap.OrderReference}</td>
+ </tr>
+ <#list paymentMethodTypes as payType>
+ <tr>
+ <td width="30%" align="right">${payType.get("description",locale)?default(payType.paymentMethodTypeId)}</td>
+ <td width="1"> </td>
+ <td width="1"><input type="text" size="7" name="${payType.paymentMethodTypeId}_amount"></td>
+ <td width="1"> </td>
+ <td width="70%"><input type="text" size="15" name="${payType.paymentMethodTypeId}_reference"></td>
+ </tr>
+ </#list>
+ </table>
+ </form>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBack}</a>
+ <a href="javascript:document.paysetupform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
+ </div>
+</div>
<br/>
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl Sun Jan 20 12:28:45 2008
@@ -18,86 +18,76 @@
-->
<#if security.hasEntityPermission("ORDERMGR", "_SEND_CONFIRMATION", session)>
-
- <h1>${uiLabelMap.OrderSendConfirmationEmail}</h1>
-
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>
-
- <form method="post" action="<@o...@ofbizUrl>" name="sendConfirmationForm">
- <#if ! productStoreEmailSetting?exists>
- <#assign productStoreEmailSetting = {} />
- </#if>
- <input type="hidden" name="partyId" value="${partyId?if_exists}">
- <input type="hidden" name="contentType" value="${productStoreEmailSetting.contentType?default("")}" />
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <td width="26%" align="right">
- <div class="tabletext">${uiLabelMap.OrderSendConfirmationEmailSubject}</div>
- </td>
- <td width="54%">
- <input type="text" size="40" name="subject" value="${productStoreEmailSetting.subject?default(uiLabelMap.OrderConfirmation + " " + uiLabelMap.OrderNbr + orderId)?replace("\\$\\{orderId\\}",orderId,"r")}" />
- </td>
- </tr>
- </tr>
- <td width="26%" align="right">
- <div class="tabletext">${uiLabelMap.OrderSendConfirmationEmailSendTo}</div>
- </td>
- <td width="54%">
- <input type="text" size="40" name="sendTo" value="${sendTo}"/>
- </td>
- <tr>
- </tr>
- <tr>
- <td width="26%" align="right">
- <div class="tabletext">${uiLabelMap.OrderSendConfirmationEmailCCTo}</div>
- </td>
- <td width="54%">
- <input type="text" size="40" name="sendCc" value="${productStoreEmailSetting.ccAddress?default("")}" />
- </td>
- </tr>
- <tr>
- <td width="26%" align="right">
- <div class="tabletext">${uiLabelMap.OrderSendConfirmationEmailBCCTo}</div>
- </td>
- <td width="54%">
- <input type="text" size="40" name="sendBcc" value="${productStoreEmailSetting.bccAddress?default("")}" />
- </td>
- </tr>
- <tr>
- <td width="26%" align="right">
- <div class="tabletext">${uiLabelMap.CommonFrom}</div>
- </td>
- <td width="54%">
- <#if productStoreEmailSetting.fromAddress?exists>
- <input type="hidden" name="sendFrom" value="${productStoreEmailSetting.fromAddress}" />
- <#else>
- <input type="text" size="40" name="sendFrom" value="" />
- </#if>
- </td>
- <tr>
- <tr>
- <td width="26%" align="right">
- <div class="tabletext">${uiLabelMap.OrderSendConfirmationEmailContentType}</div>
- </td>
- <td width="54%">
- <div class="tabletext">${productStoreEmailSetting.contentType?default("text/html")}</div>
- </td>
- </tr>
- <tr>
- <td width="26%" align="right">
- <div class="tabletext">${uiLabelMap.OrderSendConfirmationEmailBody}</div>
- </td>
- <td width="54%">
- <textarea name="body" class="textAreaBox" rows="30" cols="80">${screens.render(productStoreEmailSetting.bodyScreenLocation?default(""))}</textarea>
- </td>
- </tr>
- </table>
-</form>
-
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>
-
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.OrderSendConfirmationEmail}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
+ <a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>
+ <br/>
+ <form method="post" action="<@o...@ofbizUrl>" name="sendConfirmationForm">
+ <#if ! productStoreEmailSetting?exists>
+ <#assign productStoreEmailSetting = {} />
+ </#if>
+ <input type="hidden" name="partyId" value="${partyId?if_exists}">
+ <input type="hidden" name="contentType" value="${productStoreEmailSetting.contentType?default("")}" />
+ <table class="basic-table" cellspacing='0'>
+ <tr>
+ <td width="2%" align="right" class="label">${uiLabelMap.OrderSendConfirmationEmailSubject} </td>
+ <td width="54%">
+ <input type="text" size="40" name="subject" value="${productStoreEmailSetting.subject?default(uiLabelMap.OrderConfirmation + " " + uiLabelMap.OrderNbr + orderId)?replace("\\$\\{orderId\\}",orderId,"r")}" />
+ </td>
+ </tr>
+ </tr>
+ <td width="26%" align="right" class="label">${uiLabelMap.OrderSendConfirmationEmailSendTo} </td>
+ <td width="54%">
+ <input type="text" size="40" name="sendTo" value="${sendTo}"/>
+ </td>
+ <tr>
+ </tr>
+ <tr>
+ <td width="26%" align="right" class="label">${uiLabelMap.OrderSendConfirmationEmailCCTo} </td>
+ <td width="54%">
+ <input type="text" size="40" name="sendCc" value="${productStoreEmailSetting.ccAddress?default("")}" />
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" class="label">${uiLabelMap.OrderSendConfirmationEmailBCCTo} </td>
+ <td width="54%">
+ <input type="text" size="40" name="sendBcc" value="${productStoreEmailSetting.bccAddress?default("")}" />
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" class="label">${uiLabelMap.CommonFrom} </td>
+ <td width="54%">
+ <#if productStoreEmailSetting.fromAddress?exists>
+ <input type="hidden" name="sendFrom" value="${productStoreEmailSetting.fromAddress}" />
+ <#else>
+ <input type="text" size="40" name="sendFrom" value="" />
+ </#if>
+ </td>
+ <tr>
+ <tr>
+ <td width="26%" align="right" class="label">${uiLabelMap.OrderSendConfirmationEmailContentType} </td>
+ <td width="54%">${productStoreEmailSetting.contentType?default("text/html")}</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" class="label">${uiLabelMap.OrderSendConfirmationEmailBody} </td>
+ <td width="54%">
+ <textarea name="body" rows="30" cols="80">${screens.render(productStoreEmailSetting.bodyScreenLocation?default(""))}</textarea>
+ </td>
+ </tr>
+ </table>
+ </form>
+ <br/>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
+ <a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>
+ </div>
+</div>
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl Sun Jan 20 12:28:45 2008
@@ -18,112 +18,90 @@
-->
<#if inProcess?exists>
- <table border='0' width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <tr>
- <td width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <td valign="middle" align="left">
- <div class="boxhead"> ${uiLabelMap.OrderProcessingStatus}</div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td>
- <!-- Suspended Processes -->
- <#if workEffortStatus == "WF_SUSPENDED">
- <form action="<@o...@ofbizUrl>" method="post" name="activityForm">
- <input type="hidden" name="workEffortId" value="${workEffortId}">
- <table width="100%">
- <tr>
- <td>
- <div class="tabletext">${uiLabelMap.OrderProcessingInHold}</div>
- <div class="tabletext"> ${uiLabelMap.OrderProcessingInHoldNote}</div>
- </td>
- <td align="right" valign="center">
- <a href="javascript:document.activityForm.submit()" class="buttontext">${uiLabelMap.OrderRelease}</a>
- </td>
- </tr>
- </table>
- </form>
- </#if>
- <!-- Active Processes -->
- <#if workEffortStatus == "WF_RUNNING">
- <form action="<@o...@ofbizUrl>" method="post" name="activityForm">
- <input type="hidden" name="workEffortId" value="${workEffortId}">
- <table width="100%">
- <tr>
- <td>
- <div class="tabletext">${uiLabelMap.OrderProcessingInActive}</div>
- </td>
- <td align="right" valign="center">
- <a href="javascript:document.activityForm.submit()" class="buttontext">${uiLabelMap.OrderHold}</a>
- </td>
- </tr>
- </table>
- </form>
- </#if>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.OrderProcessingStatus}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <table class="basic-table" cellspacing='0'>
+ <tr>
+ <td>
+ <!-- Suspended Processes -->
+ <#if workEffortStatus == "WF_SUSPENDED">
+ <form action="<@o...@ofbizUrl>" method="post" name="activityForm">
+ <input type="hidden" name="workEffortId" value="${workEffortId}">
+ <table class="basic-table" cellspacing='0'>
+ <tr>
+ <td>${uiLabelMap.OrderProcessingInHold} ${uiLabelMap.OrderProcessingInHoldNote}</td>
+ <td align="right" valign="center">
+ <a href="javascript:document.activityForm.submit()" class="buttontext">${uiLabelMap.OrderRelease}</a>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </#if>
+ <!-- Active Processes -->
+ <#if workEffortStatus == "WF_RUNNING">
+ <form action="<@o...@ofbizUrl>" method="post" name="activityForm">
+ <input type="hidden" name="workEffortId" value="${workEffortId}">
+ <table class="basic-table" cellspacing='0'>
+ <tr>
+ <td>${uiLabelMap.OrderProcessingInActive}</td>
+ <td align="right" valign="center">
+ <a href="javascript:document.activityForm.submit()" class="buttontext">${uiLabelMap.OrderHold}</a>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </#if>
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
</#if>
<br/>
<#if wfTransitions?exists && wfTransitions?has_content>
- <table border='0' width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <tr>
- <td width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <td valign="middle" align="left">
- <div class="boxhead"> ${uiLabelMap.OrderProcessingTransitions}</div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td>
- <form action="<@o...@ofbizUrl>" method="post" name="transitionForm">
- <input type="hidden" name="workEffortId" value="${workEffortId}">
- <input type="hidden" name="partyId" value="${assignPartyId}">
- <input type="hidden" name="roleTypeId" value="${assignRoleTypeId}">
- <input type="hidden" name="fromDate" value="${fromDate}">
- <table>
- <tr>
- <td>
- <select name="approvalCode" class="selectBox">
- <#list wfTransitions as trans>
- <#if trans.extendedAttributes?has_content>
- <#assign attrs = Static["org.ofbiz.base.util.StringUtil"].strToMap(trans.extendedAttributes)>
- <#if attrs.approvalCode?exists>
- <option value="${attrs.approvalCode}">${trans.transitionName}</option>
- </#if>
- </#if>
- </#list>
- </select>
- </td>
- <td valign="center">
- <a href="javascript:document.transitionForm.submit()" class="buttontext">${uiLabelMap.CommonContinue}</a>
- </td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</#if>
-
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.OrderProcessingTransitions}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <table class="basic-table" cellspacing='0'>
+ <tr>
+ <td>
+ <form action="<@o...@ofbizUrl>" method="post" name="transitionForm">
+ <input type="hidden" name="workEffortId" value="${workEffortId}">
+ <input type="hidden" name="partyId" value="${assignPartyId}">
+ <input type="hidden" name="roleTypeId" value="${assignRoleTypeId}">
+ <input type="hidden" name="fromDate" value="${fromDate}">
+ <table class="basic-table" cellspacing='0'>
+ <tr>
+ <td>
+ <select name="approvalCode">
+ <#list wfTransitions as trans>
+ <#if trans.extendedAttributes?has_content>
+ <#assign attrs = Static["org.ofbiz.base.util.StringUtil"].strToMap(trans.extendedAttributes)>
+ <#if attrs.approvalCode?exists>
+ <option value="${attrs.approvalCode}">${trans.transitionName}</option>
+ </#if>
+ </#if>
+ </#list>
+ </select>
+ </td>
+ <td valign="center">
+ <a href="javascript:document.transitionForm.submit()" class="buttontext">${uiLabelMap.CommonContinue}</a>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
+ </table>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml Sun Jan 20 12:28:45 2008
@@ -29,7 +29,7 @@
<entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId"/>
</drop-down>
</field>
- <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" widget-style="selectBox">
+ <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
@@ -113,7 +113,7 @@
</entity-options>
</drop-down>
</field>
- <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" widget-style="selectBox">
+ <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
@@ -123,7 +123,7 @@
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="issueDate" title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false" current-description="${currentStatus.description}">
<entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
<entity-constraint name="statusId" value="${quote.statusId}"/>
@@ -269,7 +269,7 @@
</field>
</form>
<form name="EditQuoteAttribute" type="single" target="updateQuoteAttribute" title="" default-map-name="quoteAttribute"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="quoteAttribute==null" target="createQuoteAttribute"/>
<auto-fields-entity entity-name="QuoteAttribute" default-field-type="edit"/>
<field name="attrName" title="${uiLabelMap.OrderOrderQuoteAttributeName}" use-when="quoteAttribute==null"><text/></field>
@@ -292,7 +292,7 @@
</field>
</form>
<form name="EditQuoteCoefficient" type="single" target="updateQuoteCoefficient" title="" default-map-name="quoteCoefficient"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="quoteCoefficient==null" target="createQuoteCoefficient"/>
<auto-fields-entity entity-name="QuoteCoefficient" default-field-type="edit"/>
<field name="quoteId"><hidden/></field>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Sun Jan 20 12:28:45 2008
@@ -36,7 +36,7 @@
</entity-options>
</drop-down>
</field>
- <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" widget-style="selectBox">
+ <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
@@ -134,7 +134,7 @@
<entity-options entity-name="CustRequestType" description="${description}"/>
</drop-down>
</field>
- <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" widget-style="selectBox">
+ <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
@@ -148,7 +148,7 @@
</drop-down>
</field>
- <field use-when="custRequest==null" name="statusId" widget-style="selectBox">
+ <field use-when="custRequest==null" name="statusId">
<drop-down allow-empty="false" current="first-in-list">
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
@@ -156,7 +156,7 @@
</entity-options>
</drop-down>
</field>
- <field use-when="custRequest!=null" name="statusId" widget-style="selectBox">
+ <field use-when="custRequest!=null" name="statusId">
<drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
<entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
<entity-constraint name="statusId" value="${custRequest.statusId}"/>
@@ -164,7 +164,7 @@
</entity-options>
</drop-down>
</field>
- <field name="priority" widget-style="selectBox">
+ <field name="priority">
<drop-down allow-empty="false">
<option key="9"/>
<option key="8"/>
@@ -212,7 +212,7 @@
<field name="custRequestId"><hidden/></field>
<field name="custRequestItemSeqId"><hidden/></field>
<field name="custRequestResolutionId"><hidden/></field>
- <field use-when="custRequestItem==null" name="statusId" widget-style="selectBox">
+ <field use-when="custRequestItem==null" name="statusId">
<drop-down allow-empty="false" current="first-in-list">
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
@@ -220,7 +220,7 @@
</entity-options>
</drop-down>
</field>
- <field use-when="custRequestItem!=null" name="statusId" widget-style="selectBox">
+ <field use-when="custRequestItem!=null" name="statusId">
<drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
<entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
<entity-constraint name="statusId" value="${custRequestItem.statusId}"/>
@@ -230,7 +230,7 @@
</field>
<field use-when="custRequestItem==null" name="sequenceNum" entry-name="nextSequenceNum"><text/></field>
<field use-when="custRequestItem!=null" name="sequenceNum"><text/></field>
- <field name="priority" widget-style="selectBox">
+ <field name="priority">
<drop-down allow-empty="false">
<option key="9"/>
<option key="8"/>
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=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl Sun Jan 20 12:28:45 2008
@@ -66,7 +66,7 @@
</td>
</tr>
<#-- request description -->
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="7"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%" class="label">
${uiLabelMap.CommonDescription}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Sun Jan 20 12:28:45 2008
@@ -111,7 +111,7 @@
<entity-options entity-name="RequirementType" description="${description}"/>
</drop-down>
</field>
- <field name="statusId" widget-style="selectBox">
+ <field name="statusId">
<drop-down allow-empty="false" no-current-selected-key="REQ_CREATED">
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" value="REQUIREMENT_STATUS"/>
@@ -238,7 +238,7 @@
</entity-options>
</drop-down>
</field>
- <field name="partyId" title="${uiLabelMap.ProductSupplier}" widget-style="selectBox">
+ <field name="partyId" title="${uiLabelMap.ProductSupplier}">
<drop-down allow-empty="true">
<entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} [${partyId}]">
<entity-constraint name="roleTypeId" value="SUPPLIER" operator="equals"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml Sun Jan 20 12:28:45 2008
@@ -29,7 +29,7 @@
<field use-when="returnHeader==null&&returnId==null" name="returnId"><ignored/></field>
<field position="1" name="entryDate"/>
- <field name="statusId" widget-style="selectBox">
+ <field name="statusId">
<drop-down>
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" value="ORDER_RETURN_STTS"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl Sun Jan 20 12:28:45 2008
@@ -163,7 +163,7 @@
</#if>
<div>${actualStartDate}</div>
</td>
- <td>${task.priority?default("0")}></td>
+ <td>${task.priority?default("0")}</td>
<td>
<a href="/workeffort/control/activity?workEffortId=${task.workEffortId}${externalKeyParam}" target="workeffort" class="buttontext">
${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)}
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Sun Jan 20 12:28:45 2008
@@ -53,7 +53,7 @@
<field name="submitButton" widget-style="smallSubmit"><submit/></field>
</form>
<form name="FindQuotes" target="FindQuoteForCart" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="Quote" default-field-type="find"/>
<field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field>
<field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
@@ -135,8 +135,7 @@
</form>
<form name="LookupBulkAddProducts" type="multi" use-row-submit="true" list-name="productList" title="" target="BulkAddProducts"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"
- paginate-target="LookupBulkAddProducts" >
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupBulkAddProducts">
<field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
<hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" target-type="inter-app"/>
</field>
@@ -156,8 +155,7 @@
</field>
</form>
<form name="LookupBulkAddSupplierProducts" type="multi" use-row-submit="true" list-name="productList" title="" target="BulkAddProducts"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"
- paginate-target="LookupBulkAddSupplierProducts">
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupBulkAddSupplierProducts">
<field name="productId" widget-style="buttontext">
<hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" target-type="inter-app"/>
</field>