Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.391
edited by Jip-jan Alunkel
on February 19, 23:31
Change comment: Update document after refactoring.
To version 2.380
edited by Jip-jan Alunkel
on February 19, 19:21
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -50,11 +50,7 @@
50 50   #if($elementType == 'captcha')
51 51   #set($paragraphCSSClass = ' class="required slideCaptcha-box"')
52 52   #else
53 - #if($elementDataObj.data-required-spoof != "true")
54 - #set($paragraphCSSClass = ' class="required"')
55 - #else
56 - #set($paragraphCSSClass = ' class="required-spoof"')
57 - #end
53 + #set($paragraphCSSClass = ' class="required"')
58 58   #end
59 59   #elseif($elementDataObj.type == 'captcha')
60 60   #set($paragraphCSSClass = ' class="slideCaptcha-box"')
... ... @@ -184,11 +184,13 @@
184 184  
185 185  #macro(createSelectElement $O_elementData $O_tagName)
186 186   #set($currentSpaceName = $services.model.resolveDocument('', 'default', $doc.documentReference.lastSpaceReference).parent.getName())
187 - <select name="${O_elementData.id}" id="${O_elementData.id}" class="form-select form-control empty"#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>
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>
188 188   #if($O_elementData.placeholder)
189 -## #if($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value))
190 - <option value="" disabled="" hidden="hidden"#if($O_elementData.value == "") selected="selected"#end>${O_elementData.placeholder}</option>
191 -## #end
185 + #if($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value))
186 +#if($O_elementData.select-json)er is een json#end
187 +#if(!$O_elementData.select-json.keySet().contains($O_elementData.value))waarde zit er niet in#end
188 + <option value="" disabled="" hidden="hidden">${O_elementData.placeholder}</option>
189 + #end
192 192   #end
193 193  
194 194   ## Get the JSON data.
... ... @@ -203,6 +203,7 @@
203 203  
204 204   ## Loop through the JSON data to create the options.
205 205   #foreach($key in $json.keySet())
204 +
206 206   <option value="$key"#if($key == $O_elementData.value) selected="selected"#end>$json[$key]</option>
207 207   #end
208 208   </select>