Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.244
edited by Jip-jan Alunkel
on July 17, 00:05
Change comment: Update document after refactoring.
To version 2.257
edited by Jip-jan Alunkel
on July 18, 18:26
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -18,35 +18,46 @@
18 18  #macro(createFormElement $elementDataObj)
19 19   #set($elementType = $elementDataObj.type)
20 20   #set($elementTagName = '')
21 - #set($requiredCSSClass = '')
21 + #set($paragraphCSSClass = '')
22 22   #set($makeFocusable = '')
23 - #set($addedCSSClass = '')
23 + #set($spanCSSClass = '')
24 24   #set($hint = '')
25 25   #set($placeholder = '')
26 26   #if($elementDataObj.required == 'true')
27 - #set($requiredCSSClass = ' class="required"')
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"')
28 28   #end
29 29   #if($elementDataObj.data-query-type)
30 30   #set($makeFocusable = ' tabindex="-1"')
31 31   #end
38 + #if($elementDataObj.type == 'captcha')
39 + #set($captchaClass = ' class="slideCaptcha-box"')
40 + #end
32 32   #if($elementType == "select")
33 - #set($addedCSSClass = " select-wrap")
42 + #set($spanCSSClass = " select-wrap")
34 34   #set($elementTagName = "select")
35 35   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color")
36 36   #set($elementTagName = "input")
37 37   #elseif($elementType == "checkbox" || $elementType == "radio")
38 - #set($addedCSSClass = " checkradio")
47 + #set($spanCSSClass = " checkradio")
39 39   #set($elementTagName = "checkradio")
40 40   #elseif($elementType == "textarea")
41 41   #set($elementTagName = "textarea")
51 + #elseif($elementType == "captcha")
52 + #set($elementTagName = "captcha")
42 42   #else
43 43   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
44 44   #end
45 - #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
46 - <p${requiredCSSClass}${makeFocusable}>
56 + #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea" || $elementTagName == "captcha")
57 + <p${paragraphCSSClass}${makeFocusable}${captchaClass}>
47 47   <label for="${elementDataObj.id}">
48 48   $elementDataObj.label
49 - <span class="input-wrap${addedCSSClass}">
60 + <span class="input-wrap${spanCSSClass}">
50 50   #if($elementTagName == "select")
51 51   #createSelectElement($elementDataObj $elementTagName)
52 52   #elseif($elementTagName == "textarea")
... ... @@ -82,6 +82,8 @@
82 82   #createTelElement($elementDataObj $elementType)
83 83   #elseif($elementType == "url")
84 84   #createUrlElement($elementDataObj $elementType)
96 + #elseif($elementType == "captcha")
97 + #createCaptcha($elementDataObj)
85 85   #end
86 86   #end
87 87   #if($elementDataObj.help-block && $elementDataObj.help-block != "")
... ... @@ -96,8 +96,8 @@
96 96   </p>
97 97   #end
98 98   #if($elementTagName == "checkradio")
99 - <p${requiredCSSClass}>
100 - <span class="input-wrap${addedCSSClass}">
112 + <p${paragraphCSSClass}>
113 + <span class="input-wrap${spanCSSClass}">
101 101   <span class="fieldset no-fieldset-border">
102 102   <label for="${elementDataObj.id}"#* class="strong"*#>
103 103   #if($elementType == "checkbox")
... ... @@ -218,7 +218,7 @@
218 218   <input type="email" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end pattern="^[A-Za-z0-9._+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,63}$" 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>
219 219  #end
220 220  #macro(createPasswordElement $O_elementData $O_tagName)
221 - <input type="password" class="form-control full password" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#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><span class="preview" title="$services.localization.render('pagemaker.multiword.show_hide_password')" data-content="&#102 48 54 101"></span>
234 + <input type="password" class="form-control full password" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#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><span class="preview" title="$services.localization.render('pagemaker.multiword.show_hide_password')" data-content="&#xf06e"></span>
222 222  #end
223 223  #macro(createDateElement $O_elementData $O_tagName)
224 224   <input type="date" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end#if($O_elementData.date-min) min="${O_elementData.date-min}"#end#if($O_elementData.date-max) max="${O_elementData.date-max}"#end autocomplete="off" 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>
... ... @@ -242,26 +242,37 @@
242 242  #macro(createTextareaElement $O_elementData $O_tagName)
243 243   <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>
244 244  #end
258 +#macro(createCaptcha $O_elementData)
259 + <label>Are you human?
260 + <span class="input-wrap">
261 + <span class="slideCaptcha-track" id="slideCaptcha_track">
262 + <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
263 + </span>
264 + <input type="hidden" id="slideCaptcha_answer" value="droid">
265 + </span>
266 + </label>
267 + </p>
268 +#end
245 245  #macro(createExpandStart $opener $value)
246 - <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">
270 + <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">
247 247  #end
248 248  #macro(createExpandEnd)
249 - </div>
273 + </div>
250 250  #end
251 251  #macro(createSubmit $O_submit)
252 - <div class="clearfix">
253 - <p class="alert alert-warning alert-button-float-right">
254 - <span class="alert-button pull-right">
276 + <div class="clearfix">
277 + <p class="alert alert-warning alert-button-float-right">
278 + <span class="alert-button pull-right">
255 255  #if ($xcontext.user != 'XWiki.XWikiGuest')
256 - <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
280 + <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
257 257  #else
258 - <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
282 + <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
259 259  #end
260 - </span>
261 - <span class="alert-text">
262 - ${O_submit.help-block}
263 - </span>
264 - </p>
265 - </div>
284 + </span>
285 + <span class="alert-text">
286 + ${O_submit.help-block}
287 + </span>
288 + </p>
289 + </div>
266 266  #end
267 267  {{/velocity}}