Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.431
edited by Jip-jan Alunkel
on March 12, 21:43
Change comment: Update document after refactoring.
To version 2.425
edited by Jip-jan Alunkel
on March 11, 23:29
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -39,42 +39,6 @@
39 39   #end
40 40  #end
41 41  #macro(createFormElement $elementDataObj)
42 - "help-block": '',
43 - "data-decimals": ''
44 - #set($attrMap = {
45 - "aria-label": '',
46 - "date-min": '',
47 - "date-max": '',
48 - "decimal-step": '',
49 - "disabled": '',
50 - "placeholder": '',
51 - "textarea-rows": '',
52 - "value": '',
53 - "data-error-response-type": '',
54 - "data-opener": '',
55 - "data-pattern": '',
56 - "data-auto-first-capital": '',
57 - "data-query-type": '',
58 - "data-query-reference": '',
59 - "data-page-name": '',
60 - "data-query-list-type": '',
61 - "data-query-list-header": '',
62 - "data-query-list-contents": '',
63 - "data-query-list-editable": '',
64 - "data-create-page": '',
65 - "data-set-space": '',
66 - "data-space-xobj-classname": '',
67 - "data-parent-space": '',
68 - "data-query-scope": '',
69 - "data-create-xobj": '',
70 - "data-xobj-classname": '',
71 - "data-ajax-check": '',
72 - "data-modal-input": '',
73 - "data-default-value": ''
74 - })
75 - #foreach($attr in $attrMap.keySet())
76 - #if($elementDataObj.containsKey("$!attr"))
77 -
78 78   #set($elementType = $elementDataObj.type)
79 79   #set($elementTagName = '')
80 80   #set($paragraphCSSClass = '')
... ... @@ -280,12 +280,12 @@
280 280  #end
281 281  #macro(createNumberElement $O_elementData $O_tagName)
282 282   #set($elemMap = {
283 - "data-decimals": '',
284 - "value": $!O_elementData.value
247 + "mDataDecimals": {"data-decimals": ' data-decimals="${O_elementData.data-decimals}"'},
248 + "mValue": {"value": $!O_elementData.value}
285 285   })
286 - #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
287 287  ## #set($mValue = '')#if($O_elementData.value != 0) #set($mValue = $O_elementData.value)#end
288 -<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>
289 289  #end
290 290  #macro(createEmailElement $O_elementData $O_tagName)
291 291   <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>