Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.36
edited by Jip-jan Alunkel
on March 28, 15:18
Change comment: There is no comment for this version
To version 2.32
edited by Jip-jan Alunkel
on March 26, 00:12
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,7 +1,7 @@
1 1  {{velocity}}
2 2  #macro(createFormElement $elementDataObj)
3 3   #set($elementType = $elementDataObj.type)
4 - #set($elementTagName = '')
4 + #set($elementTagName = "")
5 5   #set($requiredAttributes = 'aria-required="false"')
6 6   #set($requiredCSSClass = '')
7 7   #set($addedCSSClass = '')
... ... @@ -33,7 +33,7 @@
33 33   #elseif($elementTagName == "textarea")
34 34   #else
35 35   #if($elementType == "text")
36 - #createTextElement($elementDataObj $elementTagName $requiredAttributes)
36 + #createTextElement($elementDataObj $elementTagName)
37 37   #elseif($elementType == "number")
38 38   #elseif($elementType == "email")
39 39   #elseif($elementType == "range")
... ... @@ -77,22 +77,18 @@
77 77   </select>
78 78  #end
79 79  #macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
80 -$O_elementData
81 81  #set($dataAttributes = '')
82 -#if($O_elementData.data-query-type) #set($dataAttributes = ' data-query-type="${O_elementData.data-query-type}"')#end
83 -#if($O_elementData.data-query-list-type) #set($dataAttributes = $dataAttributes' data-query-list-type="${O_elementData.data-query-list-type}"')#end
84 -#if($O_elementData.data-query-list-contents) #set($dataAttributes = $dataAttributes' data-query-list-contents="${O_elementData.data-query-list-contents}"')#end
85 -#if($O_elementData.data-create-page) #set($dataAttributes = $dataAttributes' data-create-page="${O_elementData.data-create-page}"')#end
86 -#if($O_elementData.data-query-scope) #set($dataAttributes = $dataAttributes' data-query-scope="${O_elementData.data-query-scope}"')#end
87 -#if($O_elementData.data-create-xobj) #set($dataAttributes = $dataAttributes' data-create-xobj="${O_elementData.data-create-xobj}"')#end
88 -#if($O_elementData.data-xobj-classname) #set($dataAttributes = $dataAttributes' data-xobj-classname="${O_elementData.data-xobj-classname}"')#end
89 -#if($O_elementData.data-xobj-fieldname) #set($dataAttributes = $dataAttributes' data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end
90 -#if($O_elementData.data-query-list-editable) #set($dataAttributes = $dataAttributes' data-query-list-editable="${O_elementData.data-query-list-editable}"')#end
81 +#if($O_elementData.data-query-type) #set($dataAttributes = '${dataAttributes} data-query-type="${O_elementData.data-query-type}"')#end
82 +#if($O_elementData.data-query-list-type) #set($dataAttributes = '${dataAttributes} data-query-list-type="${O_elementData.data-query-list-type}"')#end
83 +#if($O_elementData.data-query-list-contents) #set($dataAttributes = '${dataAttributes} data-query-list-contents="${O_elementData.data-query-list-contents}"')#end
84 +#if($O_elementData.data-create-page) #set($dataAttributes = '${dataAttributes} data-create-page="${O_elementData.data-create-page}"')#end
85 +#if($O_elementData.data-query-scope) #set($dataAttributes = '${dataAttributes} data-query-scope="${O_elementData.data-query-scope}"')#end
86 +#if($O_elementData.data-create-xobj) #set($dataAttributes = '${dataAttributes} data-create-xobj="${O_elementData.data-create-xobj}"')#end
87 +#if($O_elementData.data-xobj-classname) #set($dataAttributes = '${dataAttributes} data-xobj-classname="${O_elementData.data-xobj-classname}"')#end
88 +#if($O_elementData.data-xobj-fieldname) #set($dataAttributes = '${dataAttributes} data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end
89 +#if($O_elementData.data-query-list-editable) #set($dataAttributes = '${dataAttributes} data-query-list-editable="${O_elementData.data-query-list-editable}"')#end
91 91   <input type="text" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" placeholder="$services.localization.render(${O_elementData.placeholder})" aria-describedby="${O_elementData.id}_helpBlock"${O_requiredAttributes} aria-label="${O_elementData.aria-label}"${dataAttributes}>
92 92  #end
93 93  
94 -id
95 -
96 -
97 97  {{/velocity}}
98 98