Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09

From version 2.21
edited by Jip-jan Alunkel
on March 24, 15:51
Change comment: There is no comment for this version
To version 2.22
edited by Jip-jan Alunkel
on March 24, 15:52
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,5 +1,4 @@
1 1  {{velocity}}
2 -{{html}}
3 3  #set($localitySelectElement = {
4 4   "id" : "locality",
5 5   "type" : "select",
... ... @@ -14,6 +14,7 @@
14 14  })
15 15  
16 16  #macro(createSelectElement $elementDataObj)
16 +{{html}}
17 17   #set($requiredAttributes = 'aria-required="false"')
18 18   #if($elementDataObj.required == true)
19 19   #set($requiredAttributes = 'aria-required="true" required="required"')
... ... @@ -24,7 +24,6 @@
24 24   <span class="input-wrap select-wrap">
25 25   <select class="form-select form-control" aria-label="${elementDataObj.aria-label}" aria-describedby="${elementDataObj.id}_helpBlock" $requiredAttributes data-error-response-type="${elementDataObj.data-error-response-type}" data-set-space="${elementDataObj.data-set-space}" name="${elementDataObj.id}_select" id="${elementDataObj.id}_select">
26 26   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option>
27 -## #set ($spaceRef = $elementDataObj.space-reference)
28 28   #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"))
29 29   #set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
30 30   #set ($spaceExcludeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -46,9 +46,9 @@
46 46   #if($elementDataObj.required == true)
47 47   </p>
48 48   #end
48 +{{/html}}
49 49  #end
50 50  
51 51  #createSelectElement($localitySelectElement)
52 -{{/html}}
53 53  {{/velocity}}
54 54