Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.276
edited by Jip-jan Alunkel
on July 30, 14:31
Change comment: Update document after refactoring.
To version 2.285
edited by Jip-jan Alunkel
on August 15, 14:33
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -1,5 +1,10 @@
1 1  {{velocity}}
2 2  #macro(createFormStart $elementDataObj)
3 + #if($elementDataObj.active == "false")
4 + #set($formclass = "pagemaker")
5 + #else
6 + #set($formclass = "pagemaker active")
7 + #end
3 3   #if($elementDataObj.use_captcha == "true")
4 4  <script>
5 5   const formAttributeValues = {
... ... @@ -6,12 +6,14 @@
6 6   "id": "${elementDataObj.id}",
7 7   "action": "${elementDataObj.url}",
8 8   "method": "${elementDataObj.method}",
9 - "data-form-product": "${elementDataObj.product}"
14 + "data-form-product": "${elementDataObj.product}",
15 + "class": "$formclass",
16 + "novalidate": "novalidate"
10 10   }
11 11  </script>
12 -<div class="pagemaker">
19 +<div class="pagemaker active">
13 13   #else
14 -<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="pagemaker" data-form-product="${elementDataObj.product}" novalidate="novalidate">
21 +<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="$formclass" data-form-product="${elementDataObj.product}" novalidate="novalidate">
15 15   #end
16 16  #end
17 17  #macro(createFormEnd $elementDataObj)
... ... @@ -151,7 +151,7 @@
151 151   <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
152 152   #end
153 153   #end
154 - #set($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
161 + #set($mydoc = $xwiki.getDocument('assets.pagemaker.classes.pagemakerClass'))
155 155   #if($mydoc.isNew() && $hasProgramming)
156 156   #set ($myinternaldoc = $mydoc.getDocument())
157 157   #set ($myclass = $myinternaldoc.getXClass())
... ... @@ -179,7 +179,7 @@
179 179   #set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute())
180 180   #foreach($item in $result_add_xobj)
181 181   #set($doc = $xwiki.getDocument("${space}.${item}.WebHome"))
182 - #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
189 + #set($rightXObj = $doc.getObject("assets.pagemaker.classes.pagemakerClass", true))
183 183   #set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
184 184   #set($discard = $doc.save())
185 185   #end
... ... @@ -187,7 +187,7 @@
187 187  
188 188   #set($spaceExcludeRef = $space.replaceAll('([%_!])', '!$1').concat(".${codespace}"))
189 189   #set($spaceLikeRef = $space.replaceAll('([%_!])', '!$1').concat('.%'))
190 - #set($query = $services.query.xwql("from doc.object(assets.pagemaker.pagemakerClass) met where doc.space like :space and doc.space <> :spaceExclude and doc.name <> 'WebPreferences' order by met.pmSpaceOrder asc"))
197 + #set($query = $services.query.xwql("from doc.object(assets.pagemaker.classes.pagemakerClass) met where doc.space like :space and doc.space <> :spaceExclude and doc.name <> 'WebPreferences' order by met.pmSpaceOrder asc"))
191 191   #set($result = $query.bindValue('space', $spaceLikeRef).bindValue('spaceExclude', $spaceExcludeRef).addFilter('unique').execute())
192 192  
193 193   ## Generate the select options from all child spaces that have the 'assets.pagemaker.pagemakerClass' XClass.
... ... @@ -209,7 +209,7 @@
209 209   #if(!$isGuest && $O_elementData.select-json-to-spaces == "true")
210 210   #set($spaceDocTitle = $json.get($key))
211 211   #set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name.
212 - #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass", true)) ## Get or create the needed object.
219 + #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.classes.pagemakerClass", true)) ## Get or create the needed object.
213 213   #set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
214 214   #set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
215 215   #if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.
... ... @@ -238,7 +238,7 @@
238 238   #end
239 239  #end
240 240  #macro(createTextElement $O_elementData $O_tagName)
241 - <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-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>
248 + <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-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>
242 242  #end
243 243  #macro(createNumberElement $O_elementData $O_tagName)
244 244   <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>
... ... @@ -272,8 +272,8 @@
272 272   <textarea class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end#if($O_elementData.textarea-rows) rows="$O_elementData.textarea-rows"#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></textarea>
273 273  #end
274 274  #macro(createCaptcha $O_elementData)
275 - <span class="slideCaptcha-track" id="slideCaptcha_track" data-rgb="${O_elementData.data-rgb-track}">
276 - <span class="slideCaptcha-slider" id="slideCaptcha_slider" data-target-size="${O_elementData.data-target-size}" data-rgb="${O_elementData.data-rgb-slider}"></span>
282 + <span class="slideCaptcha-track" id="slideCaptcha_track">
283 + <span class="slideCaptcha-slider" id="slideCaptcha_slider" data-target-size="${O_elementData.data-target-size}""></span>
277 277   </span>
278 278   <input type="hidden" id="slideCaptcha_answer" value="">
279 279  #end