Author: buscob
Date: Sun Mar 7 21:15:36 2010
New Revision: 920116
URL: http://svn.apache.org/viewvc?rev=920116&view=rev
Log:
Added parameter default values to renderLookupField and renderNextPrev macros.
This allows to call the macro in the FTL files without specifying all the
parameters.
Part of OFBIZ-3541
Modified:
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=920116&r1=920115&r2=920116&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Mar 7
21:15:36 2010
@@ -431,7 +431,7 @@
</#if>
</#macro>
-<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth
lookupHeight lookupPosition fadeBackground>
+<#macro renderLookupField className="" alert="" name="" value="" size="20"
maxlength="20" id="" event="" action="" disabled="" autocomplete=""
descriptionFieldName="" formName="" lookupFieldFormName=""
targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled=""
lookupPresentation="" lookupWidth="20" lookupHeight="20" lookupPosition="20"
fadeBackground="">
<div class="field-lookup"><ul>
<#if size?has_content && size="0"><li><input type="hidden" <#if
name?has_content> name="${name}"/></#if></li><#else><li><input type="text"
<@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if
value?has_content> value="${value}"</#if><#if size?has_content>
size="${size}"</#if><#if maxlength?has_content>
maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if
disabled?has_content && disabled> disabled="disabled"</#if><#rt/><#if
event?has_content && action?has_content> ${event}="${action}"</#if><#rt/><#if
autocomplete?has_content> autocomplete="off"</#if>/><#rt/></li></#if>
<li><#if lookupPresentation?has_content && descriptionFieldName?has_content &&
lookupPresentation == "layer">
@@ -443,7 +443,7 @@
<#else>
<a
href="javascript:call_fieldlookup2(document.${formName}.${name},'${lookupFieldFormName}'<#rt/>
</#if>
-<#if targetParameterIter?exists>
+<#if targetParameterIter?has_content>
<#list targetParameterIter as item>
,document.${formName}.${item}.value<#rt>
</#list>
@@ -457,7 +457,7 @@
</#if>
</#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 renderNextPrev paginateStyle="nav-pager"
paginateFirstStyle="nav-first" viewIndex=0 highIndex=0 listSize=0 viewSize=1
ajaxEnabled=false javaScriptEnabled=true ajaxFirstUrl="" firstUrl=""
paginateFirstLabel="" paginatePreviousStyle="nav-previous" ajaxPreviousUrl=""
previousUrl="" paginatePreviousLabel="" pageLabel="" ajaxSelectUrl=""
selectUrl="" ajaxSelectSizeUrl="" selectSizeUrl="" commonDisplaying=""
paginateNextStyle="nav-next" ajaxNextUrl="" nextUrl="" paginateNextLabel=""
paginateLastStyle="nav-last" ajaxLastUrl="" lastUrl="" paginateLastLabel=""
paginateViewSizeLabel="">
<#if listSize gt viewSize>
<div class="${paginateStyle}"> <ul>
<li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if
ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
