You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ra...@apache.org on 2007/07/30 15:15:31 UTC
svn commit: r560970 - in
/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order:
genericaddress.ftl optionsettings.ftl paymentinformation.ftl
paymentoptions.ftl
Author: rayb
Date: Mon Jul 30 06:15:30 2007
New Revision: 560970
URL: http://svn.apache.org/viewvc?view=rev&rev=560970
Log:
A few fixes/clean ups for the HTML in some of the check out screens. Should be no functional changes.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl?view=diff&rev=560970&r1=560969&r2=560970
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl Mon Jul 30 06:15:30 2007
@@ -29,42 +29,42 @@
</#if>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyToName}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyToName}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" class="inputBox" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${(parameters.attnName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${(parameters.attnName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(parameters.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(parameters.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(parameters.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(parameters.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyCity}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyCity}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(parameters.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(parameters.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyState}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyState}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="stateProvinceGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
@@ -79,14 +79,14 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(parameters.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(parameters.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyCountry}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyCountry}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="countryGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
@@ -99,7 +99,7 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAllowSolicitation}?</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAllowSolicitation}?</div></td>
<td width="5"> </td>
<td width="74%">
<select name="allowSolicitation" class='selectBox' <#if requestParameters.useShipAddr?exists>disabled</#if>>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl?view=diff&rev=560970&r1=560969&r2=560970
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl Mon Jul 30 06:15:30 2007
@@ -19,17 +19,17 @@
<div class="screenlet">
<div class="screenlet-header">
- <div class='boxhead'> ${uiLabelMap.OrderShippingInformation}</div>
+ <div class="boxhead"> ${uiLabelMap.OrderShippingInformation}</div>
</div>
<div class="screenlet-body">
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
<input type="hidden" name="finalizeMode" value="options"/>
- <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
<#list carrierShipmentMethodList as carrierShipmentMethod>
<tr>
- <td width='1%' valign="top" >
+ <td width="1%" valign="top" >
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
- <input type='radio' name='shipping_method' value='${shippingMethod}' <#if shippingMethod == chosenShippingMethod?default("N@A")>checked</#if>/>
+ <input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
</td>
<td valign="top">
<div class='tabletext'>
@@ -44,23 +44,23 @@
</#list>
<#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0>
<tr>
- <td width='1%' valign="top">
- <input type='radio' name='shipping_method' value="Default" checked="checked"/>
+ <td width="1%" valign="top">
+ <input type="radio" name="shipping_method" value="Default" checked="checked"/>
</td>
<td valign="top">
- <div class='tabletext'>${uiLabelMap.OrderUseDefault}.</div>
+ <div class="tabletext">${uiLabelMap.OrderUseDefault}.</div>
</td>
</tr>
</#if>
- <tr><td colspan='2'><hr class="sepbar"/></td></tr>
+ <tr><td colspan="2"><hr class="sepbar"/></td></tr>
<tr>
- <td colspan='2'>
+ <td colspan="2">
<h2><b>${uiLabelMap.OrderShipAllAtOnce}?</b></h2>
</td>
</tr>
<tr>
<td valign="top">
- <input type='radio' <#if shoppingCart.getMaySplit()?default("N") == "N">checked</#if> name='may_split' value='false'/>
+ <input type="radio" <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if> name="may_split" value="false"/>
</td>
<td valign="top">
<div class="tabletext">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
@@ -68,7 +68,7 @@
</tr>
<tr>
<td valign="top">
- <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked</#if> type='radio' name='may_split' value='true'/>
+ <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if> type="radio" name="may_split" value="true"/>
</td>
<td valign="top">
<div class="tabletext">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
@@ -82,14 +82,14 @@
</tr>
<tr>
<td colspan="2">
- <textarea class='textAreaBox' cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea>
+ <textarea class="textAreaBox" cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea>
</td>
</tr>
<tr><td colspan="2"><hr class="sepbar"/></td></tr>
<tr>
<td colspan="2">
<span class="head2"><b>${uiLabelMap.OrderPoNumber}</b></span>
- <input type="text" class='inputBox' name="correspondingPoId" size="15" value='${shoppingCart.getPoNumber()?if_exists}'/>
+ <input type="text" class="inputBox" name="correspondingPoId" size="15" value="${shoppingCart.getPoNumber()?if_exists}"/>
</td>
</tr>
<#if productStore.showCheckoutGiftOptions?if_exists != "N">
@@ -98,8 +98,8 @@
<td colspan="2">
<div>
<span class="head2"><b>${uiLabelMap.OrderIsThisGift}?</b></span>
- <input type='radio' <#if shoppingCart.getIsGift()?default("Y") == "Y">checked</#if> name='is_gift' value='true'/><span class='tabletext'>${uiLabelMap.CommonYes}</span>
- <input type='radio' <#if shoppingCart.getIsGift()?default("N") == "N">checked</#if> name='is_gift' value='false'/><span class='tabletext'>${uiLabelMap.CommonNo}</span>
+ <input type="radio" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"/><span class="tabletext">${uiLabelMap.CommonYes}</span>
+ <input type="radio" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"/><span class="tabletext">${uiLabelMap.CommonNo}</span>
</div>
</td>
</tr>
@@ -111,7 +111,7 @@
</tr>
<tr>
<td colspan="2">
- <textarea class='textAreaBox' cols="30" rows="3" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea>
+ <textarea class="textAreaBox" cols="30" rows="3" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea>
</td>
</tr>
</#if>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?view=diff&rev=560970&r1=560969&r2=560970
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl Mon Jul 30 06:15:30 2007
@@ -22,14 +22,14 @@
<script language="JavaScript" type="text/javascript">
function shipBillAddr() {
<#if requestParameters.singleUsePayment?default("N") == "Y">
- <#assign singleUse = "&singleUsePayment=Y">
+ <#assign singleUse = "&singleUsePayment=Y">
<#else>
<#assign singleUse = "">
</#if>
if (document.billsetupform.useShipAddr.checked) {
- window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}&useShipAddr=Y${singleUse}");
+ window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}&useShipAddr=Y${singleUse}");
} else {
- window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}${singleUse}");
+ window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}${singleUse}");
}
}
</script>
@@ -81,10 +81,10 @@
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<#if cart.getShippingContactMechId()?exists && paymentMethodTypeId?if_exists != "GIFT_CARD">
<tr>
- <td width="26%" align="right"= valign="top">
+ <td width="26%" align="right" valign="top">
<input type="checkbox" name="useShipAddr" value="Y" onClick="javascript:shipBillAddr();" <#if useShipAddr?exists>checked</#if>/>
</td>
- <td colspan="2" align="left" valign="center">
+ <td colspan="2" align="left" valign="middle">
<div class="tabletext">${uiLabelMap.FacilityBillingAddressSameShipping}</div>
</td>
</tr>
@@ -117,14 +117,14 @@
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnCard}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/>
+ <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingPrefixCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingPrefixCard}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="titleOnCard" class="selectBox">
@@ -137,28 +137,28 @@
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingFirstNameCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingFirstNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingMiddleNameCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingMiddleNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingLastNameCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingLastNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingSuffixCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingSuffixCard}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="suffixOnCard" class="selectBox">
@@ -175,7 +175,7 @@
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCardType}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCardType}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="cardType" class="selectBox">
@@ -188,21 +188,21 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/>
*</td>
</tr>
<#--<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCardSecurityCode}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCardSecurityCode}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="">
+ <input type="text" size="5" maxlength="10" name="cardSecurityCode" value=""/>
</td>
</tr>-->
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingExpirationDate}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingExpirationDate}</div></td>
<td width="5"> </td>
<td width="74%">
<#assign expMonth = "">
@@ -214,7 +214,7 @@
<#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
</#if>
</#if>
- <select name="expMonth" class='selectBox'>
+ <select name="expMonth" class="selectBox">
<#if creditCard?has_content && expMonth?has_content>
<#assign ccExprMonth = expMonth>
<#else>
@@ -225,7 +225,7 @@
</#if>
${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
</select>
- <select name="expYear" class='selectBox'>
+ <select name="expYear" class="selectBox">
<#if creditCard?has_content && expYear?has_content>
<#assign ccExprYear = expYear>
<#else>
@@ -239,7 +239,7 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/>
@@ -261,38 +261,38 @@
<td width="74%"> </td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingAccountType}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAccountType}</div></td>
<td width="5"> </td>
<td width="74%">
- <select name="accountType" class='selectBox'>
+ <select name="accountType" class="selectBox">
<option>${eftAccount.accountType?if_exists}</option>
<option></option>
<option>Checking</option>
@@ -301,14 +301,14 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/>
@@ -331,21 +331,21 @@
<td width="74%"> </td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingGiftCardNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingGiftCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}"/>
@@ -353,7 +353,7 @@
</tr>
<#if paymentMethodTypeId?if_exists != "GIFT_CARD">
<tr>
- <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingAmountToUse}</div></td>
+ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAmountToUse}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}"/>
@@ -368,5 +368,6 @@
</td>
</tr>
</table>
+ </form>
</div>
</div>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl?view=diff&rev=560970&r1=560969&r2=560970
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl Mon Jul 30 06:15:30 2007
@@ -29,34 +29,34 @@
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
<tr>
- <td width='5%' nowrap><input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?exists && addGiftCard == "Y">checked</#if>/></td>
- <td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td>
+ <td width="5%" nowrap="nowrap"><input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?exists && addGiftCard == "Y">checked</#if>/></td>
+ <td width="95%" nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td>
</tr>
<tr><td colspan="2"><hr class="sepbar"/></td></tr>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
<tr>
- <td width='5%' nowrap><input type="radio" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_OFFLINE">checked</#if>/></td>
- <td width='95%'nowrap><div class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
+ <td width="5%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_OFFLINE">checked</#if>/></td>
+ <td width="95%" nowrap="nowrap"><div class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
</tr>
<tr><td colspan="2"><hr class="sepbar"/></td></tr>
</#if>
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
<tr>
- <td width='5%' nowrap><input type="radio" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "CREDIT_CARD">checked</#if>/></td>
- <td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
+ <td width="5%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "CREDIT_CARD">checked</#if>/></td>
+ <td width="95%" nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
</tr>
<tr><td colspan="2"><hr class="sepbar"/></td></tr>
</#if>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
<tr>
- <td width='5%' nowrap><input type="radio" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EFT_ACCOUNT">checked</#if>/></td>
- <td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
+ <td width="5%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EFT_ACCOUNT">checked</#if>/></td>
+ <td width="95%" nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
</tr>
</#if>
<tr>
<td align="center" colspan="2">
- <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}">
+ <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/>
</td>
</tr>
</table>