Changes for page Macros

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -1,8 +1,20 @@
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	+<script>
	5	+ const formAttributeValues = {
	6	+ "id": "${elementDataObj.id}",
	7	+ "action": "${elementDataObj.url}",
	8	+ "method": "${elementDataObj.method}",
	9	+ "data-form-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
4	4	#end
5		-#macro(createFormEnd)
	17	+#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>
	28	+ #if($elementDataObj.use_captcha == "true")
	29	+</div>
	30	+ #else
16	16	</form>
	32	+ #end
17	17	#end
18	18	#macro(createFormElement $elementDataObj)
19	19	#set($elementType = $elementDataObj.type)
...	...	@@ -112,7 +112,7 @@
112	112	<p${paragraphCSSClass}>
113	113	<span class="input-wrap${spanCSSClass}">
114	114	<span class="fieldset no-fieldset-border">
115		- <label for="${elementDataObj.id}"#* class="strong"*#>
	131	+ <label for="${elementDataObj.id}">
116	116	#if($elementType == "checkbox")
117	117	#createCheckboxElement($elementDataObj)
118	118	#elseif($elementType == "radio")
...	...	@@ -256,8 +256,8 @@
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" aria-invalid="true">
260		- <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
	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>
261	261	</span>
262	262	<input type="hidden" id="slideCaptcha_answer" value="">
263	263	#end