Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -1,14 +1,10 @@
1 1  {{velocity}}
2 2  #macro(createFormStart $id $product)
3 -{{html}}
4 4  <form action="" id="${id}" method="post" class="formMaker" data-form-product="${product}" novalidate="novalidate">
5 -{{/html}}
6 6  #end
7 7  
8 8  #macro(createFormEnd)
9 -{{html}}
10 10  </form>
11 -{{/html}}
12 12  #end
13 13  
14 14  #macro(createFormElement $elementDataObj)
... ... @@ -18,8 +18,7 @@
18 18   #set($requiredCSSClass = '')
19 19   #set($addedCSSClass = '')
20 20   #set($hint = '')
21 - #if($O_elementData.required == true)
22 - #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
17 + #if($elementDataObj.required == "yes")
23 23   #set($requiredCSSClass = ' class="required"')
24 24   #end
25 25   #if($elementType == "select")
... ... @@ -34,7 +34,6 @@
34 34   #else
35 35   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
36 36   #end
37 -{{html}}
38 38   #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
39 39   <p${requiredCSSClass}>
40 40   <label for="${elementDataObj.id}_${elementTagName}">
... ... @@ -45,16 +45,18 @@
45 45   #elseif($elementTagName == "textarea")
46 46   #else
47 47   #if($elementType == "text")
48 - #createTextElement($elementDataObj $elementTagName $requiredAttributes)
42 + #createTextElement($elementDataObj $elementType $requiredAttributes)
49 49   #elseif($elementType == "number")
50 50   #elseif($elementType == "email")
51 51   #elseif($elementType == "range")
46 + #elseif($elementType == "checkbox")
47 + #elseif($elementType == "radio")
52 52   #end
53 53   #end
54 54   #if($elementDataObj.help-block != "")
55 55   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
56 56   #end
57 - #if($elementDataObj.required == true)
53 + #if($elementDataObj.required == "yes")
58 58   <span class="required-input-field" title="Required input"></span>
59 59   <span role="alert" class="form-not-valid-tip"></span>
60 60   #end
... ... @@ -70,11 +70,11 @@
70 70   #if($hint != "")
71 71   <p class="box errormessage">${hint}</p>
72 72   #end
73 -{{/html}}
74 74  #end
75 75  
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}">
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}">
78 78   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
79 79   #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"))
80 80   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
... ... @@ -88,11 +88,8 @@
88 88   #end
89 89   </select>
90 90  #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>
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>
96 96  #end
97 97  
98 98  {{/velocity}}