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 3.7
edited by Jip-jan Alunkel
on March 13, 17:53
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 = '')
... ... @@ -92,13 +92,13 @@
92 92   #set($paragraphCSSClass = ' class="required-spoof"')
93 93   #end
94 94   #end
95 - #elseif($elementDataObj.type == 'captcha')
59 + #elseif($elementType == 'captcha')
96 96   #set($paragraphCSSClass = ' class="slideCaptcha-box"')
97 97   #end
98 98   #if($elementDataObj.data-query-type)
99 99   #set($makeFocusable = ' tabindex="-1"')
100 100   #end
101 - #if($elementDataObj.type == 'captcha')
65 + #if($elementType == 'captcha')
102 102   #set($captchaClass = ' class="slideCaptcha-box"')
103 103   #end
104 104   #if($elementType == "select")
... ... @@ -255,6 +255,7 @@
255 255   <input type="hidden" id="${O_elementData.id}" name="${O_elementData.id}" value="${O_elementData.value}"#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="${O_elementData.data-xobj-fieldname}"#end>
256 256  #end
257 257  #macro(createAddressElement $O_elementData $O_tagName)
222 + <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>
258 258   #set($addressDataArray = {
259 259   'pmLatlong': '',
260 260   'pmCountry': '',
... ... @@ -266,17 +266,11 @@
266 266   'pmHousenumber': ''
267 267   })
268 268   #foreach($item in $addressDataArray.keySet())
269 - #if($O_elementData["$item"])#set($addressDataArray["$item"]=$O_elementData["$item"])#end
234 + #if($O_elementData.containsKey($item))
235 + #set($addressDataArray["$item"]=$O_elementData["$item"])
236 + <input type="hidden" id="$item" name="$item" value="$O_elementData["$item"]"#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>
237 + #end
270 270   #end
271 - <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>
272 - <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>
273 - <input type="hidden" id="pmCountry" name="pmCountry" value="$addressDataArray['pmCountry']"#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="pmCountry"#end>
274 - <input type="hidden" id="pmState" name="pmState" value="$addressDataArray['pmState']"#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="pmState"#end>
275 - <input type="hidden" id="pmCounty" name="pmCounty" value="$addressDataArray['pmCounty']"#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="pmCounty"#end>
276 - <input type="hidden" id="pmPostcode" name="pmPostcode" value="$addressDataArray['pmPostcode']"#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="pmPostcode"#end>
277 - <input type="hidden" id="pmCity" name="pmCity" value="$addressDataArray['pmCity']"#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="pmCity"#end>
278 - <input type="hidden" id="pmStreet" name="pmStreet" value="$addressDataArray['pmStreet']"#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="pmStreet"#end>
279 - <input type="hidden" id="pmHousenumber" name="pmHousenumber" value="$addressDataArray['pmHousenumber']"#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="pmHousenumber"#end>
280 280  #end
281 281  #macro(createNumberElement $O_elementData $O_tagName)
282 282   #set($elemMap = {