Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.65
edited by Jip-jan Alunkel
on March 28, 17:34
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,7 +14,8 @@
14 14   #set($requiredCSSClass = '')
15 15   #set($addedCSSClass = '')
16 16   #set($hint = '')
17 - #if($elementDataObj.required == "yes")
21 + #if($O_elementData.required == true)
22 + #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
18 18   #set($requiredCSSClass = ' class="required"')
19 19   #end
20 20   #if($elementType == "select")
... ... @@ -29,6 +29,7 @@
29 29   #else
30 30   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
31 31   #end
37 +{{html}}
32 32   #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
33 33   <p${requiredCSSClass}>
34 34   <label for="${elementDataObj.id}_${elementTagName}">
... ... @@ -39,18 +39,16 @@
39 39   #elseif($elementTagName == "textarea")
40 40   #else
41 41   #if($elementType == "text")
42 - #createTextElement($elementDataObj $elementType $requiredAttributes)
48 + #createTextElement($elementDataObj $elementTagName $requiredAttributes)
43 43   #elseif($elementType == "number")
44 44   #elseif($elementType == "email")
45 45   #elseif($elementType == "range")
46 - #elseif($elementType == "checkbox")
47 - #elseif($elementType == "radio")
48 48   #end
49 49   #end
50 50   #if($elementDataObj.help-block != "")
51 51   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
52 52   #end
53 - #if($elementDataObj.required == "yes")
57 + #if($elementDataObj.required == true)
54 54   <span class="required-input-field" title="Required input"></span>
55 55   <span role="alert" class="form-not-valid-tip"></span>
56 56   #end
... ... @@ -66,11 +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 -##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end
72 -#macro(createSelectElement $O_elementData $O_tagName)
73 - <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
76 +#macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
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}">
74 74   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
75 75   #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"))
76 76   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
... ... @@ -84,8 +84,11 @@
84 84   #end
85 85   </select>
86 86  #end
87 -#macro(createTextElement $O_elementData $O_tagName)
88 - <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"#if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end 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>
91 +#macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
92 +###set($dataAttributes = '')
93 +##set($dataAttributes = ' data-query-type="$O_elementData.data-query-type"')
94 +##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
95 + <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>
89 89  #end
90 90  
91 91  {{/velocity}}