Author: erwan
Date: Tue May 18 19:58:57 2010
New Revision: 945853
URL: http://svn.apache.org/viewvc?rev=945853&view=rev
Log:
Applied fix from trunk for revision: 945852
XHTML validation errors round 2++ (specialpurpose/ecommerce) - OFBIZ-3757
(https://issues.apache.org/jira/browse/OFBIZ-3757)
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/specialpurpose/ecommerce/templates/survey/minisurvey.ftl
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 18 19:58:57 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852
Modified:
ofbiz/branches/release10.04/specialpurpose/ecommerce/templates/survey/minisurvey.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/templates/survey/minisurvey.ftl?rev=945853&r1=945852&r2=945853&view=diff
==============================================================================
---
ofbiz/branches/release10.04/specialpurpose/ecommerce/templates/survey/minisurvey.ftl
(original)
+++
ofbiz/branches/release10.04/specialpurpose/ecommerce/templates/survey/minisurvey.ftl
Tue May 18 19:58:57 2010
@@ -61,8 +61,8 @@ under the License.
<#if surveyQuestionAndAppl.requiredField?default("N") != "Y">
<option value=""></option>
</#if>
- <option <#if "Y" == selectedOption>SELECTED</#if>>Y</option>
- <option <#if "N" == selectedOption>SELECTED</#if>>N</option>
+ <option <#if "Y" ==
selectedOption>selected="selected"</#if>>Y</option>
+ <option <#if "N" ==
selectedOption>selected="selected"</#if>>N</option>
</select>
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA">
<textarea class="textAreaBox" cols="40" rows="5"
name="answers_${surveyQuestionAndAppl.surveyQuestionId}">${(answer.textResponse)?if_exists}</textarea>
@@ -97,7 +97,7 @@ under the License.
</#if>
<#if options?has_content>
<#list options as option>
- <option value="${option.surveyOptionSeqId}" <#if
option.surveyOptionSeqId ==
selectedOption>SELECTED</#if>>${option.description?if_exists}</option>
+ <option value="${option.surveyOptionSeqId}" <#if
option.surveyOptionSeqId ==
selectedOption>selected="selected"</#if>>${option.description?if_exists}</option>
</#list>
<#else>
<option value="">Nothing to choose</option>
Modified:
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=945853&r1=945852&r2=945853&view=diff
==============================================================================
---
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
(original)
+++
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
Tue May 18 19:58:57 2010
@@ -289,7 +289,7 @@ function setAlternateGwp(field) {
<select class="selectBox"
name="option^GIFT_WRAP_${cartLineIndex}"
onchange="javascript:document.cartform.submit()">
<option
value="NO^">${uiLabelMap.EcommerceNoGiftWrap}</option>
<#list giftWrapOption as option>
- <option value="${option.productFeatureId}" <#if
((selectedOption.productFeatureId)?exists && selectedOption.productFeatureId ==
option.productFeatureId)>SELECTED</#if>>${option.description} :
${option.amount?default(0)}</option>
+ <option value="${option.productFeatureId}" <#if
((selectedOption.productFeatureId)?exists && selectedOption.productFeatureId ==
option.productFeatureId)>selected="selected"</#if>>${option.description} :
${option.amount?default(0)}</option>
</#list>
</select>
<#elseif showNoGiftWrapOptions>
Modified:
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl?rev=945853&r1=945852&r2=945853&view=diff
==============================================================================
---
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
(original)
+++
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
Tue May 18 19:58:57 2010
@@ -58,7 +58,7 @@ under the License.
<div>
<#if categoryImageUrl?string?has_content>
<#assign height=100/>
- <img src='<@ofbizContentUrl>${categoryImageUrl}</@ofbizContentUrl>'
vspace='5' hspace='5' border='1' height='${height}' align='left'/>
+ <img src='<@ofbizContentUrl>${categoryImageUrl}</@ofbizContentUrl>'
vspace='5' hspace='5' border='1' height='${height}' align='left' alt="" />
</#if>
<#if longDescription?has_content>
${longDescription}
Modified:
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=945853&r1=945852&r2=945853&view=diff
==============================================================================
---
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
(original)
+++
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
Tue May 18 19:58:57 2010
@@ -205,7 +205,7 @@ function getConfigDetails(event) {
<#assign productLargeImageUrl = firstLargeImage>
</#if>
<#if productLargeImageUrl?string?has_content>
- <a href="javascript:popupDetail();"><img
src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>'
name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left'
/></a>
+ <a href="javascript:popupDetail();"><img
src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>'
name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left'
alt="" /></a>
</#if>
</td>
<td align="right" valign="top">
@@ -417,7 +417,7 @@ function getConfigDetails(event) {
<#assign imageUrl = "/images/defaultImage.jpg">
</#if>
<td align="center" valign="bottom">
- <a
href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img
src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>"
border="0" width="60" height="60" /></a>
+ <a
href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img
src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>"
border="0" width="60" height="60" alt="" /></a>
<br />
<a
href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"
class="buttontext">${key}</a>
</td>
@@ -478,7 +478,7 @@ function getConfigDetails(event) {
</#if>
<#assign image = question.content.get("IMAGE_URL")?if_exists>
<#if image?string?has_content>
- <img
src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>'
vspace='5' hspace='5' border='0' width='200' align='left' />
+ <img
src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>'
vspace='5' hspace='5' border='0' width='200' align='left' alt="" />
</#if>
<#else>
<div><a
href='#${question.getConfigItem().getString("configItemId")}'
class="buttontext">Details</a></div>
Modified:
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=945853&r1=945852&r2=945853&view=diff
==============================================================================
---
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
(original)
+++
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
Tue May 18 19:58:57 2010
@@ -178,7 +178,7 @@ function submitForm(form, mode, value) {
<#if !smallImageUrl?string?has_content><#assign
smallImageUrl = "/images/defaultImage.jpg"></#if>
<#if smallImageUrl?string?has_content>
<a
href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>">
- <img
src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>"
width="50" class="imageborder" border="0"/>
+ <img
src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>"
width="50" class="imageborder" border="0" alt="" />
</a>
</#if>
<#-- end code to display a small image of the product -->
