Author: jleroux
Date: Tue Apr 7 08:20:39 2015
New Revision: 1671756
URL: http://svn.apache.org/r1671756
Log:
Completes r1671519 for https://issues.apache.org/jira/browse/OFBIZ-6232 "Adds
HTML tabindex into widget form fields"
Modified:
ofbiz/trunk/framework/widget/dtd/widget-form.xsd
ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
Modified: ofbiz/trunk/framework/widget/dtd/widget-form.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-form.xsd?rev=1671756&r1=1671755&r2=1671756&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-form.xsd Tue Apr 7 08:20:39 2015
@@ -916,7 +916,7 @@ under the License.
<xs:annotation>
<xs:documentation>
The name of the parent form, needed at least for
lookups when using skip-start="true"
- Must be set also on the related field if
description-field-name is used
+ Must be set also on the related field if
description-field-name is used.
</xs:documentation>
</xs:annotation>
</xs:attribute>
Modified: ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl?rev=1671756&r1=1671755&r2=1671756&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl Tue Apr 7
08:20:39 2015
@@ -28,9 +28,9 @@ under the License.
<#macro renderTextareaField name className alert cols rows id readonly value
visualEditorEnable language buttons><@renderField value /></#macro>
-<#macro renderDateTimeField name className alert title value size maxlength
step timeValues id dateType shortDateInput timeDropdownParamName
defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString
hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName mask><@renderField value /></#macro>
+<#macro renderDateTimeField name className alert title value size maxlength
step timeValues id dateType shortDateInput timeDropdownParamName
defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString
hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName tabindex mask><@renderField value /></#macro>
-<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars
choices autoSelect partialSearch partialChars ignoreCase fullSearch>
+<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars
choices autoSelect partialSearch partialChars ignoreCase fullSearch tabindex>
<#if currentValue?has_content && firstInList?has_content>
<@renderField explicitDescription />
<#else>
@@ -41,10 +41,10 @@ under the License.
</#macro>
<#macro renderTooltip tooltip tooltipStyle></#macro>
-<#macro renderCheckField items className alert id allChecked currentValue name
event action></#macro>
-<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event ation></#macro>
+<#macro renderCheckField items className alert id allChecked currentValue name
event action tabindex></#macro>
+<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action tabindex></#macro>
-<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl></#macro>
+<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl tabindex></#macro>
<#macro renderResetField className alert name title></#macro>
<#macro renderHiddenField name value id event action></#macro>
@@ -95,18 +95,18 @@ under the License.
<#macro renderFormatEmptySpace> </#macro>
-<#macro renderTextFindField name value defaultOption opEquals opBeginsWith
opContains opIsEmpty opNotEqual className alert size maxlength autocomplete
titleStyle hideIgnoreCase ignCase ignoreCase><@renderField value /></#macro>
+<#macro renderTextFindField name value defaultOption opEquals opBeginsWith
opContains opIsEmpty opNotEqual className alert size maxlength autocomplete
titleStyle hideIgnoreCase ignCase ignoreCase tabindex><@renderField value
/></#macro>
-<#macro renderDateFindField className alert name localizedInputTitle value
size maxlength dateType formName defaultDateTimeString imgSrc
localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals
opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan
opUpToDay opUpThruDay opIsEmpty><@renderField value /></#macro>
+<#macro renderDateFindField className alert name localizedInputTitle value
size maxlength dateType formName defaultDateTimeString imgSrc
localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals
opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan
opUpToDay opUpThruDay opIsEmpty tabindex><@renderField value /></#macro>
-<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
+<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru
tabindex>
<@renderField value />
</#macro>
-<#macro renderLookupField className alert name value size maxlength id event
action readonly autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground clearText showDescription initiallyCollapsed></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action readonly autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground clearText showDescription initiallyCollapsed
tabindex></#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>
+<#macro renderFileField className alert name value size maxlength autocomplete
tabindex><@renderField value /></#macro>
+<#macro renderPasswordField className alert name value size maxlength id
autocomplete tabindex></#macro>
<#macro renderImageField value description alternate border width height event
action></#macro>
<#macro renderBanner style leftStyle rightStyle leftText text
rightText></#macro>
<#macro renderFieldGroupOpen style id title collapsed collapsibleAreaId
collapsible expandToolTip collapseToolTip></#macro>
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1671756&r1=1671755&r2=1671756&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Tue Apr 7
08:20:39 2015
@@ -771,8 +771,8 @@ Parameter: lastViewName, String, optiona
<#macro renderFileField className alert name value size maxlength autocomplete
tabindex>
<input type="file" <@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 autocomplete?has_content>
autocomplete="off"</#if>/><#if tabindex?has_content>
tabindex="${tabindex}"</#if><#rt/>
</#macro>
-<#macro renderPasswordField className alert name value size maxlength id
autocomplete>
- <input type="password" <@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><#if autocomplete?has_content> autocomplete="off"</#if>/>
+<#macro renderPasswordField className alert name value size maxlength id
autocomplete tabindex>
+ <input type="password" <@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><#if autocomplete?has_content> autocomplete="off"</#if><#if
tabindex?has_content> tabindex="${tabindex}"</#if><#rt/>/>
</#macro>
<#macro renderImageField value description alternate style event
action><img<#if value?has_content> src="${value}"</#if><#if
description?has_content> title="${description}"</#if> alt="<#if
alternate?has_content>${alternate}"</#if><#if style?has_content>
class="${style}"</#if><#if event?has_content> ${event?html}="${action}"
</#if>/></#macro>
Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=1671756&r1=1671755&r2=1671756&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Tue Apr 7
08:20:39 2015
@@ -26,11 +26,11 @@ under the License.
<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask placeholder
tabindex><@renderField value /></#macro>
-<#macro renderTextareaField name className alert cols rows id readonly value
visualEditorEnable language buttons><@renderField value /></#macro>
+<#macro renderTextareaField name className alert cols rows id readonly value
visualEditorEnable language buttons tabindex><@renderField value /></#macro>
-<#macro renderDateTimeField name className alert title value size maxlength id
event action dateType shortDateInput timeDropdownParamName
defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString
hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName><@renderField value /></#macro>
+<#macro renderDateTimeField name className alert title value size maxlength id
event action dateType shortDateInput timeDropdownParamName
defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString
hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName tabindex><@renderField value /></#macro>
-<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars
choices autoSelect partialSearch partialChars ignoreCase fullSearch>
+<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars
choices autoSelect partialSearch partialChars ignoreCase fullSearch tabindex>
<#if currentValue?has_content && firstInList?has_content>
<@renderField explicitDescription />
<#else>
@@ -41,10 +41,10 @@ under the License.
</#macro>
<#macro renderTooltip tooltip tooltipStyle></#macro>
-<#macro renderCheckField items className alert id allChecked currentValue name
event action></#macro>
-<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event ation></#macro>
+<#macro renderCheckField items className alert id allChecked currentValue name
event action tabindex></#macro>
+<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event ation tabindex></#macro>
-<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl></#macro>
+<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl tabindex></#macro>
<#macro renderResetField className alert name title></#macro>
<#macro renderHiddenField name value id event action></#macro>
@@ -95,18 +95,18 @@ under the License.
<#macro renderFormatEmptySpace> </#macro>
-<#macro renderTextFindField name value defaultOption opEquals opBeginsWith
opContains opIsEmpty opNotEqual className alert size maxlength autocomplete
titleStyle hideIgnoreCase ignCase ignoreCase><@renderField value /></#macro>
+<#macro renderTextFindField name value defaultOption opEquals opBeginsWith
opContains opIsEmpty opNotEqual className alert size maxlength autocomplete
titleStyle hideIgnoreCase ignCase ignoreCase tabindex><@renderField value
/></#macro>
-<#macro renderDateFindField className alert name localizedInputTitle value
size maxlength dateType formName defaultDateTimeString imgSrc
localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals
opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan
opUpToDay opUpThruDay opIsEmpty><@renderField value /></#macro>
+<#macro renderDateFindField className alert name localizedInputTitle value
size maxlength dateType formName defaultDateTimeString imgSrc
localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals
opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan
opUpToDay opUpThruDay opIsEmpty tabindex><@renderField value /></#macro>
-<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
+<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru
tabindex>
<@renderField value />
</#macro>
-<#macro renderLookupField className alert name value size maxlength id event
action readonly autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground clearText showDescription
initiallyCollapsed><@renderField value /></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action readonly autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground clearText showDescription initiallyCollapsed
tabindex><@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>
+<#macro renderFileField className alert name value size maxlength autocomplete
tabindex><@renderField value /></#macro>
+<#macro renderPasswordField className alert name value size maxlength id
autocomplete tabindex></#macro>
<#macro renderImageFiel value border width height event action></#macro>
<#macro renderBanner style leftStyle rightStyle leftText text
rightText></#macro>
<#macro renderFieldGroupOpen style id title collapsed collapsibleAreaId
collapsible expandToolTip collapseToolTip></#macro>
Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=1671756&r1=1671755&r2=1671756&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Tue Apr 7
08:20:39 2015
@@ -42,17 +42,17 @@ under the License.
<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask placeholder
tabindex><@renderField value/></#macro>
-<#macro renderTextareaField name className alert cols rows id readonly value
visualEditorEnable buttons language=""><@renderField value/></#macro>
+<#macro renderTextareaField name className alert cols rows id readonly value
visualEditorEnable buttons tabindex language=""><@renderField value/></#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 mask="" event="" action="" step=""
timeValues=""><@renderField value/></#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=""><@renderField value/></#macro>
-<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars
choices autoSelect partialSearch partialChars ignoreCase fullSearch>
+<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars
choices autoSelect partialSearch partialChars ignoreCase fullSearch tabindex>
</#macro>
-<#macro renderCheckField items className alert id allChecked currentValue name
event action></#macro>
-<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action></#macro>
+<#macro renderCheckField items className alert id allChecked currentValue name
event action tabindex></#macro>
+<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action tabindex></#macro>
-<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl></#macro>
+<#macro renderSubmitField buttonType className alert formName title name event
action imgSrc confirmation containerId ajaxUrl tabindex></#macro>
<#macro renderResetField className alert name title></#macro>
<#macro renderHiddenField name value id event action></#macro>
@@ -89,17 +89,17 @@ under the License.
<#macro renderFormatEmptySpace> </#macro>
-<#macro renderTextFindField name value defaultOption opEquals opBeginsWith
opContains opIsEmpty opNotEqual className alert size maxlength autocomplete
titleStyle hideIgnoreCase ignCase ignoreCase><@renderField value/></#macro>
+<#macro renderTextFindField name value defaultOption opEquals opBeginsWith
opContains opIsEmpty opNotEqual className alert size maxlength autocomplete
titleStyle hideIgnoreCase ignCase ignoreCase tabindex><@renderField
value/></#macro>
-<#macro renderDateFindField className alert name localizedInputTitle value
size maxlength dateType formName defaultDateTimeString imgSrc
localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals
opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan
opUpToDay opUpThruDay opIsEmpty></#macro>
+<#macro renderDateFindField className alert name localizedInputTitle value
size maxlength dateType formName defaultDateTimeString imgSrc
localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals
opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan
opUpToDay opUpThruDay opIsEmpty tabindex></#macro>
-<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
+<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru
tabindex>
</#macro>
-<#macro renderLookupField name formName fieldFormName className=""
alert="false" value="" size="" maxlength="" id="" event="" action=""
readonly=false autocomplete="" descriptionFieldName="" targetParameterIter=""
imgSrc="" ajaxUrl="" ajaxEnabled=javaScriptEnabled presentation="layer"
width="" height="" position="" fadeBackground="true" clearText=""
showDescription="" initiallyCollapsed="" lastViewName="main" ></#macro>
+<#macro renderLookupField name formName fieldFormName className=""
alert="false" value="" size="" maxlength="" id="" event="" action=""
readonly=false autocomplete="" descriptionFieldName="" targetParameterIter=""
imgSrc="" ajaxUrl="" ajaxEnabled=javaScriptEnabled tabindex
presentation="layer" width="" height="" position="" fadeBackground="true"
clearText="" showDescription="" initiallyCollapsed="" lastViewName="main"
></#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>
+<#macro renderFileField className alert name value size maxlength autocomplete
tabindex></#macro>
+<#macro renderPasswordField className alert name value size maxlength id
autocomplete tabindex></#macro>
<#macro renderImageField value description alternate border width height event
action></#macro>
<#macro renderBanner style leftStyle rightStyle leftText text
rightText></#macro>
<#macro renderFieldGroupOpen style id title collapsed collapsibleAreaId
collapsible expandToolTip collapseToolTip></#macro>
