Author: ashish
Date: Thu Mar 28 18:51:26 2013
New Revision: 1462257
URL: http://svn.apache.org/r1462257
Log:
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/trunk/framework/widget/templates/foScreenMacroLibrary.ftl
Modified: ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl?rev=1462257&r1=1462256&r2=1462257&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl Thu Mar 28
18:51:26 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>
