Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.57
edited by Jip-jan Alunkel
on March 28, 16:37
Change comment: There is no comment for this version
To version 2.51
edited by Jip-jan Alunkel
on March 28, 16:00
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,12 +1,4 @@
1 1  {{velocity}}
2 -#macro(createFormStart $id $product)
3 -<form action="" id="${id}" method="post" class="formMaker" data-form-product="${product}" novalidate="novalidate">
4 -#end
5 -
6 -#macro(createFormEnd)
7 -</form>
8 -#end
9 -
10 10  #macro(createFormElement $elementDataObj)
11 11   #set($elementType = $elementDataObj.type)
12 12   #set($elementTagName = '')
... ... @@ -14,7 +14,7 @@
14 14   #set($requiredCSSClass = '')
15 15   #set($addedCSSClass = '')
16 16   #set($hint = '')
17 - #if($O_elementData.required === true)
9 + #if($O_elementData.required == true)
18 18   #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
19 19   #set($requiredCSSClass = ' class="required"')
20 20   #end
... ... @@ -30,6 +30,7 @@
30 30   #else
31 31   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
32 32   #end
25 +{{html}}
33 33   #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
34 34   <p${requiredCSSClass}>
35 35   <label for="${elementDataObj.id}_${elementTagName}">
... ... @@ -65,6 +65,7 @@
65 65   #if($hint != "")
66 66   <p class="box errormessage">${hint}</p>
67 67   #end
61 +{{/html}}
68 68  #end
69 69  
70 70  #macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
... ... @@ -85,6 +85,7 @@
85 85  #macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
86 86  ###set($dataAttributes = '')
87 87  ##set($dataAttributes = ' data-query-type="$O_elementData.data-query-type"')
82 +#$dataAttributes
88 88  ##if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}"#end#if($O_elementData.data-query-list-type) data-query-list-type="${O_elementData.data-query-list-type}"')#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"')#end#if($O_elementData.data-create-page) data-create-page="${O_elementData.data-create-page}"')#end#if($O_elementData.data-query-scope) data-query-scope="${O_elementData.data-query-scope}"')#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"')#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"')#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"')#end
89 89   <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}"#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}"#end#if($O_elementData.data-query-list-type) data-query-list-type="${O_elementData.data-query-list-type}"')#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"')#end#if($O_elementData.data-create-page) data-create-page="${O_elementData.data-create-page}"')#end#if($O_elementData.data-query-scope) data-query-scope="${O_elementData.data-query-scope}"')#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"')#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"')#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"')#end>
90 90  #end