Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.384
edited by Jip-jan Alunkel
on February 19, 19:54
Change comment: Update document after refactoring.
To version 2.397
edited by Jip-jan Alunkel
on March 06, 22:49
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"')
... ... @@ -64,7 +64,7 @@
64 64   #if($elementType == "select")
65 65   #set($spanCSSClass = " select-wrap")
66 66   #set($elementTagName = "select")
67 - #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")
68 68   #set($elementTagName = "input")
69 69   #elseif($elementType == "checkbox" || $elementType == "radio")
70 70   #set($spanCSSClass = " checkradio")
... ... @@ -77,62 +77,65 @@
77 77   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
78 78   #end
79 79   #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea" || $elementTagName == "captcha")
84 + #if($elementType == "hidden")
85 + #createHiddenElement($elementDataObj $elementTagName)
86 + #else
80 80   <p${paragraphCSSClass}${makeFocusable}>
81 81   <label#if($elementTagName != "captcha") for="${elementDataObj.id}"#end>
82 82   $elementDataObj.label
83 83   <span class="input-wrap${spanCSSClass}">
84 - #if($elementTagName == "select")
85 - #createSelectElement($elementDataObj $elementTagName)
86 - #elseif($elementTagName == "textarea")
87 - #createTextareaElement($elementDataObj $elementTagName)
88 - #else
89 - #if($elementType == "text")
90 - #createTextElement($elementDataObj $elementType)
91 - #elseif($elementType == "number")
92 - #if(!$elementDataObj.data-decimals)#set($elementDataObj.data-decimals = 0)#end
93 - #if(!$elementDataObj.decimals-step)#set($elementDataObj.decimals-step = 1)#end
94 - #createNumberElement($elementDataObj $elementType)
95 - #elseif($elementType == "email")
96 - #createEmailElement($elementDataObj $elementType)
97 - #elseif($elementType == "password")
98 - #createPasswordElement($elementDataObj $elementType)
99 - #elseif($elementType == "range")
100 - #if($elementDataObj.range-minmax)
101 - #set($minmax = $elementDataObj.range-minmax.split('-'))
102 - #if($minmax.size() == 2)
103 - #set($elementDataObj.range-min = $minmax[0])
104 - #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)
105 105   #end
106 - #else
107 - #set($elementDataObj.range-min = 0)
108 - #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)
109 109   #end
110 - #createRangeElement($elementDataObj $elementType)
111 - #elseif($elementType == "date")
112 - #createDateElement($elementDataObj $elementType)
113 - #elseif($elementType == "color")
114 - #createColorElement($elementDataObj $elementType)
115 - #elseif($elementType == "tel")
116 - #createTelElement($elementDataObj $elementType)
117 - #elseif($elementType == "url")
118 - #createUrlElement($elementDataObj $elementType)
119 - #elseif($elementType == "address")
120 - #createAddressElement($elementDataObj $elementType)
121 - #elseif($elementType == "captcha")
122 - #createCaptcha($elementDataObj)
123 123   #end
124 - #end
125 - #if($elementDataObj.help-block && $elementDataObj.help-block != "")
132 + #if($elementDataObj.help-block && $elementDataObj.help-block != "")
126 126   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
127 - #end
128 - #if($elementDataObj.required == "true")
134 + #end
135 + #if($elementDataObj.required == "true")
129 129   <span class="required-input-field" title="Required input"></span>
130 - #end
137 + #end
131 131   <span role="alert" class="form-not-valid-tip"></span>
132 132   </span>
133 133   </label>
134 134   </p>
135 - #if($elementDataObj.data-modal-input)
142 + #if($elementDataObj.data-modal-input)
136 136   <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">
137 137   <div class="modal-dialog modal-dialog-centered" role="document">
138 138   <div class="modal-content">
... ... @@ -141,7 +141,7 @@
141 141   <h4 class="modal-title" id="${elementDataObj.id}ModalInputHeader">$elementDataObj.label</h4>
142 142   </div>
143 143   <div class="modal-body">
144 - #foreach($entry in $elementDataObj.data-modal-input)
151 + #foreach($entry in $elementDataObj.data-modal-input)
145 145   <p>
146 146   <label for="input${foreach.count}">$entry
147 147   <span class="input-wrap">
... ... @@ -149,7 +149,7 @@
149 149   </span>
150 150   </label>
151 151   </p>
152 - #end
159 + #end
153 153   </div>
154 154   <div class="modal-footer">
155 155   <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>
... ... @@ -157,6 +157,7 @@
157 157   </div>
158 158   </div>
159 159   </div>
167 + #end
160 160   #end
161 161   #end
162 162   #if($elementTagName == "checkradio")
... ... @@ -180,11 +180,11 @@
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>
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>
184 184   #if($O_elementData.placeholder)
185 - #if($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value))
186 - <option value="" disabled="" hidden="hidden"#if($O_elementData.value == "") selected="selected"#end>${O_elementData.placeholder}</option>
187 - #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
188 188   #end
189 189  
190 190   ## Get the JSON data.
... ... @@ -209,10 +209,19 @@
209 209   <a href="#" class="btn btn-default" data-toggle="modal" data-target="#${O_elementData.id}Modal">Create</a>
210 210   #end
211 211  #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
212 212  #macro(createAddressElement $O_elementData $O_tagName)
213 - <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>
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>
214 214   <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">
215 - <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">
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">
216 216  #end
217 217  #macro(createNumberElement $O_elementData $O_tagName)
218 218   <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>