Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 3.8
edited by Jip-jan Alunkel
on March 13, 17:59
Change comment: Update document after refactoring.
To version 2.428
edited by Jip-jan Alunkel
on March 11, 23:35
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -56,13 +56,13 @@
56 56   #set($paragraphCSSClass = ' class="required-spoof"')
57 57   #end
58 58   #end
59 - #elseif($elementType == 'captcha')
59 + #elseif($elementDataObj.type == 'captcha')
60 60   #set($paragraphCSSClass = ' class="slideCaptcha-box"')
61 61   #end
62 62   #if($elementDataObj.data-query-type)
63 63   #set($makeFocusable = ' tabindex="-1"')
64 64   #end
65 - #if($elementType == 'captcha')
65 + #if($elementDataObj.type == 'captcha')
66 66   #set($captchaClass = ' class="slideCaptcha-box"')
67 67   #end
68 68   #if($elementType == "select")
... ... @@ -230,8 +230,7 @@
230 230   'pmHousenumber': ''
231 231   })
232 232   #foreach($item in $addressDataArray.keySet())
233 - #if($O_elementData["$item"])
234 - #set($addressDataArray["$item"]=$O_elementData["$item"])#end
233 + #if($O_elementData["$item"])#set($addressDataArray["$item"]=$O_elementData["$item"])#end
235 235   #end
236 236   <input type="text" 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 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-pattern) data-pattern="${O_elementData.data-pattern}"#end#if($O_elementData.data-auto-first-capital) data-auto-first-capital="${O_elementData.data-auto-first-capital}"#end#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}" data-query-reference="${O_elementData.data-query-reference}"#end#if($O_elementData.data-page-name) data-page-name="${O_elementData.data-page-name}"#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-ajax-check) data-ajax-check="${O_elementData.data-ajax-check}"#end#if($O_elementData.data-modal-input) data-modal-input="${O_elementData.data-modal-input}"#end#if($O_elementData.data-default-value) data-default-value="${O_elementData.data-default-value}"#end>
237 237   <input type="hidden" id="pmLatlong" name="pmLatlong" value="$addressDataArray['pmLatlong']"#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="pmLatlong"#end>
... ... @@ -245,10 +245,10 @@
245 245  #end
246 246  #macro(createNumberElement $O_elementData $O_tagName)
247 247   #set($elemMap = {
248 - "data-decimals": '',
247 + "data-decimals": ' data-decimals="${O_elementData.data-decimals}"',
249 249   "value": $!O_elementData.value
250 250   })
251 - #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
252 252  ## #set($mValue = '')#if($O_elementData.value != 0) #set($mValue = $O_elementData.value)#end
253 253  <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>
254 254  #end