You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2015/04/18 16:16:45 UTC
svn commit: r1674517 - in
/ofbiz/branches/release13.07/framework/widget/templates:
foFormMacroLibrary.ftl foScreenMacroLibrary.ftl
Author: ashish
Date: Sat Apr 18 14:16:45 2015
New Revision: 1674517
URL: http://svn.apache.org/r1674517
Log:
Applied bug fix from trunk r1674513.
======================================
Applied patch from jira issue - OFBIZ-6260 - foScreenMacroLibrary.ftl renderLabel doesn't apply style parameter.
Thanks Christian for creating the issue and contributing the patch for the same. Thanks Aditya for reviewing the patch.
======================================
Modified:
ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl
Modified: ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl?rev=1674517&r1=1674516&r2=1674517&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl Sat Apr 18 14:16:45 2015
@@ -33,8 +33,10 @@ under the License.
"h2":"font-weight=\"bold\"",
"h3":"font-weight=\"bold\" font-style=\"italic\"",
"error":"color=\"red\""}/>
- <#assign foStyle = foStyles[style]?default("")/>
- ${foStyle?default("")}
+ <#list style?split(' ') as styleItem>
+ <#assign foStyle = foStyles[styleItem]?default("")/>
+ ${foStyle?default("")}
+ </#list>
</#macro>
<#escape x as x?xml>
Modified: ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl?rev=1674517&r1=1674516&r2=1674517&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl (original)
+++ ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl Sat Apr 18 14:16:45 2015
@@ -31,8 +31,10 @@ under the License.
"h2":"font-weight=\"bold\"",
"h3":"font-weight=\"bold\" font-style=\"italic\"",
"error":"color=\"red\""}/>
- <#assign foStyle = foStyles[style]?default("")/>
- ${foStyle?default("")}
+ <#list style?split(' ') as styleItem>
+ <#assign foStyle = foStyles[styleItem]?default("")/>
+ ${foStyle?default("")}
+ </#list>
</#macro>
<#escape x as x?xml>
@@ -59,7 +61,7 @@ under the License.
<#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?has_content><fo:block <#if id?has_content> id="${id}"</#if>>${text}</fo:block></#if></#macro>
+<#macro renderLabel text id style><#if text?has_content><fo:block <#if style?has_content><@getFoStyle style/></#if> <#if id?has_content> id="${id}"</#if>>${text}</fo:block></#if></#macro>
<#macro renderLink parameterList targetWindow target uniqueItemName linkType actionUrl id style name linkUrl text imgStr></#macro>
<#macro renderImage src id style wid hgt border alt urlString></#macro>