Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.386
edited by Jip-jan Alunkel
on February 19, 22:08
Change comment: Update document after refactoring.
To version 2.398
edited by Jip-jan Alunkel
on March 07, 00:18
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -50,8 +50,10 @@
50 50   #if($elementType == 'captcha')
51 51   #set($paragraphCSSClass = ' class="required slideCaptcha-box"')
52 52   #else
53 - #if($O_elementData.data-required-spoof != "true")
53 + #if($elementDataObj.data-required-spoof != "true")
54 54   #set($paragraphCSSClass = ' class="required"')
55 + #else
56 + #set($paragraphCSSClass = ' class="required-spoof"')
55 55   #end
56 56   #end
57 57   #elseif($elementDataObj.type == 'captcha')
... ... @@ -66,7 +66,7 @@
66 66   #if($elementType == "select")
67 67   #set($spanCSSClass = " select-wrap")
68 68   #set($elementTagName = "select")
69 - #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color" || $elementType == "address")
71 + #elseif($elementType == "text" || $elementType == "hidden" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color" || $elementType == "address")
70 70   #set($elementTagName = "input")
71 71   #elseif($elementType == "checkbox" || $elementType == "radio")
72 72   #set($spanCSSClass = " checkradio")
... ... @@ -79,62 +79,65 @@
79 79   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
80 80   #end
81 81   #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea" || $elementTagName == "captcha")
84 + #if($elementType == "hidden")
85 + #createHiddenElement($elementDataObj $elementTagName)
86 + #else
82 82   <p${paragraphCSSClass}${makeFocusable}>
83 83   <label#if($elementTagName != "captcha") for="${elementDataObj.id}"#end>
84 84   $elementDataObj.label
85 85   <span class="input-wrap${spanCSSClass}">
86 - #if($elementTagName == "select")
87 - #createSelectElement($elementDataObj $elementTagName)
88 - #elseif($elementTagName == "textarea")
89 - #createTextareaElement($elementDataObj $elementTagName)
90 - #else
91 - #if($elementType == "text")
92 - #createTextElement($elementDataObj $elementType)
93 - #elseif($elementType == "number")
94 - #if(!$elementDataObj.data-decimals)#set($elementDataObj.data-decimals = 0)#end
95 - #if(!$elementDataObj.decimals-step)#set($elementDataObj.decimals-step = 1)#end
96 - #createNumberElement($elementDataObj $elementType)
97 - #elseif($elementType == "email")
98 - #createEmailElement($elementDataObj $elementType)
99 - #elseif($elementType == "password")
100 - #createPasswordElement($elementDataObj $elementType)
101 - #elseif($elementType == "range")
102 - #if($elementDataObj.range-minmax)
103 - #set($minmax = $elementDataObj.range-minmax.split('-'))
104 - #if($minmax.size() == 2)
105 - #set($elementDataObj.range-min = $minmax[0])
106 - #set($elementDataObj.range-max = $minmax[1])
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)
107 107   #end
108 - #else
109 - #set($elementDataObj.range-min = 0)
110 - #set($elementDataObj.range-max = 100)
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)
111 111   #end
112 - #createRangeElement($elementDataObj $elementType)
113 - #elseif($elementType == "date")
114 - #createDateElement($elementDataObj $elementType)
115 - #elseif($elementType == "color")
116 - #createColorElement($elementDataObj $elementType)
117 - #elseif($elementType == "tel")
118 - #createTelElement($elementDataObj $elementType)
119 - #elseif($elementType == "url")
120 - #createUrlElement($elementDataObj $elementType)
121 - #elseif($elementType == "address")
122 - #createAddressElement($elementDataObj $elementType)
123 - #elseif($elementType == "captcha")
124 - #createCaptcha($elementDataObj)
125 125   #end
126 - #end
127 - #if($elementDataObj.help-block && $elementDataObj.help-block != "")
132 + #if($elementDataObj.help-block && $elementDataObj.help-block != "")
128 128   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
129 - #end
130 - #if($elementDataObj.required == "true")
134 + #end
135 + #if($elementDataObj.required == "true")
131 131   <span class="required-input-field" title="Required input"></span>
132 - #end
137 + #end
133 133   <span role="alert" class="form-not-valid-tip"></span>
134 134   </span>
135 135   </label>
136 136   </p>
137 - #if($elementDataObj.data-modal-input)
142 + #if($elementDataObj.data-modal-input)
138 138   <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">
139 139   <div class="modal-dialog modal-dialog-centered" role="document">
140 140   <div class="modal-content">
... ... @@ -143,7 +143,7 @@
143 143   <h4 class="modal-title" id="${elementDataObj.id}ModalInputHeader">$elementDataObj.label</h4>
144 144   </div>
145 145   <div class="modal-body">
146 - #foreach($entry in $elementDataObj.data-modal-input)
151 + #foreach($entry in $elementDataObj.data-modal-input)
147 147   <p>
148 148   <label for="input${foreach.count}">$entry
149 149   <span class="input-wrap">
... ... @@ -151,7 +151,7 @@
151 151   </span>
152 152   </label>
153 153   </p>
154 - #end
159 + #end
155 155   </div>
156 156   <div class="modal-footer">
157 157   <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>
... ... @@ -159,6 +159,7 @@
159 159   </div>
160 160   </div>
161 161   </div>
167 + #end
162 162   #end
163 163   #end
164 164   #if($elementTagName == "checkradio")
... ... @@ -182,11 +182,11 @@
182 182  
183 183  #macro(createSelectElement $O_elementData $O_tagName)
184 184   #set($currentSpaceName = $services.model.resolveDocument('', 'default', $doc.documentReference.lastSpaceReference).parent.getName())
185 - <select name="${O_elementData.id}" id="${O_elementData.id}" class="form-select form-control" data-value="$O_elementData.value"#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>
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>
186 186   #if($O_elementData.placeholder)
187 - #if($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value))
188 - <option value="" disabled="" hidden="hidden"#if($O_elementData.value == "") selected="selected"#end>${O_elementData.placeholder}</option>
189 - #end
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
190 190   #end
191 191  
192 192   ## Get the JSON data.
... ... @@ -211,10 +211,19 @@
211 211   <a href="#" class="btn btn-default" data-toggle="modal" data-target="#${O_elementData.id}Modal">Create</a>
212 212   #end
213 213  #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
214 214  #macro(createAddressElement $O_elementData $O_tagName)
215 - <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>
216 - <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">
217 - <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">
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>
225 + <input type="hidden" id="pmLatlong" name="pmLatlong" 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">
218 218  #end
219 219  #macro(createNumberElement $O_elementData $O_tagName)
220 220   <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>