Wijzigen voor document Macros

Laatst gewijzigd door Jip-jan Alunkel op april 15, 18:09
Van versie 2.257
gewijzigd door Jip-jan Alunkel
op juli 18, 18:26
Opmerking bij wijziging: Update document after refactoring.
Naar versie 2.256
gewijzigd door Jip-jan Alunkel
op juli 18, 17:48
Opmerking bij wijziging: Update document after refactoring.

Samenvatting

Details

Paginaeigenschappen
Inhoud
... ... @@ -18,46 +18,37 @@
18 18  #macro(createFormElement $elementDataObj)
19 19   #set($elementType = $elementDataObj.type)
20 20   #set($elementTagName = '')
21 - #set($paragraphCSSClass = '')
21 + #set($requiredCSSClass = '')
22 22   #set($makeFocusable = '')
23 - #set($spanCSSClass = '')
23 + #set($addedCSSClass = '')
24 24   #set($hint = '')
25 25   #set($placeholder = '')
26 26   #if($elementDataObj.required == 'true')
27 - #if($elementType == 'captcha')
28 - #set($paragraphCSSClass = ' class="required slideCaptcha-box"')
29 - #else
30 - #set($paragraphCSSClass = ' class="required"')
31 - #end
32 - #elseif($elementDataObj.type == 'captcha')
33 - #set($paragraphCSSClass = ' class="slideCaptcha-box"')
27 + #set($requiredCSSClass = ' class="required"')
34 34   #end
35 35   #if($elementDataObj.data-query-type)
36 36   #set($makeFocusable = ' tabindex="-1"')
37 37   #end
38 - #if($elementDataObj.type == 'captcha')
39 - #set($captchaClass = ' class="slideCaptcha-box"')
40 - #end
41 41   #if($elementType == "select")
42 - #set($spanCSSClass = " select-wrap")
33 + #set($addedCSSClass = " select-wrap")
43 43   #set($elementTagName = "select")
44 44   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color")
45 45   #set($elementTagName = "input")
46 46   #elseif($elementType == "checkbox" || $elementType == "radio")
47 - #set($spanCSSClass = " checkradio")
38 + #set($addedCSSClass = " checkradio")
48 48   #set($elementTagName = "checkradio")
49 49   #elseif($elementType == "textarea")
50 50   #set($elementTagName = "textarea")
51 51   #elseif($elementType == "captcha")
52 - #set($elementTagName = "captcha")
43 + #createCaptcha($elementDataObj)
53 53   #else
54 54   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
55 55   #end
56 - #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea" || $elementTagName == "captcha")
57 - <p${paragraphCSSClass}${makeFocusable}${captchaClass}>
47 + #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
48 + <p${requiredCSSClass}${makeFocusable}>
58 58   <label for="${elementDataObj.id}">
59 59   $elementDataObj.label
60 - <span class="input-wrap${spanCSSClass}">
51 + <span class="input-wrap${addedCSSClass}">
61 61   #if($elementTagName == "select")
62 62   #createSelectElement($elementDataObj $elementTagName)
63 63   #elseif($elementTagName == "textarea")
... ... @@ -93,8 +93,6 @@
93 93   #createTelElement($elementDataObj $elementType)
94 94   #elseif($elementType == "url")
95 95   #createUrlElement($elementDataObj $elementType)
96 - #elseif($elementType == "captcha")
97 - #createCaptcha($elementDataObj)
98 98   #end
99 99   #end
100 100   #if($elementDataObj.help-block && $elementDataObj.help-block != "")
... ... @@ -109,8 +109,8 @@
109 109   </p>
110 110   #end
111 111   #if($elementTagName == "checkradio")
112 - <p${paragraphCSSClass}>
113 - <span class="input-wrap${spanCSSClass}">
101 + <p${requiredCSSClass}>
102 + <span class="input-wrap${addedCSSClass}">
114 114   <span class="fieldset no-fieldset-border">
115 115   <label for="${elementDataObj.id}"#* class="strong"*#>
116 116   #if($elementType == "checkbox")
... ... @@ -256,6 +256,7 @@
256 256   <textarea class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end#if($O_elementData.textarea-rows) rows="$O_elementData.textarea-rows"#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></textarea>
257 257  #end
258 258  #macro(createCaptcha $O_elementData)
248 + <p class="slideCaptcha-box">
259 259   <label>Are you human?
260 260   <span class="input-wrap">
261 261   <span class="slideCaptcha-track" id="slideCaptcha_track">