Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 3.2
edited by Jip-jan Alunkel
on March 12, 21:49
Change comment: Update document after refactoring.
To version 2.423
edited by Jip-jan Alunkel
on March 11, 23:27
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -39,47 +39,6 @@
39 39   #end
40 40  #end
41 41  #macro(createFormElement $elementDataObj)
42 -## afwijkende attributen
43 -## "help-block": '',
44 -## "data-decimals": ''
45 - #set($attrMap = {
46 - "aria-label": '',
47 - "date-min": '',
48 - "date-max": '',
49 - "decimal-step": '',
50 - "disabled": '',
51 - "placeholder": '',
52 - "textarea-rows": '',
53 - "value": '',
54 - "data-error-response-type": '',
55 - "data-opener": '',
56 - "data-pattern": '',
57 - "data-auto-first-capital": '',
58 - "data-query-type": '',
59 - "data-query-reference": '',
60 - "data-page-name": '',
61 - "data-query-list-type": '',
62 - "data-query-list-header": '',
63 - "data-query-list-contents": '',
64 - "data-query-list-editable": '',
65 - "data-create-page": '',
66 - "data-set-space": '',
67 - "data-space-xobj-classname": '',
68 - "data-parent-space": '',
69 - "data-query-scope": '',
70 - "data-create-xobj": '',
71 - "data-xobj-classname": '',
72 - "data-ajax-check": '',
73 - "data-modal-input": '',
74 - "data-default-value": ''
75 - })
76 - #foreach($attr in $attrMap.keySet())
77 - #if($elementDataObj.containsKey("$!attr"))
78 -
79 -
80 -
81 - #end
82 - #end
83 83   #set($elementType = $elementDataObj.type)
84 84   #set($elementTagName = '')
85 85   #set($paragraphCSSClass = '')
... ... @@ -285,12 +285,12 @@
285 285  #end
286 286  #macro(createNumberElement $O_elementData $O_tagName)
287 287   #set($elemMap = {
288 - "data-decimals": '',
289 - "value": $!O_elementData.value
247 + 'mDataDecimals': {'data-decimals': ' data-decimals="${O_elementData.data-decimals}"'},
248 + 'mValue': {'value': $!O_elementData.value}
290 290   })
291 - #if($O_elementData.data-decimals != 0)#set($elemMap["data-decimals"] = ' data-decimals="${O_elementData.data-decimals}"')#end
250 +## #set($mDataDecimals = '')#if($O_elementData.data-decimals != 0)#set($mDataDecimals = ' data-decimals="${O_elementData.data-decimals}"')#end
292 292  ## #set($mValue = '')#if($O_elementData.value != 0) #set($mValue = $O_elementData.value)#end
293 -<input type="number" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}" value="$elemMap.value"#if($O_elementData.disabled) disabled="disabled"#end autocomplete="off" min="0" pattern="[0-9]*[.,]?[0-9]+"${elemMap.data-decimals}#if($O_elementData.decimal-step) step="${O_elementData.decimal-step}"#end#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end#if($O_elementData.help-block) aria-describedby="${O_elementData.id}_helpBlock"#end#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#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-header) data-query-list-header="${O_elementData.data-query-list-header}"#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#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>
252 +<input type="number" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}" value="$elemMap.mValue"#if($O_elementData.disabled) disabled="disabled"#end autocomplete="off" min="0" pattern="[0-9]*[.,]?[0-9]+"${elemMap.mDataDecimals}#if($O_elementData.decimal-step) step="${O_elementData.decimal-step}"#end#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end#if($O_elementData.help-block) aria-describedby="${O_elementData.id}_helpBlock"#end#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#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-header) data-query-list-header="${O_elementData.data-query-list-header}"#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#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>
294 294  #end
295 295  #macro(createEmailElement $O_elementData $O_tagName)
296 296   <input type="email" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end#if($O_elementData.disabled) disabled="disabled"#end pattern="^[A-Za-z0-9\._+-]+@[A-Za-z0-9\.-]+\.[A-Za-z]{2,6}$" autocomplete="off"#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#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>