Author: jacopoc
Date: Fri Jul 3 13:04:49 2009
New Revision: 790894
URL:
http://svn.apache.org/viewvc?rev=790894&view=revLog:
Misc fixes for the templates of the text widget macro widget renderer. Thanks to Rishi Solanki for the bug report.
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=790894&r1=790893&r2=790894&view=diff==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Fri Jul 3 13:04:49 2009
@@ -40,6 +40,7 @@
</#if>
</#macro>
+<#macro renderTooltip tooltip tooltipStyle></#macro>
<#macro renderCheckField items className alert allChecked currentValue name event action></#macro>
<#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event ation></#macro>
Modified: ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl?rev=790894&r1=790893&r2=790894&view=diff==============================================================================
--- ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl Fri Jul 3 13:04:49 2009
@@ -31,20 +31,20 @@
<#macro renderContainerBegin id style autoUpdateLink autoUpdateInterval></#macro>
<#macro renderContainerEnd></#macro>
-<#macro renderContentBegin></#macro>
+<#macro renderContentBegin editRequest enableEditValue editContainerStyle></#macro>
<#macro renderContentBody></#macro>
-<#macro renderContentEnd></#macro>
-<#macro renderSubContentBegin></#macro>
+<#macro renderContentEnd urlString editMode editContainerStyle editRequest enableEditValue></#macro>
+<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue></#macro>
<#macro renderSubContentBody></#macro>
<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue></#macro>
<#macro renderHorizontalSeparator id style></#macro>
-<#macro renderLabel text><#if text?exists>${text}</#if></#macro>
-<#macro renderLink></#macro>
-<#macro renderImage></#macro>
+<#macro renderLabel text id style><#if text?exists>${text}</#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>
-<#macro renderContentFrame></#macro>
-<#macro renderScreenletBegin id></#macro>
+<#macro renderContentFrame fullUrl width height border></#macro>
+<#macro renderScreenletBegin id title collapsible collapsibleAreaId expandToolTip collapseToolTip fullUrlString padded menuString showMore collapsed javaScriptEnabled></#macro>
<#macro renderScreenletSubWidget></#macro>
<#macro renderScreenletEnd></#macro>