Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,12 +1,8 @@
1	1	{{velocity}}
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
	2	+#macro(createFormStart $id $product)
	3	+<form action="" id="${id}" method="post" class="pagemaker" data-form-product="${product}" novalidate="novalidate">
8	8	#end
9		-#macro(createFormEnd $elementDataObj)
	5	+#macro(createFormEnd)
10	10	<div role="alert" class="form-response-output form-validation-errors" style="display: none">
11	11	<p>
12	12	$services.localization.render('pagemaker.line.global_error_msg')
...	...	@@ -17,11 +17,7 @@
17	17	$services.localization.render('pagemaker.line.global_ok_msg')
18	18	</p>
19	19	</div>
20		- #if($elementDataObj.use_captcha == "true")
21		-</div>
22		- #else
23	23	</form>
24		- #end
25	25	#end
26	26	#macro(createFormElement $elementDataObj)
27	27	#set($elementType = $elementDataObj.type)
...	...	@@ -120,7 +120,7 @@
120	120	<p${paragraphCSSClass}>
121	121	<span class="input-wrap${spanCSSClass}">
122	122	<span class="fieldset no-fieldset-border">
123		- <label for="${elementDataObj.id}">
	115	+ <label for="${elementDataObj.id}"#* class="strong"*#>
124	124	#if($elementType == "checkbox")
125	125	#createCheckboxElement($elementDataObj)
126	126	#elseif($elementType == "radio")
...	...	@@ -264,8 +264,8 @@
264	264	<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>
265	265	#end
266	266	#macro(createCaptcha $O_elementData)
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>
	259	+ <span class="slideCaptcha-track" id="slideCaptcha_track">
	260	+ <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
269	269	</span>
270	270	<input type="hidden" id="slideCaptcha_answer" value="">
271	271	#end