svn commit: r945583 - in /ofbiz/branches/release10.04: ./ framework/common/webcommon/por
Locked
 
|
Author: erwan
Date: Tue May 18 10:36:07 2010 New Revision: 945583 URL: http://svn.apache.org/viewvc?rev=945583&view=rev Log: Applied fix from trunk for revision: 945582 XHTML validation errors round 2++ (framework) - OFBIZ-3761 (https://issues.apache.org/jira/browse/OFBIZ-3761) Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/framework/common/webcommon/portal/editPortalPage.ftl ofbiz/branches/release10.04/framework/common/webcommon/portal/listPortalPortlets.ftl ofbiz/branches/release10.04/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/release10.04/framework/widget/templates/htmlScreenMacroLibrary.ftl ofbiz/branches/release10.04/framework/widget/templates/htmlTreeMacroLibrary.ftl Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 18 10:36:07 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 +/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 Modified: ofbiz/branches/release10.04/framework/common/webcommon/portal/editPortalPage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/webcommon/portal/editPortalPage.ftl?rev=945583&r1=945582&r2=945583&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/common/webcommon/portal/editPortalPage.ftl (original) +++ ofbiz/branches/release10.04/framework/common/webcommon/portal/editPortalPage.ftl Tue May 18 10:36:07 2010 @@ -19,13 +19,14 @@ under the License. <#if portalPage?has_content> <table width="100%"> <tr> + <#assign line=0> <#list portalPageColumnList?if_exists as portalPageColumn> <td class="manage-portal-column-toolbar" style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> width:${portalPageColumn.columnWidthPercentage}%;</#if>"> <hr /> <ul> - <li id="delete-column"><form method="post" action="<@ofbizUrl>deletePortalPageColumn${Adm?if_exists}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="delPortalPageId_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li> - <li id="add-portlet"><form method="post" action="<@ofbizUrl>AddPortlet${Adm?if_exists}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="addPortlet_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.addPortlet_${portalPageColumn_index}.submit()">${uiLabelMap.CommonAddAPortlet}</a></li> - <li id="column-width"> + <li id="delete-column_${line}"><form method="post" action="<@ofbizUrl>deletePortalPageColumn${Adm?if_exists}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="delPortalPageId_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li> + <li id="add-portlet_${line}"><form method="post" action="<@ofbizUrl>AddPortlet${Adm?if_exists}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="addPortlet_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.addPortlet_${portalPageColumn_index}.submit()">${uiLabelMap.CommonAddAPortlet}</a></li> + <li id="column-width_${line}"> <form method="post" action="<@ofbizUrl>updatePortalPageColumn${Adm?if_exists}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="updatePortalPageColum_${portalPageColumn_index}"> <input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/> <input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/> @@ -43,6 +44,7 @@ under the License. <#if portalPageColumn_has_next> <td> </td> </#if> + <#assign line=line+1> </#list> </tr> <tr> @@ -121,10 +123,10 @@ under the License. <#assign firstInColumn = false/> </#if> </#list> + </td> <#if portalPageColumn_has_next> <td> </td> </#if> - </td> </#list> </tr> </table> Modified: ofbiz/branches/release10.04/framework/common/webcommon/portal/listPortalPortlets.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=945583&r1=945582&r2=945583&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/common/webcommon/portal/listPortalPortlets.ftl (original) +++ ofbiz/branches/release10.04/framework/common/webcommon/portal/listPortalPortlets.ftl Tue May 18 10:36:07 2010 @@ -52,7 +52,7 @@ under the License. <td> <#if portalPortlet.screenshot?has_content> <div class="screenshot"> - <a href="<@ofbizContentUrl>${portalPortlet.screenshot}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${portalPortlet.screenshot}</@ofbizContentUrl>" width="250"/></a> + <a href="<@ofbizContentUrl>${portalPortlet.screenshot}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${portalPortlet.screenshot}</@ofbizContentUrl>" width="250" alt=""/></a> </div> </#if> </td> Modified: ofbiz/branches/release10.04/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=945583&r1=945582&r2=945583&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/release10.04/framework/widget/templates/htmlFormMacroLibrary.ftl Tue May 18 10:36:07 2010 @@ -25,7 +25,7 @@ under the License. <#macro renderDisplayField type imageLocation idName description class alert inPlaceEditorUrl="" inPlaceEditorParams=""> <#if type?has_content && type=="image"> - <img src="${imageLocation}"><#lt/> + <img src="${imageLocation}" alt=""><#lt/> <#else> <#if inPlaceEditorUrl?has_content || class?has_content || alert=="true"> <span <#if idName?has_content>id="cc_${idName}"</#if> <@renderClass class alert />><#t/> @@ -485,7 +485,7 @@ ${item.description}</span> <#macro renderFileField className alert name value size maxlength autocomplete><input type="file" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#macro> <#macro renderPasswordField className alert name value size maxlength id autocomplete><input type="password" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/></#macro> -<#macro renderImageField value description alternate border width height event action><img<#if value?has_content> src="${value}"</#if><#if description?has_content> title="${description}"</#if><#if alternate?has_content> alt="${alternate}"</#if><#if border?has_content> border="${border}"</#if><#if width?has_content> width="${width}"</#if><#if height?has_content> height="${height}"</#if><#if event?has_content> ${rp.event?html}="${action}" </#if>/></#macro> +<#macro renderImageField value description alternate border width height event action><img<#if value?has_content> src="${value}"</#if><#if description?has_content> title="${description}"</#if> alt="<#if alternate?has_content>${alternate}"</#if>"<#if border?has_content> border="${border}"</#if><#if width?has_content> width="${width}"</#if><#if height?has_content> height="${height}"</#if><#if event?has_content> ${rp.event?html}="${action}" </#if>/></#macro> <#macro renderBanner style leftStyle rightStyle leftText text rightText> <table width="100%"> <tr><#rt/> @@ -526,5 +526,5 @@ ${item.description}</span> </#macro> <#macro makeHiddenFormLinkForm actionUrl name parameters targetWindow><form method="post" action="${actionUrl}" <#if targetWindow?has_content>target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${name}"><#list parameters as parameter><input name="${parameter.name}" value="${parameter.value}" type="hidden"/></#list></form></#macro> -<#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description confirmation><a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="javascript:document.${hiddenFormName}.submit()"<#if action?has_content && event?has_content> ${event}="${action}"</#if><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if>><#if imgSrc?has_content><img src="${imgSrc}"/></#if>${description}</a></#macro> +<#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description confirmation><a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="javascript:document.${hiddenFormName}.submit()"<#if action?has_content && event?has_content> ${event}="${action}"</#if><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if>><#if imgSrc?has_content><img src="${imgSrc}" alt=""/></#if>${description}</a></#macro> <#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc title alternate linkUrl targetWindow description confirmation><a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="${linkUrl}"<#if targetWindow?has_content> target="${targetWindow}"</#if><#if action?has_content && event?has_content> ${event}="${action}"</#if><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if>><#if imgSrc?has_content><img src="${imgSrc}" alt="${alternate}" title="${title}"/></#if>${description}</a></#macro> Modified: ofbiz/branches/release10.04/framework/widget/templates/htmlScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=945583&r1=945582&r2=945583&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/widget/templates/htmlScreenMacroLibrary.ftl (original) +++ ofbiz/branches/release10.04/framework/widget/templates/htmlScreenMacroLibrary.ftl Tue May 18 10:36:07 2010 @@ -124,7 +124,7 @@ under the License. </#macro> <#macro renderImage src id style wid hgt border alt urlString> <#if src?has_content> -<img <#if id?has_content>id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if wid?has_content> width="${wid}"</#if><#if hgt?has_content> height="${hgt}"</#if><#if border?has_content> border="${border}"</#if><#if alt?has_content> alt="${alt}"</#if> src="${urlString}" /> +<img <#if id?has_content>id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if wid?has_content> width="${wid}"</#if><#if hgt?has_content> height="${hgt}"</#if><#if border?has_content> border="${border}"</#if> alt="<#if alt?has_content>${alt}</#if>" src="${urlString}" /> </#if> </#macro> Modified: ofbiz/branches/release10.04/framework/widget/templates/htmlTreeMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/templates/htmlTreeMacroLibrary.ftl?rev=945583&r1=945582&r2=945583&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/widget/templates/htmlTreeMacroLibrary.ftl (original) +++ ofbiz/branches/release10.04/framework/widget/templates/htmlTreeMacroLibrary.ftl Tue May 18 10:36:07 2010 @@ -58,7 +58,7 @@ under the License. <#macro renderImage src id style wid hgt border alt urlString> <#if src?has_content> -<img <#if id?has_content>id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if wid?has_content> width="${wid}"</#if><#if hgt?has_content> height="${hgt}"</#if><#if border?has_content> border="${border}"</#if><#if alt?has_content> alt="${alt}"</#if> src="${urlString}" /><#rt/> +<img <#if id?has_content>id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if wid?has_content> width="${wid}"</#if><#if hgt?has_content> height="${hgt}"</#if><#if border?has_content> border="${border}"</#if> alt="<#if alt?has_content>${alt}</#if>" src="${urlString}" /><#rt/> </#if> </#macro> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |