Author: jacopoc
Date: Wed Dec 30 11:35:45 2009
New Revision: 894593
URL: http://svn.apache.org/viewvc?rev=894593&view=rev
Log:
Updated macro rendere libraries for xsl-fo, xml, text and csv in order to
support recent changes in rev. 894460
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=894593&r1=894592&r2=894593&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl Wed Dec 30
11:35:45 2009
@@ -24,7 +24,7 @@
</#macro>
<#macro renderHyperlinkField></#macro>
-<#macro renderTextField name className alert value textSize maxlength id event
action clientAutocomplete ajaxUrl ajaxEnabled><@renderField value /></#macro>
+<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled><@renderField value
/></#macro>
<#macro renderTextareaField name className alert cols rows id readonly value
visualEdtiorEnalble buttons><@renderField value /></#macro>
@@ -47,7 +47,7 @@
<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl></#macro>
<#macro renderResetField className alert name title></#macro>
-<#macro renderHiddenField name value></#macro>
+<#macro renderHiddenField name value id event action></#macro>
<#macro renderIgnoredField></#macro>
<#macro renderFieldTitle style title><@renderField title />, </#macro>
@@ -103,7 +103,7 @@
<@renderField value />
</#macro>
-<#macro renderLookupField className alert name value size maxlength id
autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled><@renderField value /></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength
autocomplete><@renderField value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id
autocomplete></#macro>
Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=894593&r1=894592&r2=894593&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Wed Dec 30
11:35:45 2009
@@ -46,7 +46,7 @@
</#macro>
<#macro renderHyperlinkField></#macro>
-<#macro renderTextField name className alert value textSize maxlength id event
action clientAutocomplete ajaxUrl ajaxEnabled><@makeBlock className value
/></#macro>
+<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled><@makeBlock className
value /></#macro>
<#macro renderTextareaField name className alert cols rows id readonly value
visualEdtiorEnalble buttons><@makeBlock className value /></#macro>
@@ -68,7 +68,7 @@
<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl><@makeBlock "" "" /></#macro>
<#macro renderResetField className alert name title><@makeBlock "" ""
/></#macro>
-<#macro renderHiddenField name value></#macro>
+<#macro renderHiddenField name value id event action></#macro>
<#macro renderIgnoredField></#macro>
<#macro renderFieldTitle style title>${title?default("")}</#macro>
@@ -122,7 +122,7 @@
<@makeBlock className value />
</#macro>
-<#macro renderLookupField className alert name value size maxlength id
autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled><@makeBlock className value
/></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength
autocomplete><@makeBlock className value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id
autocomplete><@makeBlock className "" /></#macro>
Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=894593&r1=894592&r2=894593&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Wed Dec 30
11:35:45 2009
@@ -24,7 +24,7 @@
</#macro>
<#macro renderHyperlinkField></#macro>
-<#macro renderTextField name className alert value textSize maxlength id event
action clientAutocomplete ajaxUrl ajaxEnabled><@renderField value /></#macro>
+<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled><@renderField value
/></#macro>
<#macro renderTextareaField name className alert cols rows id readonly value
visualEdtiorEnalble buttons><@renderField value /></#macro>
@@ -47,7 +47,7 @@
<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl></#macro>
<#macro renderResetField className alert name title></#macro>
-<#macro renderHiddenField name value></#macro>
+<#macro renderHiddenField name value id event action></#macro>
<#macro renderIgnoredField></#macro>
<#macro renderFieldTitle style title><@renderField title /></#macro>
@@ -103,8 +103,7 @@
<@renderField value />
</#macro>
-<#macro renderLookupField className alert name value size maxlength
autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc><@renderField value /></#macro>
-<#macro renderLookupField className alert name value size maxlength id
autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled><@renderField value /></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled><@renderField value /></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength
autocomplete><@renderField value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id
autocomplete></#macro>
Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=894593&r1=894592&r2=894593&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Wed Dec 30
11:35:45 2009
@@ -45,7 +45,7 @@
</#macro>
<#macro renderHyperlinkField></#macro>
-<#macro renderTextField name className alert value textSize maxlength id event
action clientAutocomplete ajaxUrl ajaxEnabled><@renderField value/></#macro>
+<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled><@renderField
value/></#macro>
<#macro renderTextareaField name className alert cols rows id readonly value
visualEdtiorEnalble buttons><@renderField value/></#macro>
@@ -60,7 +60,7 @@
<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl></#macro>
<#macro renderResetField className alert name title></#macro>
-<#macro renderHiddenField name value></#macro>
+<#macro renderHiddenField name value id event action></#macro>
<#macro renderIgnoredField></#macro>
<#macro renderFieldTitle style title></#macro>
@@ -101,7 +101,7 @@
<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
</#macro>
-<#macro renderLookupField className alert name value size maxlength id
autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength
autocomplete></#macro>
<#macro renderPasswordField className alert name value size maxlength id
autocomplete></#macro>
