Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.283
edited by Jip-jan Alunkel
on August 09, 14:15
Change comment: Update document after refactoring.
To version 2.272
edited by Jip-jan Alunkel
on July 26, 23:14
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -1,27 +1,8 @@
1 1  {{velocity}}
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">
20 - #else
21 -<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="$formclass" data-form-product="${elementDataObj.product}" novalidate="novalidate">
22 - #end
2 +#macro(createFormStart $id $product)
3 +<form action="" id="${id}" method="post" class="pagemaker" data-form-product="${product}" novalidate="novalidate">
23 23  #end
24 -#macro(createFormEnd $elementDataObj)
5 +#macro(createFormEnd)
25 25   <div role="alert" class="form-response-output form-validation-errors" style="display: none">
26 26   <p>
27 27  $services.localization.render('pagemaker.line.global_error_msg')
... ... @@ -32,11 +32,7 @@
32 32  $services.localization.render('pagemaker.line.global_ok_msg')
33 33   </p>
34 34   </div>
35 - #if($elementDataObj.use_captcha == "true")
36 -</div>
37 - #else
38 38  </form>
39 - #end
40 40  #end
41 41  #macro(createFormElement $elementDataObj)
42 42   #set($elementType = $elementDataObj.type)
... ... @@ -245,7 +245,7 @@
245 245   #end
246 246  #end
247 247  #macro(createTextElement $O_elementData $O_tagName)
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>
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>
249 249  #end
250 250  #macro(createNumberElement $O_elementData $O_tagName)
251 251   <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>
... ... @@ -280,9 +280,9 @@
280 280  #end
281 281  #macro(createCaptcha $O_elementData)
282 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>
260 + <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
284 284   </span>
285 - <input type="hidden" id="slideCaptcha_answer" value="">
262 + <input type="hidden" id="slideCaptcha_answer" value="droid">
286 286  #end
287 287  #macro(createExpandStart $opener $value)
288 288   <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">