Author: jleroux
Date: Mon Apr 6 12:11:18 2015
New Revision: 1671519
URL: http://svn.apache.org/r1671519
Log:
Fixes a bug related to renderDateTimeField reported by Adrian's aon dev ML
(when used from FTL templates)
Fixes also a bug related to renderLookupField when used from FTL templates with
lookupField macro
I also spotted a number of other misc. trivial tabindex missing in other
*FormMacroLibrary.ftl which should have not (or minor) effects on rendering. I
will fix them later today...
Modified:
ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
Modified: ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl?rev=1671519&r1=1671518&r2=1671519&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl Mon Apr 6
12:11:18 2015
@@ -19,7 +19,7 @@ under the License.
<#include "component://widget/templates/htmlFormMacroLibrary.ftl"/>
-<#macro lookupField className="" alert="" name="" value="" size="20"
maxlength="20" id="" event="" action="" readonly="" autocomplete=""
descriptionFieldName="" formName="" fieldFormName="" targetParameterIter=""
imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="layer" width="" height=""
position="topleft" fadeBackground="true" clearText="" showDescription=""
initiallyCollapsed="">
+<#macro lookupField className="" alert="" name="" value="" size="20"
maxlength="20" id="" event="" action="" readonly="" autocomplete=""
descriptionFieldName="" formName="" fieldFormName="" targetParameterIter=""
imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="layer" width="" height=""
position="topleft" fadeBackground="true" clearText="" showDescription=""
initiallyCollapsed="" tabindex="">
<#if (!ajaxEnabled?has_content)>
<#assign javascriptEnabled =
Static["org.ofbiz.base.util.UtilHttp"].isJavaScriptEnabled(request) />
<#if (javascriptEnabled)>
@@ -37,7 +37,7 @@ under the License.
<#if userPreferences.VISUAL_THEME == "BIZZNESS_TIME">
<#local position = "center" />
</#if>
- <@renderLookupField name formName fieldFormName className alert value size
maxlength id event action readonly autocomplete descriptionFieldName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground clearText showDescription initiallyCollapsed/>
+ <@renderLookupField name formName fieldFormName tabindex className alert
value size maxlength id event action readonly autocomplete descriptionFieldName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground clearText showDescription initiallyCollapsed/>
</#macro>
<#macro nextPrev commonUrl="" ajaxEnabled=false javaScriptEnabled=false
paginateStyle="nav-pager" paginateFirstStyle="nav-first" viewIndex=0
highIndex=0 listSize=0 viewSize=1 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="" >
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1671519&r1=1671518&r2=1671519&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Apr 6
12:11:18 2015
@@ -104,7 +104,7 @@ under the License.
</#if>
</#macro>
-<#macro renderDateTimeField name className alert title value size maxlength id
dateType shortDateInput timeDropdownParamName defaultDateTimeString
localizedIconTitle timeDropdown timeHourName classString hour1 hour2
timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName tabindex mask="" event="" action="" step=""
timeValues="">
+<#macro renderDateTimeField name className alert title value size maxlength id
dateType shortDateInput timeDropdownParamName defaultDateTimeString
localizedIconTitle timeDropdown timeHourName classString hour1 hour2
timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName tabindex="" mask="" event="" action="" step=""
timeValues="">
<span class="view-calendar">
<#if dateType!="time" >
<input type="text" <#if tabindex?has_content>
tabindex="${tabindex}"</#if> name="${name}_i18n" <@renderClass className alert
/><#rt/>
