Changes for page Macros

Summary

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

Details

Page properties

Parent

...	...	@@ -1,1 +1,1 @@
1		-WebHome
	1	+Main.WebHome

Content

...	...	@@ -1,16 +1,16 @@
1	1	{{velocity}}
2	2	#macro(createFormStart $id $product)
3		-<form action="" id="${id}" method="post" class="pagemaker" data-form-product="${product}" novalidate="novalidate">
	3	+<form action="" id="${id}" method="post" class="formMaker" data-form-product="${product}" novalidate="novalidate">
4	4	#end
5	5	#macro(createFormEnd)
6	6	<div role="alert" class="form-response-output form-validation-errors" style="display: none">
7	7	<p>
8		-$services.localization.render('pagemaker.line.global_error_msg')
	8	+$services.localization.render('formMaker.line.global_error_msg')
9	9	</p>
10	10	</div>
11	11	<div role="alert" class="form-response-output form-validation-ok" style="display: none">
12	12	<p>
13		-$services.localization.render('pagemaker.line.global_ok_msg')
	13	+$services.localization.render('formMaker.line.global_ok_msg')
14	14	</p>
15	15	</div>
16	16	</form>
...	...	@@ -18,21 +18,17 @@
18	18	#macro(createFormElement $elementDataObj)
19	19	#set($elementType = $elementDataObj.type)
20	20	#set($elementTagName = '')
	21	+ #set($requiredAttributes = 'aria-required="false"')
21	21	#set($requiredCSSClass = '')
22		- #set($makeFocusable = '')
23	23	#set($addedCSSClass = '')
24	24	#set($hint = '')
25		- #set($placeholder = '')
26		- #if($elementDataObj.required == 'true')
	25	+ #if($elementDataObj.required == "true")
27	27	#set($requiredCSSClass = ' class="required"')
28	28	#end
29		- #if($elementDataObj.data-query-type)
30		- #set($makeFocusable = ' tabindex="-1"')
31		- #end
32	32	#if($elementType == "select")
33	33	#set($addedCSSClass = " select-wrap")
34	34	#set($elementTagName = "select")
35		- #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color")
	31	+ #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
36	36	#set($elementTagName = "input")
37	37	#elseif($elementType == "checkbox" || $elementType == "radio")
38	38	#set($addedCSSClass = " checkradio")
...	...	@@ -43,45 +43,22 @@
43	43	#set($hint = "This type of element does not exist, read the manual for more information about element types.")
44	44	#end
45	45	#if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
46		- <p${requiredCSSClass}${makeFocusable}>
	42	+ <p${requiredCSSClass}>
47	47	<label for="${elementDataObj.id}_${elementTagName}">
48	48	$elementDataObj.label
49	49	<span class="input-wrap${addedCSSClass}">
50	50	#if($elementTagName == "select")
51		- #createSelectElement($elementDataObj $elementTagName)
	47	+ #createSelectElement($elementDataObj $elementTagName $requiredAttributes)
52	52	#elseif($elementTagName == "textarea")
53		- #createTextareaElement($elementDataObj $elementTagName)
54	54	#else
55	55	#if($elementType == "text")
56		- #createTextElement($elementDataObj $elementType)
	51	+ #createTextElement($elementDataObj $elementType $requiredAttributes)
57	57	#elseif($elementType == "number")
58	58	#if(!$elementDataObj.data-decimals)#set($elementDataObj.data-decimals = 0)#end
59	59	#if(!$elementDataObj.decimals-step)#set($elementDataObj.decimals-step = 1)#end
60		- #createNumberElement($elementDataObj $elementType)
	55	+ #createNumberElement($elementDataObj $elementType $requiredAttributes)
61	61	#elseif($elementType == "email")
62		- #createEmailElement($elementDataObj $elementType)
63		- #elseif($elementType == "password")
64		- #createPasswordElement($elementDataObj $elementType)
65	65	#elseif($elementType == "range")
66		- #if($elementDataObj.range-minmax)
67		- #set($minmax = $elementDataObj.range-minmax.split('-'))
68		- #if($minmax.size() == 2)
69		- #set($elementDataObj.range-min = $minmax[0])
70		- #set($elementDataObj.range-max = $minmax[1])
71		- #end
72		- #else
73		- #set($elementDataObj.range-min = 0)
74		- #set($elementDataObj.range-max = 100)
75		- #end
76		- #createRangeElement($elementDataObj $elementType)
77		- #elseif($elementType == "date")
78		- #createDateElement($elementDataObj $elementType)
79		- #elseif($elementType == "color")
80		- #createColorElement($elementDataObj $elementType)
81		- #elseif($elementType == "tel")
82		- #createTelElement($elementDataObj $elementType)
83		- #elseif($elementType == "url")
84		- #createUrlElement($elementDataObj $elementType)
85	85	#end
86	86	#end
87	87	#if($elementDataObj.help-block && $elementDataObj.help-block != "")
...	...	@@ -89,8 +89,8 @@
89	89	#end
90	90	#if($elementDataObj.required == "true")
91	91	<span class="required-input-field" title="Required input"></span>
92		- #end
93	93	<span role="alert" class="form-not-valid-tip"></span>
	66	+ #end
94	94	</span>
95	95	</label>
96	96	</p>
...	...	@@ -101,7 +101,9 @@
101	101	<span class="fieldset no-fieldset-border">
102	102	<label for="${elementDataObj.id}" class="strong">
103	103	#if($elementType == "checkbox")
	77	+
104	104	#createCheckboxElement($elementDataObj)
	79	+
105	105	#elseif($elementType == "radio")
106	106	#end
107	107	</label>
...	...	@@ -113,124 +113,41 @@
113	113	<p class="box errormessage">${hint}</p>
114	114	#end
115	115	#end
116		-
117	117	#macro(createSelectElement $O_elementData $O_tagName)
118		- <select class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#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 data-set-space="${O_elementData.data-set-space}"#if($O_elementData.select-spaces-json) data-select-spaces-json="true"#end name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
	92	+ <select class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#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 data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
119	119	#if($O_elementData.placeholder)
120	120	<option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
121	121	#end
122		- #set ($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
123		- #if($mydoc.isNew() && $hasProgramming)
124		- #set ($myinternaldoc = $mydoc.getDocument())
125		- #set ($myclass = $myinternaldoc.getXClass())
126		- #set ($discard = $myclass.addTextField("pmSpaceOrder", "pageMaker space order", 10))
127		- #set ($discard = $mydoc.save())
128		- #end
129		- #set($removedNr = 0)
130		-
131	131	#if($O_elementData.select-space-reference)
132		- #set($space = $O_elementData.select-space-reference)
133		- #set($codespace = "")
134		- #if($xwiki.getSpaces().contains("${space}.${space}Code"))
135		- #set($codespace = "${space}Code")
136		- #elseif($xwiki.getSpaces().contains("${space}.Code"))
137		- #set($codespace = "Code")
138		- #elseif($xwiki.getSpaces().contains("${space}.code"))
139		- #set($codespace = "code")
	97	+ #set($query = $services.query.xwql("from doc.object(AppWithinMinutes.MetadataClass) met where doc.space like :space and doc.space <> :spaceExclude order by met.dataSpaceName asc"))
	98	+ #set($spaceLikeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
	99	+ #set($spaceExcludeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
	100	+ #set($query = $query.bindValue('space', $spaceLikeRef))
	101	+ #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
	102	+ #set($results = $query.addFilter('unique').execute())
	103	+ #foreach ($item in $results)
	104	+ #set ($document = $xwiki.getDocument($item))
	105	+ <option value="$document.space">$document.getTitle()</option>
140	140	#end
141		-
142		- #set($nameExcludeRef = $codespace)
143		- #set($spaceAbsRef = $space.replaceAll('([%_!])', '!$1'))
144		- #set($query_add_xobj = $services.query.xwql("select space.name from XWikiSpace as space where space.parent = :space and space.name <> :nameExclude and space.name <> 'WebPreferences' order by space.name"))
145		-
146		- #* Add XObjects to current child spaces so the spaces can be queried on the XObject to generate the select options.
147		- #set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute())
148		- #foreach($item in $result_add_xobj)
149		- #set($doc = $xwiki.getDocument("${space}.${item}.WebHome"))
150		- #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
151		- #set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
152		- #set($discard = $doc.save())
153		- #end*#
154		-
155		- #set($spaceExcludeRef = $space.replaceAll('([%_!])', '!$1').concat(".${codespace}"))
156		- #set($spaceLikeRef = $space.replaceAll('([%_!])', '!$1').concat('.%'))
157		- #set($query = $services.query.xwql("from doc.object(assets.pagemaker.pagemakerClass) met where doc.space like :space and doc.space <> :spaceExclude and doc.name <> 'WebPreferences' order by met.pmSpaceOrder asc"))
158		-
159		- ## Generate the select options from all child spaces that have the 'assets.pagemaker.pagemakerClass' XClass.
160		- ## The order is still random but the JSON can be extracted from the console with the 'select-spaces-json' attribute.
161		- #set($result = $query.bindValue('space', $spaceLikeRef).bindValue('spaceExclude', $spaceExcludeRef).addFilter('unique').execute())
162		- #foreach($item in $result)
163		- #set($doc = $xwiki.getDocument($item))
164		- <option value="$doc.space">$doc.getTitle()</option>
165		- #end
166	166	#elseif($O_elementData.select-json)
167		- #set($json = $O_elementData.select-json)
168		- #foreach($key in $json.keySet())
169		- #set($spaceDocTitle = $json.get($key))
170		- #set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name.
171		- #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass", true)) ## Get or create the needed object.
172		- #set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
173		- #set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
174		- #if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.
175		- #set($discard = $spaceDoc.setTitle($spaceDocTitle)) ## Title.
176		- #set($discard = $spaceDoc.setDefaultLocale("en")) ## Locale.
177		- #set($discard = $spaceXObj.set("pmSpaceOrder", $foreach.count)) ## Set the property with the (correct) value.
178		- #set($discard = $spaceDoc.save())
179		- #else
180		- #if($title_error) ## Doc did exist but the title did not match with the JSON value.
181		- #set($discard = $spaceDoc.setTitle($spaceDocTitle))
182		- #end
183		- #if($order_error) ## Either the property does not exist or the value is incorrect.
184		- #set($discard = $spaceXObj.set("pmSpaceOrder", $foreach.count)) ## Set the property with the (correct) value.
185		- #end
186		- #if($title_error || $order_error) ## Save only if changed
187		- #set($discard = $spaceDoc.save())
188		- #end
189		- #end
190		- <option value="$key">$json.get($key)</option>
	108	+ #foreach($item in $O_elementData.select-json.entrySet())
	109	+ <option value="$item.key">$item.value</option>
191	191	#end
192	192	#end
193	193	</select>
194		- #if($removedNr > 0)
195		- $removedNr pages had the XObject ##${removeXObj}## removed.
196		- #end
197	197	#end
198	198	#macro(createTextElement $O_elementData $O_tagName)
199		- <input type="text" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" 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-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>
	115	+ <input type="text" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" 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-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-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-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"')#end>
200	200	#end
201	201	#macro(createNumberElement $O_elementData $O_tagName)
202		- <input type="number" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" 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>
	118	+ <input type="number" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" 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-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-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"')#end>
203	203	#end
204		-#macro(createEmailElement $O_elementData $O_tagName)
205		- <input type="email" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" pattern="^[A-Za-z0-9._+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,63}$"#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-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>
206		-#end
207		-#macro(createPasswordElement $O_elementData $O_tagName)
208		- <input type="password" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" 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>
209		-#end
210		-#macro(createDateElement $O_elementData $O_tagName)
211		- <input type="date" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}"#if($O_elementData.date-min) min="${O_elementData.date-min}"#end#if($O_elementData.date-max) max="${O_elementData.date-max}"#end autocomplete="off" 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-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>
212		-#end
213		-#macro(createColorElement $O_elementData $O_tagName)
214		- <input type="color" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" value="#fffffe" autocomplete="off" 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-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>
215		-#end
216		-#macro(createRangeElement $O_elementData $O_tagName)
217		- <input type="range" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" min="${O_elementData.range-min}" max="${O_elementData.range-max}"#if($O_elementData.range-step) step="${O_elementData.range-step}"#end autocomplete="off" 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-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>
218		-#end
219		-#macro(createTelElement $O_elementData $O_tagName)
220		- <input type="tel" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" 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-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>
221		-#end
222		-#macro(createUrlElement $O_elementData $O_tagName)
223		- <input type="url" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" pattern="https?://.*"#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-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>
224		-#end
225	225	#macro(createCheckboxElement $O_elementData)
226		- <input type="checkbox" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#end value="${O_elementData.value}"#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>$O_elementData.label
	121	+ <input type="checkbox" name="${O_elementData.id}" id="${O_elementData.id}" data-mod-display="${O_elementData.id}_checkradio" value="${O_elementData.value}"#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>$O_elementData.label
227	227	#end
228		-#macro(createTextareaElement $O_elementData $O_tagName)
229		- <textarea class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}"#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>
	123	+#macro(createExpandStart $id $value)
	124	+ <div id="${id}_section_${value}" class="togglee">
230	230	#end
231		-#macro(createExpandStart $opener $value)
232		- <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">
233		-#end
234	234	#macro(createExpandEnd)
235	235	</div>
236	236	#end