Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.395
edited by Jip-jan Alunkel
on March 06, 20:46
Change comment: Update document after refactoring.
To version 2.396
edited by Jip-jan Alunkel
on March 06, 22:39
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -81,62 +81,65 @@
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
84 84   <p${paragraphCSSClass}${makeFocusable}>
85 85   <label#if($elementTagName != "captcha") for="${elementDataObj.id}"#end>
86 86   $elementDataObj.label
87 87   <span class="input-wrap${spanCSSClass}">
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])
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)
109 109   #end
110 - #else
111 - #set($elementDataObj.range-min = 0)
112 - #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)
113 113   #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)
127 127   #end
128 - #end
129 - #if($elementDataObj.help-block && $elementDataObj.help-block != "")
132 + #if($elementDataObj.help-block && $elementDataObj.help-block != "")
130 130   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
131 - #end
132 - #if($elementDataObj.required == "true")
134 + #end
135 + #if($elementDataObj.required == "true")
133 133   <span class="required-input-field" title="Required input"></span>
134 - #end
137 + #end
135 135   <span role="alert" class="form-not-valid-tip"></span>
136 136   </span>
137 137   </label>
138 138   </p>
139 - #if($elementDataObj.data-modal-input)
142 + #if($elementDataObj.data-modal-input)
140 140   <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">
141 141   <div class="modal-dialog modal-dialog-centered" role="document">
142 142   <div class="modal-content">
... ... @@ -145,7 +145,7 @@
145 145   <h4 class="modal-title" id="${elementDataObj.id}ModalInputHeader">$elementDataObj.label</h4>
146 146   </div>
147 147   <div class="modal-body">
148 - #foreach($entry in $elementDataObj.data-modal-input)
151 + #foreach($entry in $elementDataObj.data-modal-input)
149 149   <p>
150 150   <label for="input${foreach.count}">$entry
151 151   <span class="input-wrap">
... ... @@ -153,7 +153,7 @@
153 153   </span>
154 154   </label>
155 155   </p>
156 - #end
159 + #end
157 157   </div>
158 158   <div class="modal-footer">
159 159   <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>
... ... @@ -161,6 +161,7 @@
161 161   </div>
162 162   </div>
163 163   </div>
167 + #end
164 164   #end
165 165   #end
166 166   #if($elementTagName == "checkradio")
... ... @@ -213,8 +213,11 @@
213 213   <a href="#" class="btn btn-default" data-toggle="modal" data-target="#${O_elementData.id}Modal">Create</a>
214 214   #end
215 215  #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
216 216  #macro(createAddressElement $O_elementData $O_tagName)
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>
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>
218 218   <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">
219 219   <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">
220 220   <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">