Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.254
edited by Jip-jan Alunkel
on July 18, 17:39
Change comment: Update document after refactoring.
To version 2.245
edited by Jip-jan Alunkel
on July 17, 00:05
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
... ... @@ -220,7 +220,7 @@
220 220   <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>
221 221  #end
222 222  #macro(createPasswordElement $O_elementData $O_tagName)
223 - <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="&#1024854101"></span>
224 224  #end
225 225  #macro(createDateElement $O_elementData $O_tagName)
226 226   <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>
... ... @@ -244,35 +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 class="slideCaptcha-track" id="slideCaptcha_track">
250 - Are you human?
251 - <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
252 - </label>
253 - <input type="hidden" id="slideCaptcha_answer" value="droid">
254 - </p>
255 -#end
256 256  #macro(createExpandStart $opener $value)
257 - <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">
258 258  #end
259 259  #macro(createExpandEnd)
260 - </div>
249 + </div>
261 261  #end
262 262  #macro(createSubmit $O_submit)
263 - <div class="clearfix">
264 - <p class="alert alert-warning alert-button-float-right">
265 - <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">
266 266  #if ($xcontext.user != 'XWiki.XWikiGuest')
267 - <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}" />
268 268  #else
269 - <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>
270 270  #end
271 - </span>
272 - <span class="alert-text">
273 - ${O_submit.help-block}
274 - </span>
275 - </p>
276 - </div>
260 + </span>
261 + <span class="alert-text">
262 + ${O_submit.help-block}
263 + </span>
264 + </p>
265 + </div>
277 277  #end
278 278  {{/velocity}}