Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.275
edited by Jip-jan Alunkel
on July 30, 14:07
Change comment: Update document after refactoring.
To version 2.267
edited by Jip-jan Alunkel
on July 26, 17:35
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -1,20 +1,8 @@
1 1  {{velocity}}
2 -#macro(createFormStart $elementDataObj)
3 - #if($elementDataObj.use_captcha == "true")
4 -<script>
5 - var fav = {
6 - "id": "${elementDataObj.id}",
7 - "action": "${elementDataObj.url}",
8 - "method": "${elementDataObj.method}",
9 - "product": "${elementDataObj.product}"
10 - }
11 -</script>
12 -<div class="pagemaker">
13 - #else
14 -<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="pagemaker" data-form-product="${elementDataObj.product}" novalidate="novalidate">
15 - #end
2 +#macro(createFormStart $id $product)
3 +<form action="" id="${id}" method="post" class="pagemaker" data-form-product="${product}" novalidate="novalidate">
16 16  #end
17 -#macro(createFormEnd $elementDataObj)
5 +#macro(createFormEnd)
18 18   <div role="alert" class="form-response-output form-validation-errors" style="display: none">
19 19   <p>
20 20  $services.localization.render('pagemaker.line.global_error_msg')
... ... @@ -25,11 +25,7 @@
25 25  $services.localization.render('pagemaker.line.global_ok_msg')
26 26   </p>
27 27   </div>
28 - #if($elementDataObj.use_captcha == "true")
29 -</div>
30 - #else
31 31  </form>
32 - #end
33 33  #end
34 34  #macro(createFormElement $elementDataObj)
35 35   #set($elementType = $elementDataObj.type)
... ... @@ -128,7 +128,7 @@
128 128   <p${paragraphCSSClass}>
129 129   <span class="input-wrap${spanCSSClass}">
130 130   <span class="fieldset no-fieldset-border">
131 - <label for="${elementDataObj.id}">
115 + <label for="${elementDataObj.id}"#* class="strong"*#>
132 132   #if($elementType == "checkbox")
133 133  #createCheckboxElement($elementDataObj)
134 134   #elseif($elementType == "radio")
... ... @@ -272,10 +272,10 @@
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>
259 + <span class="slideCaptcha-track" id="slideCaptcha_track">
260 + <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
277 277   </span>
278 - <input type="hidden" id="slideCaptcha_answer" value="">
262 + <input type="hidden" id="slideCaptcha_answer" value="droid">
279 279  #end
280 280  #macro(createExpandStart $opener $value)
281 281   <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">