Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.60
edited by Jip-jan Alunkel
on March 28, 16:48
Change comment: There is no comment for this version
To version 2.49
edited by Jip-jan Alunkel
on March 28, 15:43
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,8 +14,7 @@
14 14   #set($requiredCSSClass = '')
15 15   #set($addedCSSClass = '')
16 16   #set($hint = '')
17 -##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#end
18 - #if($elementDataObj.required == "yes")
9 + #if($O_elementData.required == true)
19 19   #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
20 20   #set($requiredCSSClass = ' class="required"')
21 21   #end
... ... @@ -31,6 +31,7 @@
31 31   #else
32 32   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
33 33   #end
25 +{{html}}
34 34   #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
35 35   <p${requiredCSSClass}>
36 36   <label for="${elementDataObj.id}_${elementTagName}">
... ... @@ -66,10 +66,11 @@
66 66   #if($hint != "")
67 67   <p class="box errormessage">${hint}</p>
68 68   #end
61 +{{/html}}
69 69  #end
70 -##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#end
63 +
71 71  #macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
72 - <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock"$O_requiredAttributes data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
65 + <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock" ${O_requiredAttributes}data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
73 73   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
74 74   #set($query = $services.query.xwql("from doc.object(AppWithinMinutes.MetadataClass) met where doc.space like :space and doc.space <> :spaceExclude order by met.dataSpaceName asc"))
75 75   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
... ... @@ -84,10 +84,19 @@
84 84   </select>
85 85  #end
86 86  #macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
87 -###set($dataAttributes = '')
88 -##set($dataAttributes = ' data-query-type="$O_elementData.data-query-type"')
89 -##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 - <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>
80 +#set($dataAttributes = '')
81 +#set($dataAttributes = ' data-query-type="$O_elementData.data-query-type"')
82 +$dataAttributes
83 +#if($O_elementData.data-query-type) #set($dataAttributes = ' data-query-type="${O_elementData.data-query-type}"')#end
84 +#if($O_elementData.data-query-list-type) #set($dataAttributes = '${dataAttributes} data-query-list-type="${O_elementData.data-query-list-type}"')#end
85 +#if($O_elementData.data-query-list-contents) #set($dataAttributes = '${dataAttributes} data-query-list-contents="${O_elementData.data-query-list-contents}"')#end
86 +#if($O_elementData.data-create-page) #set($dataAttributes = '${dataAttributes} data-create-page="${O_elementData.data-create-page}"')#end
87 +#if($O_elementData.data-query-scope) #set($dataAttributes = '${dataAttributes} data-query-scope="${O_elementData.data-query-scope}"')#end
88 +#if($O_elementData.data-create-xobj) #set($dataAttributes = '${dataAttributes} data-create-xobj="${O_elementData.data-create-xobj}"')#end
89 +#if($O_elementData.data-xobj-classname) #set($dataAttributes = '${dataAttributes} data-xobj-classname="${O_elementData.data-xobj-classname}"')#end
90 +#if($O_elementData.data-xobj-fieldname) #set($dataAttributes = '${dataAttributes} data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end
91 +#if($O_elementData.data-query-list-editable) #set($dataAttributes = '${dataAttributes} data-query-list-editable="${O_elementData.data-query-list-editable}"')#end
92 + <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}>
91 91  #end
92 92  
93 93  {{/velocity}}