svn commit: r946323 - in /ofbiz/branches/release10.04: ./ applications/content/data/ applications/content/template/ applications/content/template/mime-type/ applications/content/webapp/content/cms/ applications/content/webapp/content/survey/

[erwan]

Author: erwan
Date: Wed May 19 18:17:08 2010
New Revision: 946323

URL: http://svn.apache.org/viewvc?rev=946323&view=rev
Log:
Applied fix from trunk for revision: 946322
 XHTML validation errors round 2++ (content) OFBIZ-3755 https://issues.apache.org/jira/browse/OFBIZ-3755

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/content/data/TemplateData.xml
    ofbiz/branches/release10.04/applications/content/template/HelpTemplate.ftl
    ofbiz/branches/release10.04/applications/content/template/mime-type/image.ftl
    ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSContentEdit.ftl
    ofbiz/branches/release10.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 18:17:08 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,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320
+/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,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322

Modified: ofbiz/branches/release10.04/applications/content/data/TemplateData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/data/TemplateData.xml?rev=946323&r1=946322&r2=946323&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/data/TemplateData.xml (original)
+++ ofbiz/branches/release10.04/applications/content/data/TemplateData.xml Wed May 19 18:17:08 2010
@@ -196,7 +196,7 @@ ResourceId=${subDataResourceId?if_exists
         >
             <#assign drDataResourceId=content.dataResourceId?if_exists/>
         </@traverseSubContentCache>
-        <img src="<@ofbizUrl>/img?imgId=${drDataResourceId?if_exists}</@ofbizUrl>"/>
+        <img src="<@ofbizUrl>/img?imgId=${drDataResourceId?if_exists}</@ofbizUrl>" alt=""/>
     </td>
   </tr>
 </table>
@@ -447,7 +447,7 @@ ${txt}
         <textData><![CDATA[<table>
   <tr>
     <td>
-        <img src="<@ofbizContentUrl><@renderSubContentCache mapKey="IMAGE" wrapTemplateId=""/></@ofbizContentUrl>"/>
+        <img src="<@ofbizContentUrl><@renderSubContentCache mapKey="IMAGE" wrapTemplateId=""/></@ofbizContentUrl>" alt="" />
     </td>
   </tr>
 </table>

Modified: ofbiz/branches/release10.04/applications/content/template/HelpTemplate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/template/HelpTemplate.ftl?rev=946323&r1=946322&r2=946323&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/template/HelpTemplate.ftl (original)
+++ ofbiz/branches/release10.04/applications/content/template/HelpTemplate.ftl Wed May 19 18:17:08 2010
@@ -88,7 +88,7 @@ under the License.
         <#assign caption = item/>
     </#if>
   </#list>
-  <img src="${fileref}" <#if depth?has_content> height="${depth}"</#if> <#if width?has_content> width="${width}"</#if> <#if alt?has_content> alt="${alt}"</#if>/>
+  <img src="${fileref}" <#if depth?has_content> height="${depth}"</#if> <#if width?has_content> width="${width}"</#if> alt="<#if alt?has_content>${alt}</#if>" />
   <#if caption?has_content><div>${caption}</div></#if>
 </#macro>
 

Modified: ofbiz/branches/release10.04/applications/content/template/mime-type/image.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/template/mime-type/image.ftl?rev=946323&r1=946322&r2=946323&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/template/mime-type/image.ftl (original)
+++ ofbiz/branches/release10.04/applications/content/template/mime-type/image.ftl Wed May 19 18:17:08 2010
@@ -16,4 +16,4 @@
   specific language governing permissions and limitations
   under the License.
   -->
-<img src="/content/control/stream?contentId=${contentId}"/>
\ No newline at end of file
+<img src="/content/control/stream?contentId=${contentId}" alt=""/>
\ No newline at end of file

Modified: ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSContentEdit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSContentEdit.ftl?rev=946323&r1=946322&r2=946323&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSContentEdit.ftl (original)
+++ ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSContentEdit.ftl Wed May 19 18:17:08 2010
@@ -191,7 +191,7 @@ ${menuWrapper.renderMenuString()}
           <td>
   <table width="100%" border="0" cellpadding="0" cellspacing='0'>
     <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>Image</b></div></td><td>&nbsp;</td><td><div class='tabletext'>
-        <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" />
+        <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" alt="" />
 <div></td></tr>
   </table>
           </td>

Modified: ofbiz/branches/release10.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl?rev=946323&r1=946322&r2=946323&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl (original)
+++ ofbiz/branches/release10.04/applications/content/webapp/content/survey/EditSurveyQuestions.ftl Wed May 19 18:17:08 2010
@@ -312,6 +312,6 @@ under the License.
       <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&amp;surveyQuestionId=${surveyQuestionOption.surveyQuestionId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNew} ${uiLabelMap.ContentSurveyOption}]</a>
     </#if>
     ${createSurveyOptionWrapper.renderFormString()}
-  </#if>
     </div>
-</div>
\ No newline at end of file
+</div>
+</#if>