Author: buscob
Date: Wed Apr 14 20:46:08 2010
New Revision: 934190
URL: http://svn.apache.org/viewvc?rev=934190&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3679 - XHTML validation errors round 2 (specialpurpose/ecommerce)
https://issues.apache.org/jira/browse/OFBIZ-3679
XHTML validation errors
* Unclosed tags
* attributes without values (checked, selected, disabled, etc)
* attribute values without "
* Uppercase tags or attributes.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
Wed Apr 14 20:46:08 2010
@@ -557,7 +557,7 @@ function getConfigDetails(event) {
<#if option.isSelected()>
<#assign optionCounter = optionCounter + 1>
</#if>
- <option value='${optionCounter}' <#if
option.isSelected()>selected</#if>>
+ <option value='${optionCounter}' <#if
option.isSelected()>selected="selected"</#if>>
${option.description}
<#if (shownPrice > 0)>+<@ofbizCurrency amount=shownPrice
isoCode=price.currencyUsed/> </#if>
<#if (shownPrice < 0)>-<@ofbizCurrency
amount=(-1*shownPrice) isoCode=price.currencyUsed/> </#if>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
Wed Apr 14 20:46:08 2010
@@ -473,7 +473,7 @@ ${virtualJavaScript?if_exists}
<#list featureLists as featureList>
<#list featureList as feature>
<#if feature_index == 0>
- <div>${feature.description}: <select
id="FT${feature.productFeatureTypeId}" name="FT${feature.productFeatureTypeId}"
onChange="javascript:checkRadioButton();">
+ <div>${feature.description}: <select
id="FT${feature.productFeatureTypeId}" name="FT${feature.productFeatureTypeId}"
onchange="javascript:checkRadioButton();">
<option value="select" selected="selected"> select
option </option>
<#else>
<option
value="${feature.productFeatureId}">${feature.description} <#if
feature.price?exists>(+ <@ofbizCurrency amount=feature.price?string
isoCode=feature.currencyUomId />)</#if></option>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl
Wed Apr 14 20:46:08 2010
@@ -90,7 +90,7 @@ function shipBillAddr() {
<#if cart.getShippingContactMechId()?exists && paymentMethodType
!= "GC">
<tr>
<td width="26%" align="right"= valign="top">
- <input type="checkbox" name="useShipAddr" value="Y"
onClick="javascript:shipBillAddr();" <#if
requestParameters.useShipAddr?exists>checked</#if> />
+ <input type="checkbox" name="useShipAddr" value="Y"
onclick="javascript:shipBillAddr();" <#if
requestParameters.useShipAddr?exists>checked</#if> />
</td>
<td colspan="2" valign="center">
<div
class="tabletext">${uiLabelMap.FacilityBillingAddressSameShipping}</div>
@@ -141,35 +141,35 @@ function shipBillAddr() {
<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'>
@@ -181,14 +181,14 @@ function shipBillAddr() {
*</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}" />
@@ -211,21 +211,21 @@ function shipBillAddr() {
<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}" />
@@ -233,7 +233,7 @@ function shipBillAddr() {
</tr>
<#if paymentMethodType != "GC">
<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}" />
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
Wed Apr 14 20:46:08 2010
@@ -172,7 +172,7 @@ function submitForm(form, mode, value) {
<#list billingAccountList as billingAccount>
<#assign availableAmount =
billingAccount.accountBalance>
<#assign accountLimit = billingAccount.accountLimit>
- <option value="${billingAccount.billingAccountId}"
<#if billingAccount.billingAccountId ==
selectedBillingAccountId?default("")>selected</#if>>${billingAccount.description?default("")}
[${billingAccount.billingAccountId}] Available: <@ofbizCurrency
amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit:
<@ofbizCurrency amount=accountLimit
isoCode=billingAccount.accountCurrencyUomId/></option>
+ <option value="${billingAccount.billingAccountId}"
<#if billingAccount.billingAccountId ==
selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
[${billingAccount.billingAccountId}] Available: <@ofbizCurrency
amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit:
<@ofbizCurrency amount=accountLimit
isoCode=billingAccount.accountCurrencyUomId/></option>
</#list>
</select>
<label
for="billingAccountId">${uiLabelMap.FormFieldTitle_billingAccountId}</label>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl
Wed Apr 14 20:46:08 2010
@@ -51,7 +51,7 @@ under the License.
<#if (requestParameters.checkoutpage)?has_content>
<input type="hidden" name="checkoutpage"
value="${requestParameters.checkoutpage}" />
</#if>
- <input type="button" name="processButton"
value="${uiLabelMap.OrderSubmitOrder}" onClick="processOrder();"
class="mediumSubmit" />
+ <input type="button" name="processButton"
value="${uiLabelMap.OrderSubmitOrder}" onclick="processOrder();"
class="mediumSubmit" />
</form>
<#-- doesn't work with Safari, seems to work with IE, Mozilla <a
href="#" onclick="processOrder();"
class="buttontextbig">[${uiLabelMap.OrderSubmitOrder}] </a> -->
</td>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl Wed
Apr 14 20:46:08 2010
@@ -23,24 +23,24 @@ under the License.
<input type="hidden" name="paymentMethodId"
value="${parameters.paymentMethodId?if_exists}"/></td></tr>
<tr><td width="26%" align="right" valign="top"><div
class="tableheadtext">${uiLabelMap.AccountingEFTAccountInformation}</div></td><td
width="5"> </td><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="5"> </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="5"> </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'>
<option>${eftAccount.accountType?if_exists}</option>
@@ -51,10 +51,10 @@ under the License.
</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}"/></td>
</tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl Wed
Apr 14 20:46:08 2010
@@ -31,21 +31,21 @@ under the License.
<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}"/>
@@ -53,7 +53,7 @@ under the License.
</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}"/>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
Wed Apr 14 20:46:08 2010
@@ -84,7 +84,7 @@ function shipBillAddr() {
<#if cart.getShippingContactMechId()?exists &&
paymentMethodTypeId?if_exists != "GIFT_CARD">
<tr>
<td width="26%" align="right" valign="top">
- <input type="checkbox" name="useShipAddr" value="Y"
onClick="javascript:shipBillAddr();" <#if useShipAddr?exists>checked</#if>/>
+ <input type="checkbox" name="useShipAddr" value="Y"
onclick="javascript:shipBillAddr();" <#if useShipAddr?exists>checked</#if>/>
</td>
<td colspan="2" valign="middle">
<div
class="tabletext">${uiLabelMap.FacilityBillingAddressSameShipping}</div>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl
Wed Apr 14 20:46:08 2010
@@ -62,7 +62,7 @@ under the License.
<#if (requestParameters.checkoutpage)?has_content>
<input type="hidden" name="checkoutpage"
value="${requestParameters.checkoutpage}" />
</#if>
- <input type="button" id="submitOrderReview" name="processButton"
value="${uiLabelMap.OrderSubmitOrder}" onClick="processOrder();"
class="mediumSubmit" />
+ <input type="button" id="submitOrderReview" name="processButton"
value="${uiLabelMap.OrderSubmitOrder}" onclick="processOrder();"
class="mediumSubmit" />
<#-- doesn't work with Safari, seems to work with IE, Mozilla <a
href="#" onclick="processOrder();"
class="buttontextbig">[${uiLabelMap.OrderSubmitOrder}] </a> -->
</td>
</tr>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
Wed Apr 14 20:46:08 2010
@@ -163,7 +163,7 @@ under the License.
</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToAddress1"/>
@@ -171,14 +171,14 @@ under the License.
*</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="2%"> </td>
<td width="72%">
<input type="text" class="inputBox" size="30"
maxlength="30" id="shipToAddress2" name="shipToAddress2"
value="${parameters.shipToAddress2?if_exists}" />
</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToCity"/>
@@ -186,7 +186,7 @@ under the License.
*</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToStateProvinceGeoId"/>
@@ -202,7 +202,7 @@ under the License.
*</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToPostalCode"/>
@@ -210,7 +210,7 @@ under the License.
*</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToCountryGeoId"/>
@@ -258,7 +258,7 @@ under the License.
</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToAddress1"/>
@@ -266,14 +266,14 @@ under the License.
*</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="2%"> </td>
<td width="72%">
<input type="text" class="inputBox" id="billToAddress2"
size="30" maxlength="30" name="billToAddress2"
value="${parameters.billToAddress2?if_exists}" />
</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToCity"/>
@@ -281,7 +281,7 @@ under the License.
*</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToStateProvinceGeoId"/>
@@ -297,7 +297,7 @@ under the License.
*</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToPostalCode"/>
@@ -305,7 +305,7 @@ under the License.
*</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="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToCountryGeoId"/>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl
Wed Apr 14 20:46:08 2010
@@ -126,7 +126,7 @@ function getPaymentInformation() {
<tr>
<td width="26%" align="right" valign="top"><div
class="tableheadtext">${uiLabelMap.OrderSelectPaymentMethod}</div></td>
<td colspan="2">
- <select name="paymentMethodTypeOptionList"
class="selectBox" onChange="javascript:getPaymentInformation();">
+ <select name="paymentMethodTypeOptionList"
class="selectBox" onchange="javascript:getPaymentInformation();">
<option value="none">Select One</option>
<#if
productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
<option value="CREDIT_CARD" <#if
(parameters.paymentMethodTypeId?default("") == "CREDIT_CARD")>
selected="selected"</#if>>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</option>
@@ -146,7 +146,7 @@ function getPaymentInformation() {
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
<tr>
<td width='26%' nowrap="nowrap" align="right">
- <input type="checkbox" id="addGiftCard" name="addGiftCard"
value="Y" onClick="javascript:getGCInfo();"/>
+ <input type="checkbox" id="addGiftCard" name="addGiftCard"
value="Y" onclick="javascript:getGCInfo();"/>
</td>
<td colspan="2" nowrap="nowrap"><div
class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td>
</tr>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
Wed Apr 14 20:46:08 2010
@@ -77,7 +77,7 @@ function submitForm(form, mode, value) {
<option
value="">${uiLabelMap.OrderSelectShippingAddress}</option>
<#list shippingContactMechList as shippingContactMech>
<#assign shippingAddress =
shippingContactMech.getRelatedOne("PostalAddress")>
- <option value="${shippingAddress.contactMechId}"
<#if (shippingAddress.contactMechId ==
selectedContactMechId)>selected</#if>>${shippingAddress.address1}</option>
+ <option value="${shippingAddress.contactMechId}"
<#if (shippingAddress.contactMechId ==
selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
</#list>
</select>
</div>
@@ -91,7 +91,7 @@ function submitForm(form, mode, value) {
<#list carrierShipmentMethods as carrierShipmentMethod>
<#assign shippingEst =
shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)>
<#assign shippingMethod =
carrierShipmentMethod.shipmentMethodTypeId + "@" +
carrierShipmentMethod.partyId>
- <option value="${shippingMethod}" <#if (shippingMethod
== selectedShippingMethod)>selected</#if>>
+ <option value="${shippingMethod}" <#if (shippingMethod
== selectedShippingMethod)>selected="selected"</#if>>
<#if carrierShipmentMethod.partyId != "_NA_">
${carrierShipmentMethod.partyId?if_exists}
</#if>
@@ -116,16 +116,16 @@ function submitForm(form, mode, value) {
<select name="maySplit" class="selectBox">
<#assign maySplitStr =
cart.getMaySplit(groupIdx)?default("")>
<option
value="">${uiLabelMap.OrderSplittingPreference}</option>
- <option value="false" <#if maySplitStr ==
"N">selected</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
- <option value="true" <#if maySplitStr ==
"Y">selected</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
+ <option value="false" <#if maySplitStr ==
"N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
+ <option value="true" <#if maySplitStr ==
"Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
</select>
</div>
<div>
<select name="isGift" class="selectBox">
<#assign isGiftStr =
cart.getIsGift(groupIdx)?default("")>
<option value="">${uiLabelMap.OrderIsGift} ?</option>
- <option value="false" <#if isGiftStr ==
"N">selected</#if>>${uiLabelMap.OrderNotAGift}</option>
- <option value="true" <#if isGiftStr ==
"Y">selected</#if>>${uiLabelMap.OrderYesIsAGift}</option>
+ <option value="false" <#if isGiftStr ==
"N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
+ <option value="true" <#if isGiftStr ==
"Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
</select>
</div>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=934190&r1=934189&r2=934190&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
Wed Apr 14 20:46:08 2010
@@ -179,19 +179,19 @@ under the License.
</#if>
<select name="intervalNumber" class="selectBox">
<option
value="">${uiLabelMap.EcommerceSelectInterval}</option>
- <option value="1" <#if
(recurrenceRule.intervalNumber)?default(0) ==
1>selected</#if>>${uiLabelMap.EcommerceEveryDay}</option>
- <option value="2" <#if
(recurrenceRule.intervalNumber)?default(0) ==
2>selected</#if>>${uiLabelMap.EcommerceEveryOther}</option>
- <option value="3" <#if
(recurrenceRule.intervalNumber)?default(0) ==
3>selected</#if>>${uiLabelMap.EcommerceEvery3rd}</option>
- <option value="6" <#if
(recurrenceRule.intervalNumber)?default(0) ==
6>selected</#if>>${uiLabelMap.EcommerceEvery6th}</option>
- <option value="9" <#if
(recurrenceRule.intervalNumber)?default(0) ==
9>selected</#if>>${uiLabelMap.EcommerceEvery9th}</option>
+ <option value="1" <#if
(recurrenceRule.intervalNumber)?default(0) ==
1>selected="selected"</#if>>${uiLabelMap.EcommerceEveryDay}</option>
+ <option value="2" <#if
(recurrenceRule.intervalNumber)?default(0) ==
2>selected="selected"</#if>>${uiLabelMap.EcommerceEveryOther}</option>
+ <option value="3" <#if
(recurrenceRule.intervalNumber)?default(0) ==
3>selected="selected"</#if>>${uiLabelMap.EcommerceEvery3rd}</option>
+ <option value="6" <#if
(recurrenceRule.intervalNumber)?default(0) ==
6>selected="selected"</#if>>${uiLabelMap.EcommerceEvery6th}</option>
+ <option value="9" <#if
(recurrenceRule.intervalNumber)?default(0) ==
9>selected="selected"</#if>>${uiLabelMap.EcommerceEvery9th}</option>
</select>
<select name="frequency" class="selectBox">
<option
value="">${uiLabelMap.EcommerceSelectFrequency}</option>
- <option value="4" <#if
(recurrenceRule.frequency)?default("") ==
"DAILY">selected</#if>>${uiLabelMap.CommonDay}</option>
- <option value="5" <#if
(recurrenceRule.frequency)?default("") ==
"WEEKLY">selected</#if>>${uiLabelMap.CommonWeek}</option>
- <option value="6" <#if
(recurrenceRule.frequency)?default("") ==
"MONTHLY">selected</#if>>${uiLabelMap.CommonMonth}</option>
- <option value="7" <#if
(recurrenceRule.frequency)?default("") ==
"YEARLY">selected</#if>>${uiLabelMap.CommonYear}</option>
+ <option value="4" <#if
(recurrenceRule.frequency)?default("") ==
"DAILY">selected="selected"</#if>>${uiLabelMap.CommonDay}</option>
+ <option value="5" <#if
(recurrenceRule.frequency)?default("") ==
"WEEKLY">selected="selected"</#if>>${uiLabelMap.CommonWeek}</option>
+ <option value="6" <#if
(recurrenceRule.frequency)?default("") ==
"MONTHLY">selected="selected"</#if>>${uiLabelMap.CommonMonth}</option>
+ <option value="7" <#if
(recurrenceRule.frequency)?default("") ==
"YEARLY">selected="selected"</#if>>${uiLabelMap.CommonYear}</option>
</select>
</td>
<td> </td>
@@ -217,7 +217,7 @@ under the License.
<#if shippingContactMechList?has_content>
<#list shippingContactMechList as shippingContactMech>
<#assign shippingAddress =
shippingContactMech.getRelatedOne("PostalAddress")>
- <option
value="${shippingContactMech.contactMechId}"<#if
(shoppingList.contactMechId)?default("") == shippingAddress.contactMechId>
selected</#if>>${shippingAddress.address1}</option>
+ <option
value="${shippingContactMech.contactMechId}"<#if
(shoppingList.contactMechId)?default("") == shippingAddress.contactMechId>
selected="selected"</#if>>${shippingAddress.address1}</option>
</#list>
<#else>
<option
value="">${uiLabelMap.OrderNoAddressesAvailable}</option>
@@ -233,7 +233,7 @@ under the License.
<#list carrierShipMethods as shipMeth>
<#assign shippingEst =
shippingEstWpr.getShippingEstimate(shipMeth)?default(-1)>
<#assign shippingMethod =
shipMeth.shipmentMethodTypeId + "@" + shipMeth.partyId>
- <option value="${shippingMethod}"<#if shippingMethod
== chosenShippingMethod> selected</#if>>
+ <option value="${shippingMethod}"<#if shippingMethod
== chosenShippingMethod> selected="selected"</#if>>
<#if shipMeth.partyId != "_NA_">
${shipMeth.partyId?if_exists}
</#if>
@@ -261,7 +261,7 @@ under the License.
<#list paymentMethodList as paymentMethod>
<#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
<#assign creditCard =
paymentMethod.getRelatedOne("CreditCard")>
- <option value="${paymentMethod.paymentMethodId}" <#if
(shoppingList.paymentMethodId)?default("") ==
paymentMethod.paymentMethodId>selected</#if>>CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option>
+ <option value="${paymentMethod.paymentMethodId}" <#if
(shoppingList.paymentMethodId)?default("") ==
paymentMethod.paymentMethodId>selected="selected"</#if>>CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option>
<#elseif paymentMethod.paymentMethodTypeId ==
"EFT_ACCOUNT">
<#assign eftAccount =
paymentMethod.getRelatedOne("EftAccount")>
<option
value="${paymentMethod.paymentMethodId}">EFT: ${eftAccount.bankName?if_exists}:
${eftAccount.accountNumber?if_exists}</option>
