Modifiche per il documento Macros

Ultima modifica di Jip-jan Alunkel il aprile 15, 18:09
Dalla versione 3.10
modificato da Jip-jan Alunkel
il marzo 13, 18:04
Cambia il commento: Update document after refactoring.
Alla versione 3.2
modificato da Jip-jan Alunkel
il marzo 12, 21:49
Cambia il commento: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -39,6 +39,47 @@
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
42 42   #set($elementType = $elementDataObj.type)
43 43   #set($elementTagName = '')
44 44   #set($paragraphCSSClass = '')
... ... @@ -56,13 +56,13 @@
56 56   #set($paragraphCSSClass = ' class="required-spoof"')
57 57   #end
58 58   #end
59 - #elseif($elementType == 'captcha')
100 + #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')
106 + #if($elementDataObj.type == 'captcha')
66 66   #set($captchaClass = ' class="slideCaptcha-box"')
67 67   #end
68 68   #if($elementType == "select")
... ... @@ -219,7 +219,6 @@
219 219   <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>
220 220  #end
221 221  #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>
223 223   #set($addressDataArray = {
224 224   'pmLatlong': '',
225 225   'pmCountry': '',
... ... @@ -231,11 +231,10 @@
231 231   'pmHousenumber': ''
232 232   })
233 233   #foreach($item in $addressDataArray.keySet())
234 - #if($O_elementData["$item"])
235 - #set($addressDataArray["$item"]=$O_elementData["$item"])#end
236 - <input type="hidden" id="$item" name="$item" value="$addressDataArray[$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>
274 + #if($O_elementData["$item"])#set($addressDataArray["$item"]=$O_elementData["$item"])#end
237 237   #end
238 -#*
276 + <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>
277 + <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>
239 239   <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>
240 240   <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>
241 241   <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>
... ... @@ -243,7 +243,6 @@
243 243   <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>
244 244   <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>
245 245   <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>
246 -*#
247 247  #end
248 248  #macro(createNumberElement $O_elementData $O_tagName)
249 249   #set($elemMap = {