Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -18,37 +18,46 @@
18	18	#macro(createFormElement $elementDataObj)
19	19	#set($elementType = $elementDataObj.type)
20	20	#set($elementTagName = '')
21		- #set($requiredCSSClass = '')
	21	+ #set($paragraphCSSClass = '')
22	22	#set($makeFocusable = '')
23		- #set($addedCSSClass = '')
	23	+ #set($spanCSSClass = '')
24	24	#set($hint = '')
25	25	#set($placeholder = '')
26	26	#if($elementDataObj.required == 'true')
27		- #set($requiredCSSClass = ' class="required"')
	27	+ #if($elementType == 'captcha')
	28	+ #set($paragraphCSSClass = ' class="required slideCaptcha-box"')
	29	+ #else
	30	+ #set($paragraphCSSClass = ' class="required"')
	31	+ #end
	32	+ #elseif($elementDataObj.type == 'captcha')
	33	+ #set($paragraphCSSClass = ' class="slideCaptcha-box"')
28	28	#end
29	29	#if($elementDataObj.data-query-type)
30	30	#set($makeFocusable = ' tabindex="-1"')
31	31	#end
	38	+ #if($elementDataObj.type == 'captcha')
	39	+ #set($captchaClass = ' class="slideCaptcha-box"')
	40	+ #end
32	32	#if($elementType == "select")
33		- #set($addedCSSClass = " select-wrap")
	42	+ #set($spanCSSClass = " select-wrap")
34	34	#set($elementTagName = "select")
35	35	#elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color")
36	36	#set($elementTagName = "input")
37	37	#elseif($elementType == "checkbox" || $elementType == "radio")
38		- #set($addedCSSClass = " checkradio")
	47	+ #set($spanCSSClass = " checkradio")
39	39	#set($elementTagName = "checkradio")
40	40	#elseif($elementType == "textarea")
41	41	#set($elementTagName = "textarea")
42	42	#elseif($elementType == "captcha")
43		- #createCaptcha($elementDataObj)
	52	+ #set($elementTagName = "captcha")
44	44	#else
45	45	#set($hint = "This type of element does not exist, read the manual for more information about element types.")
46	46	#end
47		- #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
48		- <p${requiredCSSClass}${makeFocusable}>
	56	+ #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea" || $elementTagName == "captcha")
	57	+ <p${paragraphCSSClass}${makeFocusable}${captchaClass}>
49	49	<label for="${elementDataObj.id}">
50	50	$elementDataObj.label
51		- <span class="input-wrap${addedCSSClass}">
	60	+ <span class="input-wrap${spanCSSClass}">
52	52	#if($elementTagName == "select")
53	53	#createSelectElement($elementDataObj $elementTagName)
54	54	#elseif($elementTagName == "textarea")
...	...	@@ -84,6 +84,8 @@
84	84	#createTelElement($elementDataObj $elementType)
85	85	#elseif($elementType == "url")
86	86	#createUrlElement($elementDataObj $elementType)
	96	+ #elseif($elementType == "captcha")
	97	+ #createCaptcha($elementDataObj)
87	87	#end
88	88	#end
89	89	#if($elementDataObj.help-block && $elementDataObj.help-block != "")
...	...	@@ -98,8 +98,8 @@
98	98	</p>
99	99	#end
100	100	#if($elementTagName == "checkradio")
101		- <p${requiredCSSClass}>
102		- <span class="input-wrap${addedCSSClass}">
	112	+ <p${paragraphCSSClass}>
	113	+ <span class="input-wrap${spanCSSClass}">
103	103	<span class="fieldset no-fieldset-border">
104	104	<label for="${elementDataObj.id}"#* class="strong"*#>
105	105	#if($elementType == "checkbox")
...	...	@@ -245,14 +245,14 @@
245	245	<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>
246	246	#end
247	247	#macro(createCaptcha $O_elementData)
248		- <p class="slideCaptcha-box">
249	249	<label>Are you human?
250		- <span class="input-wrap">
251		- <span class="slideCaptcha-track" id="slideCaptcha_track">
252		- <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
253		- </span>
254		- </span></label>
255		- <input type="hidden" id="slideCaptcha_answer" value="droid">
	260	+ <span class="input-wrap">
	261	+ <span class="slideCaptcha-track" id="slideCaptcha_track">
	262	+ <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
	263	+ </span>
	264	+ <input type="hidden" id="slideCaptcha_answer" value="droid">
	265	+ </span>
	266	+ </label>
256	256	</p>
257	257	#end
258	258	#macro(createExpandStart $opener $value)