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 2013/03/28 20:00:04 UTC
svn commit: r1462263 -
/ofbiz/branches/release11.04/framework/widget/templates/foScreenMacroLibrary.ftl
Author: ashish
Date: Thu Mar 28 19:00:03 2013
New Revision: 1462263
URL: http://svn.apache.org/r1462263
Log:
Applied bug fix from trunk r1462257.
Applied bug fix from jira issue - OFBIZ-5165 - Broken renderLabel functionality of screenfop view handler.
If we use label inside widget tag then renderLabel macro skip the label rendering due to wrong condition check.
-- Corrected the conditions for label rendering.
-- Also replaced fo:inline with fo:block as fo:inline can't render directly.
Thanks Deepak.
Modified:
ofbiz/branches/release11.04/framework/widget/templates/foScreenMacroLibrary.ftl
Modified: ofbiz/branches/release11.04/framework/widget/templates/foScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/templates/foScreenMacroLibrary.ftl?rev=1462263&r1=1462262&r2=1462263&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/widget/templates/foScreenMacroLibrary.ftl (original)
+++ ofbiz/branches/release11.04/framework/widget/templates/foScreenMacroLibrary.ftl Thu Mar 28 19:00:03 2013
@@ -59,7 +59,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?exists><#if style?has_content><fo:inline <@getFoStyle style/>></#if>${text}<#if style?has_content></fo:inline></#if></#if></#macro>
+<#macro renderLabel text id style><#if text?has_content><fo:block <#if style?has_content><@getFoStyle style/></#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>