Author: jacopoc
Date: Thu Jun 18 10:14:11 2009 New Revision: 785999 URL: http://svn.apache.org/viewvc?rev=785999&view=rev Log: Applied fix from trunk for revision: 785509 Added missing arguments to widget renderer macro; thanks to Marco Risaliti for the fix. Modified: ofbiz/branches/release09.04/framework/widget/templates/foScreenMacroLibrary.ftl ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl ofbiz/branches/release09.04/framework/widget/templates/textScreenMacroLibrary.ftl ofbiz/branches/release09.04/framework/widget/templates/xmlScreenMacroLibrary.ftl Modified: ofbiz/branches/release09.04/framework/widget/templates/foScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/templates/foScreenMacroLibrary.ftl?rev=785999&r1=785998&r2=785999&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/widget/templates/foScreenMacroLibrary.ftl (original) +++ ofbiz/branches/release09.04/framework/widget/templates/foScreenMacroLibrary.ftl Thu Jun 18 10:14:11 2009 @@ -42,7 +42,7 @@ <#macro renderContentEnd></#macro> <#macro renderSubContentBegin></#macro> <#macro renderSubContentBody></#macro> -<#macro renderSubContentEnd></#macro> +<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue></#macro> <#macro renderHorizontalSeparator id style><fo:block><fo:leader leader-length="100%" leader-pattern="rule" rule-style="solid" rule-thickness="0.1mm" color="black"/></fo:block></#macro> <#macro renderLabel text id style><#if text?exists><#if style?has_content><fo:inline <@getFoStyle style/>></#if>${text}<#if style?has_content></fo:inline></#if></#if></#macro> Modified: ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=785999&r1=785998&r2=785999&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl (original) +++ ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl Thu Jun 18 10:14:11 2009 @@ -37,7 +37,7 @@ </#macro> <#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?exists && enableEditValue == "true"><div class="${editContainerStyle}"></#if></#macro> <#macro renderSubContentBody></#macro> -<#macro renderSubContentEnd> +<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue> <#if editRequest?exists && enableEditValue == "true"> <#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if> <#if editContainerStyle?exists></div><#rt/></#if> Modified: ofbiz/branches/release09.04/framework/widget/templates/textScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/templates/textScreenMacroLibrary.ftl?rev=785999&r1=785998&r2=785999&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/widget/templates/textScreenMacroLibrary.ftl (original) +++ ofbiz/branches/release09.04/framework/widget/templates/textScreenMacroLibrary.ftl Thu Jun 18 10:14:11 2009 @@ -27,7 +27,7 @@ <#macro renderContentEnd></#macro> <#macro renderSubContentBegin></#macro> <#macro renderSubContentBody></#macro> -<#macro renderSubContentEnd></#macro> +<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue></#macro> <#macro renderHorizontalSeparator id style></#macro> <#macro renderLabel text><#if text?exists>${text}</#if></#macro> Modified: ofbiz/branches/release09.04/framework/widget/templates/xmlScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/templates/xmlScreenMacroLibrary.ftl?rev=785999&r1=785998&r2=785999&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/widget/templates/xmlScreenMacroLibrary.ftl (original) +++ ofbiz/branches/release09.04/framework/widget/templates/xmlScreenMacroLibrary.ftl Thu Jun 18 10:14:11 2009 @@ -29,7 +29,7 @@ </#macro> <#macro renderSubContentBegin editContainerStyle editRequest enableEditValue></#macro> <#macro renderSubContentBody></#macro> -<#macro renderSubContentEnd> +<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue> </#macro> <#macro renderHorizontalSeparator id style></#macro> |
Free forum by Nabble | Edit this page |