Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 3.1
edited by Jip-jan Alunkel
on March 12, 21:47
Change comment: Update document after refactoring.
To version 3.20
edited by Jip-jan Alunkel
on April 05, 22:10
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -39,43 +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 79   #set($elementType = $elementDataObj.type)
80 80   #set($elementTagName = '')
81 81   #set($paragraphCSSClass = '')
... ... @@ -93,13 +93,13 @@
93 93   #set($paragraphCSSClass = ' class="required-spoof"')
94 94   #end
95 95   #end
96 - #elseif($elementDataObj.type == 'captcha')
59 + #elseif($elementType == 'captcha')
97 97   #set($paragraphCSSClass = ' class="slideCaptcha-box"')
98 98   #end
99 99   #if($elementDataObj.data-query-type)
100 100   #set($makeFocusable = ' tabindex="-1"')
101 101   #end
102 - #if($elementDataObj.type == 'captcha')
65 + #if($elementType == 'captcha')
103 103   #set($captchaClass = ' class="slideCaptcha-box"')
104 104   #end
105 105   #if($elementType == "select")
... ... @@ -177,7 +177,7 @@
177 177   </label>
178 178   </p>
179 179   #if($elementDataObj.data-modal-input)
180 - <div class="modal fade modal-input" id="${elementDataObj.id}Modal" tabindex="-1" role="dialog" data-modal-input-origin="${elementDataObj.id}" data-modal-input-glue="${elementDataObj.data-modal-input-glue}" aria-labelledby="myModalLabel">
143 + <div class="modal fade modal-input pagemaker" id="${elementDataObj.id}Modal" tabindex="-1" role="dialog" data-modal-input-origin="${elementDataObj.id}" data-modal-input-glue="${elementDataObj.data-modal-input-glue}" aria-labelledby="myModalLabel">
181 181   <div class="modal-dialog modal-dialog-centered" role="document">
182 182   <div class="modal-content">
183 183   <div class="modal-header">
... ... @@ -189,7 +189,7 @@
189 189   <p>
190 190   <label for="input${foreach.count}">$entry
191 191   <span class="input-wrap">
192 - <input type="text" class="form-control full" id="input${foreach.count}" placeholder="$services.localization.render('global.multiword.enter', ["${entry.toLowerCase()}"])" required="required">
155 + <input type="text" class="form-control full" id="input${foreach.count}" placeholder="$services.localization.render('global.multiword.enter', ["${entry.toLowerCase()}"])">
193 193   </span>
194 194   </label>
195 195   </p>
... ... @@ -256,6 +256,7 @@
256 256   <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>
257 257  #end
258 258  #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>
259 259   #set($addressDataArray = {
260 260   'pmLatlong': '',
261 261   'pmCountry': '',
... ... @@ -267,26 +267,14 @@
267 267   'pmHousenumber': ''
268 268   })
269 269   #foreach($item in $addressDataArray.keySet())
270 - #if($O_elementData["$item"])#set($addressDataArray["$item"]=$O_elementData["$item"])#end
234 + #if($O_elementData["$item"])
235 + #set($addressDataValue=$O_elementData["$item"])
236 + <input type="hidden" id="${item}" name="${item}" value="${addressDataValue}"#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="${item}"#end>
237 + #end
271 271   #end
272 - <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>
273 - <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>
274 - <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>
275 - <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>
276 - <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>
277 - <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>
278 - <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>
279 - <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>
280 - <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>
281 281  #end
282 282  #macro(createNumberElement $O_elementData $O_tagName)
283 - #set($elemMap = {
284 - "data-decimals": '',
285 - "value": $!O_elementData.value
286 - })
287 - #if($O_elementData.data-decimals != 0)#set($elemMap["data-decimals"] = ' data-decimals="${O_elementData.data-decimals}"')#end
288 -## #set($mValue = '')#if($O_elementData.value != 0) #set($mValue = $O_elementData.value)#end
289 -<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>
241 +<input type="number" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}" value="#if($O_elementData.value)$O_elementData.value#end"#if($O_elementData.disabled) disabled="disabled"#end autocomplete="off" min="0" pattern="[0-9]*[.,]?[0-9]+"#if($O_elementData.data-decimals) data-decimals="${O_elementData.data-decimals}"#end#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>
290 290  #end
291 291  #macro(createEmailElement $O_elementData $O_tagName)
292 292   <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>