Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.321
edited by Jip-jan Alunkel
on August 19, 18:57
Change comment: Update document after refactoring.
To version 2.314
edited by Jip-jan Alunkel
on August 16, 16:53
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -131,7 +131,7 @@
131 131   </label>
132 132   </p>
133 133   #if($elementDataObj.data-modal-input)
134 - <div class="modal fade modal-input" id="${elementDataObj.id}Modal" tabindex="-1" role="dialog" data-modal-input-origin="${elementDataObj.id}" data-modal-input-glue="${elementDataObj.data-modal-input-glue}" aria-labelledby="myModalLabel">
134 + <div class="modal fade modal-input" id="${elementDataObj.id}Modal" tabindex="-1" role="dialog" data-modal-input-origin="${elementDataObj.id}" data-modal-input-glue="${O_elementData.data-modal-input-glue}" aria-labelledby="myModalLabel">
135 135   <div class="modal-dialog" role="document">
136 136   <div class="modal-content">
137 137   <div class="modal-header">
... ... @@ -150,7 +150,7 @@
150 150   #end
151 151   </div>
152 152   <div class="modal-footer">
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>
153 + <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button><button type="button" id="clearInput" class="btn btn-primary" data-dismiss="modal">Clear</button><button type="button" id="copyToInput" class="btn btn-success">Save changes</button>
154 154   </div>
155 155   </div>
156 156   </div>
... ... @@ -305,18 +305,7 @@
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 -
312 312   <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>
320 320  #end
321 321  #macro(createCaptcha $O_elementData)
322 322   <span class="slideCaptcha-track" id="slideCaptcha_track">