Modifiche per il documento Macros

Ultima modifica di Jip-jan Alunkel il aprile 15, 18:09
Dalla versione 2.330
modificato da Jip-jan Alunkel
il agosto 31, 20:23
Cambia il commento: Update document after refactoring.
Alla versione 2.324
modificato da Jip-jan Alunkel
il agosto 21, 22:55
Cambia il commento: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -143,7 +143,7 @@
143 143   <p>
144 144   <label for="input${foreach.count}">$entry
145 145   <span class="input-wrap">
146 - <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()}"])">
147 147   </span>
148 148   </label>
149 149   </p>
... ... @@ -271,7 +271,7 @@
271 271   #end
272 272  #end
273 273  #macro(createTextElement $O_elementData $O_tagName)
274 - <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>
274 + <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#if($O_elementData.data-xwiki-user) data-xwiki-user="${O_elementData.data-xwiki-user}"#end>
275 275   #if($O_elementData.data-modal-input)
276 276   <a href="#" class="btn btn-default" data-toggle="modal" data-target="#${O_elementData.id}Modal">Create</a>
277 277   #end
... ... @@ -334,11 +334,11 @@
334 334   <div class="clearfix">
335 335   <p class="alert alert-warning alert-button-float-right">
336 336   <span class="alert-button pull-right">
337 - #if ($xcontext.user != 'XWiki.XWikiGuest')
337 +#if ($xcontext.user != 'XWiki.XWikiGuest')
338 338   <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
339 - #else
339 +#else
340 340   <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
341 - #end
341 +#end
342 342   </span>
343 343   <span class="alert-text">
344 344   ${O_submit.help-block}
... ... @@ -346,21 +346,4 @@
346 346   </p>
347 347   </div>
348 348  #end
349 -#macro(getUser)
350 - #set($user = '')
351 - #if($xcontext.getUser() != 'XWiki.XWikiGuest')
352 - #set($userDoc = $xwiki.getDocument($xcontext.getUser()))
353 - #set($userObj = $userDoc.getObject('XWiki.XWikiUsers'))
354 - #set($userLn = "$userObj.getValue('last_name')")
355 - #set($userFn = $userObj.getValue('first_name'))
356 - #set($glue = ", ")
357 - #if($userLn == "" || $userFn == "")
358 - #set($glue = "")
359 - #end
360 - #set($user = "$userLn${glue}$userFn")
361 - #if($user == "")
362 - #set($user = "$xcontext.getUser().split('\.')[1], NoName")
363 - #end
364 - #end
365 -#end
366 366  {{/velocity}}