Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -1,11 +1,10 @@
1 1  {{velocity}}
2 2  #macro(createFormElement $elementDataObj)
3 3   #set($elementType = $elementDataObj.type)
4 - #set($elementTagName = '')
4 + #set($elementGroupName = "")
5 5   #set($requiredAttributes = 'aria-required="false"')
6 6   #set($requiredCSSClass = '')
7 7   #set($addedCSSClass = '')
8 - #set($hint = '')
9 9   #if($O_elementData.required == true)
10 10   #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
11 11   #set($requiredCSSClass = ' class="required"')
... ... @@ -12,28 +12,28 @@
12 12   #end
13 13   #if($elementType == "select")
14 14   #set($addedCSSClass = " select-wrap")
15 - #set($elementTagName = "select")
14 + #set($elementGroupName = "select")
16 16   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
17 - #set($elementTagName = "input")
16 + #set($elementGroupName = "input")
18 18   #elseif($elementType == "checkbox" || $elementType == "radio")
19 - #set($elementTagName = "checkradio")
18 + #set($elementGroupName = "checkradio")
20 20   #elseif($elementType == "textarea")
21 - #set($elementTagName = "textarea")
20 + #set($elementGroupName = "textarea")
22 22   #else
23 23   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
24 24   #end
25 25  {{html}}
26 - #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
25 + #if($elementGroupName == "select" || $elementGroupName == "input" || $elementGroupName == "textarea")
27 27   <p${requiredCSSClass}>
28 - <label for="${elementDataObj.id}_${elementTagName}">
27 + <label for="${elementDataObj.id}_${elementGroupName}">
29 29   $elementDataObj.label
30 30   <span class="input-wrap${addedCSSClass}">
31 - #if($elementTagName == "select")
32 - #createSelectElement($elementDataObj $elementTagName $requiredAttributes)
33 - #elseif($elementTagName == "textarea")
30 + #if($elementGroupName == "select")
31 + #createSelectElement($elementDataObj $elementGroupName $requiredAttributes)
32 + #elseif($elementGroupName == "textarea")
34 34   #else
35 35   #if($elementType == "text")
36 - #createTextElement($elementDataObj $elementTagName $requiredAttributes)
35 + #createTextElement($elementDataObj $elementGroupName)
37 37   #elseif($elementType == "number")
38 38   #elseif($elementType == "email")
39 39   #elseif($elementType == "range")
... ... @@ -50,7 +50,7 @@
50 50   </label>
51 51   </p>
52 52   #end
53 - #if($elementTagName == "checkradio")
52 + #if($elementGroupName == "checkradio")
54 54   #if($elementType == "checkbox")
55 55   #elseif($elementType == "radio")
56 56   #end
... ... @@ -61,8 +61,8 @@
61 61  {{/html}}
62 62  #end
63 63  
64 -#macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
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}">
63 +#macro(createSelectElement $O_elementData $O_groupName $O_requiredAttributes)
64 + <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}_${groupName}" id="${O_elementData.id}_${groupName}">
66 66   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
67 67   #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"))
68 68   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
... ... @@ -76,9 +76,9 @@
76 76   #end
77 77   </select>
78 78  #end
79 -#macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
78 +#macro(createTextElement $O_elementData $O_groupName $O_requiredAttributes)
80 80  #set($dataAttributes = '')
81 -#if($O_elementData.data-query-type) #set($dataAttributes = ' data-query-type="${O_elementData.data-query-type}"')#end
80 +#if($O_elementData.data-query-type) #set($dataAttributes = '${dataAttributes} data-query-type="${O_elementData.data-query-type}"')#end
82 82  #if($O_elementData.data-query-list-type) #set($dataAttributes = '${dataAttributes} data-query-list-type="${O_elementData.data-query-list-type}"')#end
83 83  #if($O_elementData.data-query-list-contents) #set($dataAttributes = '${dataAttributes} data-query-list-contents="${O_elementData.data-query-list-contents}"')#end
84 84  #if($O_elementData.data-create-page) #set($dataAttributes = '${dataAttributes} data-create-page="${O_elementData.data-create-page}"')#end
... ... @@ -87,11 +87,10 @@
87 87  #if($O_elementData.data-xobj-classname) #set($dataAttributes = '${dataAttributes} data-xobj-classname="${O_elementData.data-xobj-classname}"')#end
88 88  #if($O_elementData.data-xobj-fieldname) #set($dataAttributes = '${dataAttributes} data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end
89 89  #if($O_elementData.data-query-list-editable) #set($dataAttributes = '${dataAttributes} 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}"${dataAttributes}>
89 +{{html}}
90 + <input type="text" class="form-control full" name="${O_elementData.id}_${O_groupName}" id="${O_elementData.id}_${O_groupName}" 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 +{{/html}}
91 91  #end
92 92  
93 -id
94 -
95 -
96 96  {{/velocity}}
97 97