Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.334
edited by Jip-jan Alunkel
on December 03, 17:50
Change comment: Update document after refactoring.
To version 2.327
edited by Jip-jan Alunkel
on August 31, 16:35
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -64,7 +64,7 @@
64 64   #if($elementType == "select")
65 65   #set($spanCSSClass = " select-wrap")
66 66   #set($elementTagName = "select")
67 - #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color" || $elementType == "address")
67 + #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color")
68 68   #set($elementTagName = "input")
69 69   #elseif($elementType == "checkbox" || $elementType == "radio")
70 70   #set($spanCSSClass = " checkradio")
... ... @@ -116,8 +116,6 @@
116 116   #createTelElement($elementDataObj $elementType)
117 117   #elseif($elementType == "url")
118 118   #createUrlElement($elementDataObj $elementType)
119 - #elseif($elementType == "address")
120 - #createAddressElement($elementDataObj $elementType)
121 121   #elseif($elementType == "captcha")
122 122   #createCaptcha($elementDataObj)
123 123   #end
... ... @@ -145,7 +145,7 @@
145 145   <p>
146 146   <label for="input${foreach.count}">$entry
147 147   <span class="input-wrap">
148 - <input type="text" class="form-control full" id="input${foreach.count}" placeholder="$services.localization.render('global.multiword.enter', ["${entry.toLowerCase()}"])" required="required">
146 + <input type="text" class="form-control full" id="input${foreach.count}" placeholder="$services.localization.render('global.multiword.enter', ["${entry.toLowerCase()}"])" aria-invalid="false">
149 149   </span>
150 150   </label>
151 151   </p>
... ... @@ -278,10 +278,6 @@
278 278   <a href="#" class="btn btn-default" data-toggle="modal" data-target="#${O_elementData.id}Modal">Create</a>
279 279   #end
280 280  #end
281 -#macro(createAddressElement $O_elementData $O_tagName)
282 - <input type="text" class="form-control full" 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#if($O_elementData.data-auto-first-capital) data-auto-first-capital="${O_elementData.data-auto-first-capital}"#end#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}" data-query-reference="${O_elementData.data-query-reference}"#end#if($O_elementData.data-query-list-type) data-query-list-type="${O_elementData.data-query-list-type}"#end#if($O_elementData.data-query-list-header) data-query-list-header="${O_elementData.data-query-list-header}"#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#end#if($O_elementData.data-create-page) data-create-page="${O_elementData.data-create-page}"#end#if($O_elementData.data-query-scope) data-query-scope="${O_elementData.data-query-scope}"#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.data-ajax-check) data-ajax-check="${O_elementData.data-ajax-check}"#end#if($O_elementData.data-modal-input) data-modal-input="${O_elementData.data-modal-input}"#end#if($O_elementData.data-default-value) data-default-value="${O_elementData.data-default-value}"#end>
283 - <input type="hidden" id="latlong" name="latlong" value="${O_elementData.value}" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="latlong">
284 -#end
285 285  #macro(createNumberElement $O_elementData $O_tagName)
286 286   <input type="number" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end autocomplete="off" min="0" pattern="[0-9]*[.,]?[0-9]+" data-decimals="${O_elementData.data-decimals}" step="${O_elementData.decimal-step}"#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-query-type) data-query-type="${O_elementData.data-query-type}"#end#if($O_elementData.data-query-list-type) data-query-list-type="${O_elementData.data-query-list-type}"#end#if($O_elementData.data-query-list-header) data-query-list-header="${O_elementData.data-query-list-header}"#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#end#if($O_elementData.data-create-page) data-create-page="${O_elementData.data-create-page}"#end#if($O_elementData.data-query-scope) data-query-scope="${O_elementData.data-query-scope}"#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>
287 287  #end
... ... @@ -340,11 +340,11 @@
340 340   <div class="clearfix">
341 341   <p class="alert alert-warning alert-button-float-right">
342 342   <span class="alert-button pull-right">
343 - #if ($xcontext.user != 'XWiki.XWikiGuest')
337 +#if ($xcontext.user != 'XWiki.XWikiGuest')
344 344   <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
345 - #else
339 +#else
346 346   <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
347 - #end
341 +#end
348 348   </span>
349 349   <span class="alert-text">
350 350   ${O_submit.help-block}
... ... @@ -352,21 +352,4 @@
352 352   </p>
353 353   </div>
354 354  #end
355 -#macro(getUser)
356 - #set($user = '')
357 - #if($xcontext.getUser() != 'XWiki.XWikiGuest')
358 - #set($userDoc = $xwiki.getDocument($xcontext.getUser()))
359 - #set($userObj = $userDoc.getObject('XWiki.XWikiUsers'))
360 - #set($userLn = "$userObj.getValue('last_name')")
361 - #set($userFn = $userObj.getValue('first_name'))
362 - #set($glue = ", ")
363 - #if($userLn == "" || $userFn == "")
364 - #set($glue = "")
365 - #end
366 - #set($user = "$userLn${glue}$userFn")
367 - #if($user == "")
368 - #set($user = "$xcontext.getUser().split('\.')[1], NoName")
369 - #end
370 - #end
371 -#end
372 372  {{/velocity}}