Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.397
edited by Jip-jan Alunkel
on March 06, 22:49
Change comment: Update document after refactoring.
To version 2.390
edited by Jip-jan Alunkel
on February 19, 23:16
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -68,7 +68,7 @@
68 68   #if($elementType == "select")
69 69   #set($spanCSSClass = " select-wrap")
70 70   #set($elementTagName = "select")
71 - #elseif($elementType == "text" || $elementType == "hidden" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color" || $elementType == "address")
71 + #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color" || $elementType == "address")
72 72   #set($elementTagName = "input")
73 73   #elseif($elementType == "checkbox" || $elementType == "radio")
74 74   #set($spanCSSClass = " checkradio")
... ... @@ -81,65 +81,62 @@
81 81   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
82 82   #end
83 83   #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea" || $elementTagName == "captcha")
84 - #if($elementType == "hidden")
85 - #createHiddenElement($elementDataObj $elementTagName)
86 - #else
87 87   <p${paragraphCSSClass}${makeFocusable}>
88 88   <label#if($elementTagName != "captcha") for="${elementDataObj.id}"#end>
89 89   $elementDataObj.label
90 90   <span class="input-wrap${spanCSSClass}">
91 - #if($elementTagName == "select")
92 - #createSelectElement($elementDataObj $elementTagName)
93 - #elseif($elementTagName == "textarea")
94 - #createTextareaElement($elementDataObj $elementTagName)
95 - #else
96 - #if($elementType == "text")
97 - #createTextElement($elementDataObj $elementType)
98 - #elseif($elementType == "number")
99 - #if(!$elementDataObj.data-decimals)#set($elementDataObj.data-decimals = 0)#end
100 - #if(!$elementDataObj.decimals-step)#set($elementDataObj.decimals-step = 1)#end
101 - #createNumberElement($elementDataObj $elementType)
102 - #elseif($elementType == "email")
103 - #createEmailElement($elementDataObj $elementType)
104 - #elseif($elementType == "password")
105 - #createPasswordElement($elementDataObj $elementType)
106 - #elseif($elementType == "range")
107 - #if($elementDataObj.range-minmax)
108 - #set($minmax = $elementDataObj.range-minmax.split('-'))
109 - #if($minmax.size() == 2)
110 - #set($elementDataObj.range-min = $minmax[0])
111 - #set($elementDataObj.range-max = $minmax[1])
112 - #end
113 - #else
114 - #set($elementDataObj.range-min = 0)
115 - #set($elementDataObj.range-max = 100)
88 + #if($elementTagName == "select")
89 + #createSelectElement($elementDataObj $elementTagName)
90 + #elseif($elementTagName == "textarea")
91 + #createTextareaElement($elementDataObj $elementTagName)
92 + #else
93 + #if($elementType == "text")
94 + #createTextElement($elementDataObj $elementType)
95 + #elseif($elementType == "number")
96 + #if(!$elementDataObj.data-decimals)#set($elementDataObj.data-decimals = 0)#end
97 + #if(!$elementDataObj.decimals-step)#set($elementDataObj.decimals-step = 1)#end
98 + #createNumberElement($elementDataObj $elementType)
99 + #elseif($elementType == "email")
100 + #createEmailElement($elementDataObj $elementType)
101 + #elseif($elementType == "password")
102 + #createPasswordElement($elementDataObj $elementType)
103 + #elseif($elementType == "range")
104 + #if($elementDataObj.range-minmax)
105 + #set($minmax = $elementDataObj.range-minmax.split('-'))
106 + #if($minmax.size() == 2)
107 + #set($elementDataObj.range-min = $minmax[0])
108 + #set($elementDataObj.range-max = $minmax[1])
116 116   #end
117 - #createRangeElement($elementDataObj $elementType)
118 - #elseif($elementType == "date")
119 - #createDateElement($elementDataObj $elementType)
120 - #elseif($elementType == "color")
121 - #createColorElement($elementDataObj $elementType)
122 - #elseif($elementType == "tel")
123 - #createTelElement($elementDataObj $elementType)
124 - #elseif($elementType == "url")
125 - #createUrlElement($elementDataObj $elementType)
126 - #elseif($elementType == "address")
127 - #createAddressElement($elementDataObj $elementType)
128 - #elseif($elementType == "captcha")
129 - #createCaptcha($elementDataObj)
110 + #else
111 + #set($elementDataObj.range-min = 0)
112 + #set($elementDataObj.range-max = 100)
130 130   #end
114 + #createRangeElement($elementDataObj $elementType)
115 + #elseif($elementType == "date")
116 + #createDateElement($elementDataObj $elementType)
117 + #elseif($elementType == "color")
118 + #createColorElement($elementDataObj $elementType)
119 + #elseif($elementType == "tel")
120 + #createTelElement($elementDataObj $elementType)
121 + #elseif($elementType == "url")
122 + #createUrlElement($elementDataObj $elementType)
123 + #elseif($elementType == "address")
124 + #createAddressElement($elementDataObj $elementType)
125 + #elseif($elementType == "captcha")
126 + #createCaptcha($elementDataObj)
131 131   #end
132 - #if($elementDataObj.help-block && $elementDataObj.help-block != "")
128 + #end
129 + #if($elementDataObj.help-block && $elementDataObj.help-block != "")
133 133   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
134 - #end
135 - #if($elementDataObj.required == "true")
131 + #end
132 + #if($elementDataObj.required == "true")
136 136   <span class="required-input-field" title="Required input"></span>
137 - #end
134 + #end
138 138   <span role="alert" class="form-not-valid-tip"></span>
139 139   </span>
140 140   </label>
141 141   </p>
142 - #if($elementDataObj.data-modal-input)
139 + #if($elementDataObj.data-modal-input)
143 143   <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">
144 144   <div class="modal-dialog modal-dialog-centered" role="document">
145 145   <div class="modal-content">
... ... @@ -148,7 +148,7 @@
148 148   <h4 class="modal-title" id="${elementDataObj.id}ModalInputHeader">$elementDataObj.label</h4>
149 149   </div>
150 150   <div class="modal-body">
151 - #foreach($entry in $elementDataObj.data-modal-input)
148 + #foreach($entry in $elementDataObj.data-modal-input)
152 152   <p>
153 153   <label for="input${foreach.count}">$entry
154 154   <span class="input-wrap">
... ... @@ -156,7 +156,7 @@
156 156   </span>
157 157   </label>
158 158   </p>
159 - #end
156 + #end
160 160   </div>
161 161   <div class="modal-footer">
162 162   <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>
... ... @@ -164,7 +164,6 @@
164 164   </div>
165 165   </div>
166 166   </div>
167 - #end
168 168   #end
169 169   #end
170 170   #if($elementTagName == "checkradio")
... ... @@ -188,11 +188,11 @@
188 188  
189 189  #macro(createSelectElement $O_elementData $O_tagName)
190 190   #set($currentSpaceName = $services.model.resolveDocument('', 'default', $doc.documentReference.lastSpaceReference).parent.getName())
191 - <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>
187 + <select name="${O_elementData.id}" id="${O_elementData.id}" class="form-select form-control empty"#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>
192 192   #if($O_elementData.placeholder)
193 -## #if($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value))
194 - <option value="" disabled=""#if($O_elementData.value == "") selected="selected"#end>${O_elementData.placeholder}</option>
195 -## #end
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
196 196   #end
197 197  
198 198   ## Get the JSON data.
... ... @@ -217,19 +217,10 @@
217 217   <a href="#" class="btn btn-default" data-toggle="modal" data-target="#${O_elementData.id}Modal">Create</a>
218 218   #end
219 219  #end
220 -#macro(createHiddenElement $O_elementData $O_tagName)
221 - <input type="hidden" id="${O_elementData.id}" name="${O_elementData.id}" value="${O_elementData.value}"#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"#end>
222 -#end
223 223  #macro(createAddressElement $O_elementData $O_tagName)
224 - <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-page-name) data-page-name="${O_elementData.data-page-name}"#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>
217 + <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-page-name) data-page-name="${O_elementData.data-page-name}"#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>
225 225   <input type="hidden" id="latlong" name="latlong" value="" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="latlong">
226 - <input type="hidden" id="pmCountry" name="pmCountry" value="" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="pmCountry">
227 - <input type="hidden" id="pmState" name="pmState" value="" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="pmState">
228 - <input type="hidden" id="pmCounty" name="pmCounty" value="" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="pmCounty">
229 - <input type="hidden" id="pmPostcode" name="pmPostcode" value="" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="pmPostcode">
230 - <input type="hidden" id="pmCity" name="pmCity" value="" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="pmCity">
231 - <input type="hidden" id="pmStreet" name="pmStreet" value="" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="pmStreet">
232 - <input type="hidden" id="pmHousenumber" name="pmHousenumber" value="" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="pmHousenumber">
219 + <input type="hidden" id="city" name="city" value="" data-create-xobj="${O_elementData.data-create-xobj}" data-xobj-classname="${O_elementData.data-xobj-classname}" data-xobj-fieldname="city">
233 233  #end
234 234  #macro(createNumberElement $O_elementData $O_tagName)
235 235   <input type="number" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end autocomplete="off" min="0" pattern="[0-9]*[.,]?[0-9]+" data-decimals="${O_elementData.data-decimals}" step="${O_elementData.decimal-step}"#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-query-type) data-query-type="${O_elementData.data-query-type}"#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>