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.274
edited by Jip-jan Alunkel
on July 30, 13:27
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -1,8 +1,12 @@
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.use_captcha == "true")
4 +<div class="pagemaker">
5 + #else
6 +<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="pagemaker" data-form-product="${elementDataObj.product}" novalidate="novalidate">
7 + #end
4 4  #end
5 -#macro(createFormEnd)
9 +#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>
20 + #if($elementDataObj.use_captcha == "true")
21 +</div>
22 + #else
16 16  </form>
24 + #end
17 17  #end
18 18  #macro(createFormElement $elementDataObj)
19 19   #set($elementType = $elementDataObj.type)
... ... @@ -256,10 +256,10 @@
256 256   <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>
257 257  #end
258 258  #macro(createCaptcha $O_elementData)
259 - <span class="slideCaptcha-track" id="slideCaptcha_track">
260 - <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
267 + <span class="slideCaptcha-track" id="slideCaptcha_track" data-rgb="${O_elementData.data-rgb-track}">
268 + <span class="slideCaptcha-slider" id="slideCaptcha_slider" data-target-size="${O_elementData.data-target-size}" data-rgb="${O_elementData.data-rgb-slider}"></span>
261 261   </span>
262 - <input type="hidden" id="slideCaptcha_answer" value="droid">
270 + <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">