Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.349
edited by Jip-jan Alunkel
on January 26, 13:22
Change comment: Update document after refactoring.
To version 2.356
edited by Jip-jan Alunkel
on January 30, 13:09
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -239,7 +239,7 @@
239 239  #end
240 240  #macro(createCheckboxElement $O_elementData)
241 241   <input type="checkbox" name="${O_elementData.id}"#if($O_elementData.value=="1") checked="checked"#end value="1" id="${O_elementData.id}"#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#end#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.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#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end>$O_elementData.label
242 - <input name="${O_elementData.id}" type="hidden"#if($O_elementData.value=="1") value="0"#else value="1"#end>
242 + <input name="${O_elementData.id}" type="hidden" value="0"#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>
243 243  #end
244 244  #macro(createTextareaElement $O_elementData $O_tagName)
245 245  
... ... @@ -268,14 +268,24 @@
268 268   </div>
269 269  #end
270 270  #macro(createSubmit $O_submit)
271 + <input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" />
272 +
273 + #if(${O_submit.clean} == "true")
274 + #if ($xcontext.user != 'XWiki.XWikiGuest')
275 + <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
276 + #else
277 + <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
278 + #end
279 +
280 + #else
271 271   <div class="clearfix">
272 272   <p class="alert alert-warning alert-button-float-right">
273 273   <span class="alert-button pull-right">
274 - #if ($xcontext.user != 'XWiki.XWikiGuest')
284 + #if ($xcontext.user != 'XWiki.XWikiGuest')
275 275   <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
276 - #else
286 + #else
277 277   <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
278 - #end
288 + #end
279 279   </span>
280 280   <span class="alert-text">
281 281   ${O_submit.help-block}
... ... @@ -282,6 +282,7 @@
282 282   </span>
283 283   </p>
284 284   </div>
295 + #end
285 285  #end
286 286  #macro(getUser)
287 287   #set($user = '')