Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.272
edited by Jip-jan Alunkel
on July 26, 23:14
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,8 +1,27 @@
1 1  {{velocity}}
2 -#macro(createFormStart $id $product)
3 -<form action="" id="${id}" method="post" class="pagemaker" data-form-product="${product}" novalidate="novalidate">
2 +#macro(createFormStart $elementDataObj)
3 + #if($elementDataObj.active == "false")
4 + #set($formclass = "pagemaker")
5 + #else
6 + #set($formclass = "pagemaker active")
7 + #end
8 + #if($elementDataObj.use_captcha == "true")
9 +<script>
10 + const formAttributeValues = {
11 + "id": "${elementDataObj.id}",
12 + "action": "${elementDataObj.url}",
13 + "method": "${elementDataObj.method}",
14 + "data-form-product": "${elementDataObj.product}",
15 + "class": "$formclass",
16 + "novalidate": "novalidate"
17 + }
18 +</script>
19 +<div class="pagemaker active">
20 + #else
21 +<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="$formclass" data-form-product="${elementDataObj.product}" novalidate="novalidate">
22 + #end
4 4  #end
5 -#macro(createFormEnd)
24 +#macro(createFormEnd $elementDataObj)
6 6   <div role="alert" class="form-response-output form-validation-errors" style="display: none">
7 7   <p>
8 8  $services.localization.render('pagemaker.line.global_error_msg')
... ... @@ -13,7 +13,11 @@
13 13  $services.localization.render('pagemaker.line.global_ok_msg')
14 14   </p>
15 15   </div>
35 + #if($elementDataObj.use_captcha == "true")
36 +</div>
37 + #else
16 16  </form>
39 + #end
17 17  #end
18 18  #macro(createFormElement $elementDataObj)
19 19   #set($elementType = $elementDataObj.type)
... ... @@ -135,7 +135,7 @@
135 135   <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
136 136   #end
137 137   #end
138 - #set($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
161 + #set($mydoc = $xwiki.getDocument('assets.pagemaker.classes.pagemakerClass'))
139 139   #if($mydoc.isNew() && $hasProgramming)
140 140   #set ($myinternaldoc = $mydoc.getDocument())
141 141   #set ($myclass = $myinternaldoc.getXClass())
... ... @@ -163,7 +163,7 @@
163 163   #set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute())
164 164   #foreach($item in $result_add_xobj)
165 165   #set($doc = $xwiki.getDocument("${space}.${item}.WebHome"))
166 - #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
189 + #set($rightXObj = $doc.getObject("assets.pagemaker.classes.pagemakerClass", true))
167 167   #set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
168 168   #set($discard = $doc.save())
169 169   #end
... ... @@ -171,7 +171,7 @@
171 171  
172 172   #set($spaceExcludeRef = $space.replaceAll('([%_!])', '!$1').concat(".${codespace}"))
173 173   #set($spaceLikeRef = $space.replaceAll('([%_!])', '!$1').concat('.%'))
174 - #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"))
175 175   #set($result = $query.bindValue('space', $spaceLikeRef).bindValue('spaceExclude', $spaceExcludeRef).addFilter('unique').execute())
176 176  
177 177   ## Generate the select options from all child spaces that have the 'assets.pagemaker.pagemakerClass' XClass.
... ... @@ -193,7 +193,7 @@
193 193   #if(!$isGuest && $O_elementData.select-json-to-spaces == "true")
194 194   #set($spaceDocTitle = $json.get($key))
195 195   #set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name.
196 - #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.
197 197   #set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
198 198   #set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
199 199   #if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.
... ... @@ -222,7 +222,7 @@
222 222   #end
223 223  #end
224 224  #macro(createTextElement $O_elementData $O_tagName)
225 - <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>
226 226  #end
227 227  #macro(createNumberElement $O_elementData $O_tagName)
228 228   <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>
... ... @@ -257,9 +257,9 @@
257 257  #end
258 258  #macro(createCaptcha $O_elementData)
259 259   <span class="slideCaptcha-track" id="slideCaptcha_track">
260 - <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
283 + <span class="slideCaptcha-slider" id="slideCaptcha_slider" data-target-size="${O_elementData.data-target-size}""></span>
261 261   </span>
262 - <input type="hidden" id="slideCaptcha_answer" value="droid">
285 + <input type="hidden" id="slideCaptcha_answer" value="">
263 263  #end
264 264  #macro(createExpandStart $opener $value)
265 265   <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">