Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.118
edited by Jip-jan Alunkel
on July 02, 22:44
Change comment: Update document after refactoring.
To version 2.135
edited by Jip-jan Alunkel
on July 03, 13:57
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -98,14 +98,14 @@
98 98   #if($elementTagName == "checkradio")
99 99   <p${requiredCSSClass}>
100 100   <span class="input-wrap${addedCSSClass}">
101 - <span class="fieldset no-fieldset-border">
102 - <label for="${elementDataObj.id}" class="strong">
101 +## <span class="fieldset no-fieldset-border">
102 + <label for="${elementDataObj.id}"#* class="strong"*#>
103 103   #if($elementType == "checkbox")
104 104  #createCheckboxElement($elementDataObj)
105 105   #elseif($elementType == "radio")
106 106   #end
107 107   </label>
108 - </span>
108 +## </span>
109 109   </span>
110 110   </p>
111 111   #end
... ... @@ -116,8 +116,11 @@
116 116  
117 117  #macro(createSelectElement $O_elementData $O_tagName)
118 118   <select class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#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.data-set-space}) data-set-space="${O_elementData.data-set-space}"#end#if($O_elementData.select-spaces-json) data-select-spaces-json="true"#end name="${O_elementData.id}" id="${O_elementData.id}">
119 - #if($O_elementData.placeholder && ($O_elementData.select-json && $O_elementData.select-json.keySet().contains($O_elementData.value)))
119 + #if($O_elementData.placeholder)
120 + #if($O_elementData.select-json && $O_elementData.select-json.keySet().contains($O_elementData.value))
121 + #else
120 120   <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
123 + #end
121 121   #end
122 122   #set($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
123 123   #if($mydoc.isNew() && $hasProgramming)
... ... @@ -190,7 +190,7 @@
190 190   #end
191 191   #end
192 192   #end
193 - <option value="$key"#if($O_elementData.value=="$key") selected=""#end>$spaceDocTitle</option>
196 + <option value="$key"#if($O_elementData.value=="$key") selected="selected"#end>$spaceDocTitle</option>
194 194   #end
195 195   #end
196 196   </select>
... ... @@ -226,7 +226,8 @@
226 226   <input type="url" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}" autocomplete="off" pattern="https?://.*"#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-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>
227 227  #end
228 228  #macro(createCheckboxElement $O_elementData)
229 - <input type="checkbox" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#end value="${O_elementData.value}"#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>$O_elementData.label
232 + <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.aria-label) aria-label="${O_elementData.aria-label}"#end>$O_elementData.label
233 + <input name="${O_elementData.id}" type="hidden"#if($O_elementData.value=="1") value="0"#else value="1"#end>
230 230  #end
231 231  #macro(createTextareaElement $O_elementData $O_tagName)
232 232   <textarea class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#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>