Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,22 +1,8 @@
1	1	{{velocity}}
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		- "class": "pagemaker",
11		- "novalidate": "novalidate"
12		- }
13		-</script>
14		-<div class="pagemaker">
15		- #else
16		-<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="pagemaker" data-form-product="${elementDataObj.product}" novalidate="novalidate">
17		- #end
	2	+#macro(createFormStart $id $product)
	3	+<form action="" id="${id}" method="post" class="pagemaker" data-form-product="${product}" novalidate="novalidate">
18	18	#end
19		-#macro(createFormEnd $elementDataObj)
	5	+#macro(createFormEnd)
20	20	<div role="alert" class="form-response-output form-validation-errors" style="display: none">
21	21	<p>
22	22	$services.localization.render('pagemaker.line.global_error_msg')
...	...	@@ -27,11 +27,7 @@
27	27	$services.localization.render('pagemaker.line.global_ok_msg')
28	28	</p>
29	29	</div>
30		- #if($elementDataObj.use_captcha == "true")
31		-</div>
32		- #else
33	33	</form>
34		- #end
35	35	#end
36	36	#macro(createFormElement $elementDataObj)
37	37	#set($elementType = $elementDataObj.type)
...	...	@@ -274,10 +274,10 @@
274	274	<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>
275	275	#end
276	276	#macro(createCaptcha $O_elementData)
277		- <span class="slideCaptcha-track" id="slideCaptcha_track" data-rgb="${O_elementData.data-rgb-track}">
278		- <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>
279	279	</span>
280		- <input type="hidden" id="slideCaptcha_answer" value="">
	262	+ <input type="hidden" id="slideCaptcha_answer" value="droid">
281	281	#end
282	282	#macro(createExpandStart $opener $value)
283	283	<div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">