svn commit: r791442 - in /ofbiz/trunk/framework/widget/templates: textFormMacroLibrary.ftl textScreenMacroLibrary.ftl

[jacopoc]

Author: jacopoc
Date: Mon Jul  6 11:25:49 2009
New Revision: 791442

URL: http://svn.apache.org/viewvc?rev=791442&view=rev
Log:
Misc fixes for the text macro renderer's templates.

Modified:
    ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
    ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl

Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=791442&r1=791441&r2=791442&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Mon Jul  6 11:25:49 2009
@@ -61,7 +61,9 @@
 <#macro renderFormatListWrapperClose formName></#macro>
 
 <#macro renderFormatHeaderRowOpen style></#macro>
-<#macro renderFormatHeaderRowClose> </#macro>
+<#macro renderFormatHeaderRowClose>
+
+</#macro>
 <#macro renderFormatHeaderRowCellOpen style positionSpan></#macro>
 <#macro renderFormatHeaderRowCellClose></#macro>
 
@@ -70,17 +72,21 @@
 <#macro renderFormatHeaderRowFormCellTitleSeparator style isLast></#macro>
 
 <#macro renderFormatItemRowOpen formName itemIndex altRowStyles evenRowStyle oddRowStyle></#macro>
-<#macro renderFormatItemRowClose formName></#macro>
+<#macro renderFormatItemRowClose formName>
+
+</#macro>
 <#macro renderFormatItemRowCellOpen fieldName style positionSpan></#macro>
 <#macro renderFormatItemRowCellClose fieldName></#macro>
 <#macro renderFormatItemRowFormCellOpen style></#macro>
 <#macro renderFormatItemRowFormCellClose></#macro>
 
 <#macro renderFormatSingleWrapperOpen formName style></#macro>
-<#macro renderFormatSingleWrapperClose formName></#macro>
+<#macro renderFormatSingleWrapperClose formName>
+</#macro>
 
 <#macro renderFormatFieldRowOpen></#macro>
-<#macro renderFormatFieldRowClose></#macro>
+<#macro renderFormatFieldRowClose>
+</#macro>
 <#macro renderFormatFieldRowTitleCellOpen style> </#macro>
 <#macro renderFormatFieldRowTitleCellClose></#macro>
 <#macro renderFormatFieldRowSpacerCell></#macro>

Modified: ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl?rev=791442&r1=791441&r2=791442&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl Mon Jul  6 11:25:49 2009
@@ -39,7 +39,11 @@
 <#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue></#macro>
 
 <#macro renderHorizontalSeparator id style></#macro>
-<#macro renderLabel text id style><#if text?exists>${text}</#if></#macro>
+<#macro renderLabel text id style>
+    <#if text?exists>
+        ${text}<#lt/>
+    </#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>