Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,8 +1,22 @@
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	+ "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
4	4	#end
5		-#macro(createFormEnd)
	19	+#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>
	30	+ #if($elementDataObj.use_captcha == "true")
	31	+</div>
	32	+ #else
16	16	</form>
	34	+ #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"*#>
	133	+ <label for="${elementDataObj.id}">
116	116	#if($elementType == "checkbox")
117	117	#createCheckboxElement($elementDataObj)
118	118	#elseif($elementType == "radio")
...	...	@@ -222,7 +222,7 @@
222	222	#end
223	223	#end
224	224	#macro(createTextElement $O_elementData $O_tagName)
225		- <input type="text" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end autocomplete="off"#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#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#if($O_elementData.data-pattern) data-pattern="${O_elementData.data-pattern}"#end#if($O_elementData.data-auto-first-capital) data-auto-first-capital="${O_elementData.data-auto-first-capital}"#end#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}" data-query-reference="${O_elementData.data-query-reference}"#end#if($O_elementData.data-query-list-type) data-query-list-type="${O_elementData.data-query-list-type}"#end#if($O_elementData.data-query-list-header) data-query-list-header="${O_elementData.data-query-list-header}"#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#end#if($O_elementData.data-create-page) data-create-page="${O_elementData.data-create-page}"#end#if($O_elementData.data-query-scope) data-query-scope="${O_elementData.data-query-scope}"#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"#end>
	243	+ <input type="text" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end autocomplete="off"#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#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#if($O_elementData.data-pattern) data-pattern="${O_elementData.data-pattern}"#end#if($O_elementData.data-auto-first-capital) data-auto-first-capital="${O_elementData.data-auto-first-capital}"#end#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}" data-query-reference="${O_elementData.data-query-reference}"#end#if($O_elementData.data-query-list-type) data-query-list-type="${O_elementData.data-query-list-type}"#end#if($O_elementData.data-query-list-header) data-query-list-header="${O_elementData.data-query-list-header}"#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#end#if($O_elementData.data-create-page) data-create-page="${O_elementData.data-create-page}"#end#if($O_elementData.data-query-scope) data-query-scope="${O_elementData.data-query-scope}"#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"#end#if($O_elementData.data-ajax-check) data-ajax-check="${O_elementData.data-ajax-check}"#end>
226	226	#end
227	227	#macro(createNumberElement $O_elementData $O_tagName)
228	228	<input type="number" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end autocomplete="off" min="0" pattern="[0-9]*[.,]?[0-9]+" data-decimals="${O_elementData.data-decimals}" step="${O_elementData.decimal-step}"#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#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#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}"#end#if($O_elementData.data-query-list-type) data-query-list-type="${O_elementData.data-query-list-type}"#end#if($O_elementData.data-query-list-header) data-query-list-header="${O_elementData.data-query-list-header}"#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#end#if($O_elementData.data-create-page) data-create-page="${O_elementData.data-create-page}"#end#if($O_elementData.data-query-scope) data-query-scope="${O_elementData.data-query-scope}"#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"#end>
...	...	@@ -257,7 +257,7 @@
257	257	#end
258	258	#macro(createCaptcha $O_elementData)
259	259	<span class="slideCaptcha-track" id="slideCaptcha_track">
260		- <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
	278	+ <span class="slideCaptcha-slider" id="slideCaptcha_slider" data-target-size="${O_elementData.data-target-size}""></span>
261	261	</span>
262	262	<input type="hidden" id="slideCaptcha_answer" value="">
263	263	#end