Author: jacopoc
Date: Thu Feb 11 10:33:19 2010
New Revision: 908912
URL: http://svn.apache.org/viewvc?rev=908912&view=rev
Log:
Added newly added (in rev. 908894) renderDisplayField input arguments.
Modified:
ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
Modified: ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl?rev=908912&r1=908911&r2=908912&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl Thu Feb 11
10:33:19 2010
@@ -19,7 +19,7 @@
<#macro renderField text><#if text?exists>"${text?replace("\"",
"\"\"")}"</#if></#macro>
-<#macro renderDisplayField idName description class alert inPlaceEditorId=""
inPlaceEditorUrl="" inPlaceEditorParams="">
+<#macro renderDisplayField type imageLocation idName description class alert
inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
<@renderField description />,<#rt/>
</#macro>
<#macro renderHyperlinkField></#macro>
Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=908912&r1=908911&r2=908912&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Thu Feb 11
10:33:19 2010
@@ -41,7 +41,7 @@
<#macro renderField text><#if text?exists>${text}</#if></#macro>
-<#macro renderDisplayField idName description class alert inPlaceEditorId=""
inPlaceEditorUrl="" inPlaceEditorParams="">
+<#macro renderDisplayField type imageLocation idName description class alert
inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
<@makeBlock class description />
</#macro>
<#macro renderHyperlinkField></#macro>
Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=908912&r1=908911&r2=908912&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Thu Feb 11
10:33:19 2010
@@ -19,7 +19,7 @@
<#macro renderField text><#if text?exists>"${text}"</#if></#macro>
-<#macro renderDisplayField idName description class alert inPlaceEditorId=""
inPlaceEditorUrl="" inPlaceEditorParams="">
+<#macro renderDisplayField type imageLocation idName description class alert
inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
<@renderField description />
</#macro>
<#macro renderHyperlinkField></#macro>
Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=908912&r1=908911&r2=908912&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Thu Feb 11
10:33:19 2010
@@ -35,12 +35,7 @@
<#macro renderFormatSingleWrapperClose formName></${formName}Export></#macro>
-
-
-
-
-
-<#macro renderDisplayField idName description class alert inPlaceEditorId=""
inPlaceEditorUrl="" inPlaceEditorParams="">
+<#macro renderDisplayField type imageLocation idName description class alert
inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
<@renderField description/>
</#macro>
<#macro renderHyperlinkField></#macro>
