Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.316
edited by Jip-jan Alunkel
on August 16, 17:02
Change comment: Update document after refactoring.
To version 2.329
edited by Jip-jan Alunkel
on August 31, 20:21
Change comment: 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()}"])">
146 + <input type="text" class="form-control full" id="input${foreach.count}" placeholder="$services.localization.render('global.multiword.enter', ["${entry.toLowerCase()}"])" required="required">
147 147   </span>
148 148   </label>
149 149   </p>
... ... @@ -150,7 +150,7 @@
150 150   #end
151 151   </div>
152 152   <div class="modal-footer">
153 - <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button><button type="button" id="clearInput" class="btn btn-primary">Clear</button><button type="button" id="copyToInput" class="btn btn-success">Save changes</button>
153 + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button><button type="button" id="clearInput" class="btn btn-default">Clear</button><button type="button" id="copyToInput" class="btn btn-primary">Save changes</button>
154 154   </div>
155 155   </div>
156 156   </div>
... ... @@ -267,11 +267,11 @@
267 267   #end
268 268   </select>
269 269   #if($removedNr > 0)
270 - $removedNr pages had the XObject ##${removeXObj}## removed.
270 + $removedNr pages had the XObject <span class="terminal">${removeXObj}</span> removed.
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>
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>
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
... ... @@ -305,7 +305,18 @@
305 305   <input name="${O_elementData.id}" type="hidden"#if($O_elementData.value=="1") value="0"#else value="1"#end>
306 306  #end
307 307  #macro(createTextareaElement $O_elementData $O_tagName)
308 +
309 +#set($lazy = false)
310 +#wysiwyg_import($lazy)
311 +
308 308   <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>
313 +<script type="text/javascript">
314 +document.observe('xwiki:dom:loaded', function () {
315 + Wysiwyg.onModuleLoad(function() {
316 + new WysiwygEditor({hookId:'${O_elementData.id}'});
317 + });
318 +});
319 +</script>
309 309  #end
310 310  #macro(createCaptcha $O_elementData)
311 311   <span class="slideCaptcha-track" id="slideCaptcha_track">
... ... @@ -323,11 +323,11 @@
323 323   <div class="clearfix">
324 324   <p class="alert alert-warning alert-button-float-right">
325 325   <span class="alert-button pull-right">
326 -#if ($xcontext.user != 'XWiki.XWikiGuest')
337 + #if ($xcontext.user != 'XWiki.XWikiGuest')
327 327   <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
328 -#else
339 + #else
329 329   <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
330 -#end
341 + #end
331 331   </span>
332 332   <span class="alert-text">
333 333   ${O_submit.help-block}
... ... @@ -335,4 +335,21 @@
335 335   </p>
336 336   </div>
337 337  #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]${glue}noname")
363 + #end
364 + #end
365 +#end
338 338  {{/velocity}}