Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.381
edited by Jip-jan Alunkel
on February 19, 19:22
Change comment: Update document after refactoring.
To version 2.389
edited by Jip-jan Alunkel
on February 19, 22:17
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -50,7 +50,11 @@
50 50   #if($elementType == 'captcha')
51 51   #set($paragraphCSSClass = ' class="required slideCaptcha-box"')
52 52   #else
53 - #set($paragraphCSSClass = ' class="required"')
53 + #if($elementDataObj.data-required-spoof != "true")
54 + #set($paragraphCSSClass = ' class="required"')
55 + #else
56 + #set($paragraphCSSClass = ' class="required-spoof"')
57 + #end
54 54   #end
55 55   #elseif($elementDataObj.type == 'captcha')
56 56   #set($paragraphCSSClass = ' class="slideCaptcha-box"')
... ... @@ -180,10 +180,10 @@
180 180  
181 181  #macro(createSelectElement $O_elementData $O_tagName)
182 182   #set($currentSpaceName = $services.model.resolveDocument('', 'default', $doc.documentReference.lastSpaceReference).parent.getName())
183 -<select name="${O_elementData.id}" id="${O_elementData.id}" data-value="$O_elementData.value" class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#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}" data-parent-space="${currentSpaceName}"#end#if($O_elementData.data-space-xobj-classname) data-space-xobj-classname="${O_elementData.data-space-xobj-classname}"#end>
187 + <select name="${O_elementData.id}" id="${O_elementData.id}" class="form-select form-control"#if($O_elementData.data-required-spoof) data-required-spoof="true"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#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}" data-parent-space="${currentSpaceName}"#end#if($O_elementData.data-space-xobj-classname) data-space-xobj-classname="${O_elementData.data-space-xobj-classname}"#end>
184 184   #if($O_elementData.placeholder)
185 185   #if($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value))
186 - <option value="" disabled="" hidden="hidden">${O_elementData.placeholder}</option>
190 + <option value="" disabled="" hidden="hidden"#if($O_elementData.value == "") selected="selected"#end>${O_elementData.placeholder}</option>
187 187   #end
188 188   #end
189 189  
... ... @@ -199,7 +199,6 @@
199 199  
200 200   ## Loop through the JSON data to create the options.
201 201   #foreach($key in $json.keySet())
202 -
203 203   <option value="$key"#if($key == $O_elementData.value) selected="selected"#end>$json[$key]</option>
204 204   #end
205 205   </select>