Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.262
edited by Jip-jan Alunkel
on July 18, 18:33
Change comment: Update document after refactoring.
To version 2.255
edited by Jip-jan Alunkel
on July 18, 17:42
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -18,47 +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 -$elementDataObj.type
42 42   #if($elementType == "select")
43 - #set($spanCSSClass = " select-wrap")
33 + #set($addedCSSClass = " select-wrap")
44 44   #set($elementTagName = "select")
45 45   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color")
46 46   #set($elementTagName = "input")
47 47   #elseif($elementType == "checkbox" || $elementType == "radio")
48 - #set($spanCSSClass = " checkradio")
38 + #set($addedCSSClass = " checkradio")
49 49   #set($elementTagName = "checkradio")
50 50   #elseif($elementType == "textarea")
51 51   #set($elementTagName = "textarea")
52 52   #elseif($elementType == "captcha")
53 - #set($elementTagName = "captcha")
43 + #createCaptcha($elementDataObj)
54 54   #else
55 55   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
56 56   #end
57 - #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea" || $elementTagName == "captcha")
58 - <p${paragraphCSSClass}${makeFocusable}>
47 + #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
48 + <p${requiredCSSClass}${makeFocusable}>
59 59   <label for="${elementDataObj.id}">
60 60   $elementDataObj.label
61 - <span class="input-wrap${spanCSSClass}">
51 + <span class="input-wrap${addedCSSClass}">
62 62   #if($elementTagName == "select")
63 63   #createSelectElement($elementDataObj $elementTagName)
64 64   #elseif($elementTagName == "textarea")
... ... @@ -94,8 +94,6 @@
94 94   #createTelElement($elementDataObj $elementType)
95 95   #elseif($elementType == "url")
96 96   #createUrlElement($elementDataObj $elementType)
97 - #elseif($elementType == "captcha")
98 - #createCaptcha($elementDataObj)
99 99   #end
100 100   #end
101 101   #if($elementDataObj.help-block && $elementDataObj.help-block != "")
... ... @@ -110,8 +110,8 @@
110 110   </p>
111 111   #end
112 112   #if($elementTagName == "checkradio")
113 - <p${paragraphCSSClass}>
114 - <span class="input-wrap${spanCSSClass}">
101 + <p${requiredCSSClass}>
102 + <span class="input-wrap${addedCSSClass}">
115 115   <span class="fieldset no-fieldset-border">
116 116   <label for="${elementDataObj.id}"#* class="strong"*#>
117 117   #if($elementType == "checkbox")
... ... @@ -257,10 +257,15 @@
257 257   <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>
258 258  #end
259 259  #macro(createCaptcha $O_elementData)
260 - <span class="slideCaptcha-track" id="slideCaptcha_track">
261 - <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
262 - </span>
263 - <input type="hidden" id="slideCaptcha_answer" value="droid">
248 + <p class="slideCaptcha-box">
249 + <label>Are you human?
250 + <span class="input-wrap">
251 + <span class="slideCaptcha-track" id="slideCaptcha_track">
252 + <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
253 + </span>
254 + </span></label>
255 + <input type="hidden" id="slideCaptcha_answer" value="droid">
256 + </p>
264 264  #end
265 265  #macro(createExpandStart $opener $value)
266 266   <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">