Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.258
edited by Jip-jan Alunkel
on July 18, 18:27
Change comment: Update document after refactoring.
To version 2.247
edited by Jip-jan Alunkel
on July 17, 00:08
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -18,46 +18,35 @@
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 - #elseif($elementType == "captcha")
52 - #set($elementTagName = "captcha")
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}>
45 + #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
46 + <p${requiredCSSClass}${makeFocusable}>
58 58   <label for="${elementDataObj.id}">
59 59   $elementDataObj.label
60 - <span class="input-wrap${spanCSSClass}">
49 + <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}">
99 + <p${requiredCSSClass}>
100 + <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")
... ... @@ -231,7 +231,7 @@
231 231   <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>
232 232  #end
233 233  #macro(createPasswordElement $O_elementData $O_tagName)
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>
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="&#61550"></span>
235 235  #end
236 236  #macro(createDateElement $O_elementData $O_tagName)
237 237   <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>
... ... @@ -255,37 +255,26 @@
255 255  #macro(createTextareaElement $O_elementData $O_tagName)
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 -#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
269 269  #macro(createExpandStart $opener $value)
270 - <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">
246 + <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">
271 271  #end
272 272  #macro(createExpandEnd)
273 - </div>
249 + </div>
274 274  #end
275 275  #macro(createSubmit $O_submit)
276 - <div class="clearfix">
277 - <p class="alert alert-warning alert-button-float-right">
278 - <span class="alert-button pull-right">
252 + <div class="clearfix">
253 + <p class="alert alert-warning alert-button-float-right">
254 + <span class="alert-button pull-right">
279 279  #if ($xcontext.user != 'XWiki.XWikiGuest')
280 - <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
256 + <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
281 281  #else
282 - <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
258 + <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
283 283  #end
284 - </span>
285 - <span class="alert-text">
286 - ${O_submit.help-block}
287 - </span>
288 - </p>
289 - </div>
260 + </span>
261 + <span class="alert-text">
262 + ${O_submit.help-block}
263 + </span>
264 + </p>
265 + </div>
290 290  #end
291 291  {{/velocity}}