Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.59
edited by Jip-jan Alunkel
on March 28, 16:46
Change comment: There is no comment for this version
To version 2.55
edited by Jip-jan Alunkel
on March 28, 16:17
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,10 +1,14 @@
1 1  {{velocity}}
2 2  #macro(createFormStart $id $product)
3 +{{html}}
3 3  <form action="" id="${id}" method="post" class="formMaker" data-form-product="${product}" novalidate="novalidate">
5 +{{/html}}
4 4  #end
5 5  
6 6  #macro(createFormEnd)
9 +{{html}}
7 7  </form>
11 +{{/html}}
8 8  #end
9 9  
10 10  #macro(createFormElement $elementDataObj)
... ... @@ -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")
21 + #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
37 +{{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
73 +{{/html}}
69 69  #end
70 70  
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" data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
77 + <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('.%'))