Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.256
edited by Jip-jan Alunkel
on July 18, 17:48
Change comment: Update document after refactoring.
To version 2.248
edited by Jip-jan Alunkel
on July 17, 00:10
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -39,8 +39,6 @@
39 39   #set($elementTagName = "checkradio")
40 40   #elseif($elementType == "textarea")
41 41   #set($elementTagName = "textarea")
42 - #elseif($elementType == "captcha")
43 - #createCaptcha($elementDataObj)
44 44   #else
45 45   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
46 46   #end
... ... @@ -244,38 +244,26 @@
244 244  #macro(createTextareaElement $O_elementData $O_tagName)
245 245   <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>
246 246  #end
247 -#macro(createCaptcha $O_elementData)
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 - <input type="hidden" id="slideCaptcha_answer" value="droid">
255 - </span>
256 - </label>
257 - </p>
258 -#end
259 259  #macro(createExpandStart $opener $value)
260 - <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">
261 261  #end
262 262  #macro(createExpandEnd)
263 - </div>
249 + </div>
264 264  #end
265 265  #macro(createSubmit $O_submit)
266 - <div class="clearfix">
267 - <p class="alert alert-warning alert-button-float-right">
268 - <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">
269 269  #if ($xcontext.user != 'XWiki.XWikiGuest')
270 - <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}" />
271 271  #else
272 - <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>
273 273  #end
274 - </span>
275 - <span class="alert-text">
276 - ${O_submit.help-block}
277 - </span>
278 - </p>
279 - </div>
260 + </span>
261 + <span class="alert-text">
262 + ${O_submit.help-block}
263 + </span>
264 + </p>
265 + </div>
280 280  #end
281 281  {{/velocity}}