Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,7 +1,7 @@
1	1	{{velocity}}
2	2	#macro(createFormElement $elementDataObj)
3	3	#set($elementType = $elementDataObj.type)
4		- #set($elementGroupName = "")
	4	+ #set($elementTagName = "")
5	5	#set($requiredAttributes = 'aria-required="false"')
6	6	#set($requiredCSSClass = '')
7	7	#set($addedCSSClass = '')
...	...	@@ -12,28 +12,28 @@
12	12	#end
13	13	#if($elementType == "select")
14	14	#set($addedCSSClass = " select-wrap")
15		- #set($elementGroupName = "select")
	15	+ #set($elementTagName = "select")
16	16	#elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
17		- #set($elementGroupName = "input")
	17	+ #set($elementTagName = "input")
18	18	#elseif($elementType == "checkbox" || $elementType == "radio")
19		- #set($elementGroupName = "checkradio")
	19	+ #set($elementTagName = "checkradio")
20	20	#elseif($elementType == "textarea")
21		- #set($elementGroupName = "textarea")
	21	+ #set($elementTagName = "textarea")
22	22	#else
23	23	#set($hint = "This type of element does not exist, read the manual for more information about element types.")
24	24	#end
25	25	{{html}}
26		- #if($elementGroupName == "select" || $elementGroupName == "input" || $elementGroupName == "textarea")
	26	+ #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
27	27	<p${requiredCSSClass}>
28		- <label for="${elementDataObj.id}_${elementGroupName}">
	28	+ <label for="${elementDataObj.id}_${elementTagName}">
29	29	$elementDataObj.label
30	30	<span class="input-wrap${addedCSSClass}">
31		- #if($elementGroupName == "select")
32		- #createSelectElement($elementDataObj $elementGroupName $requiredAttributes)
33		- #elseif($elementGroupName == "textarea")
	31	+ #if($elementTagName == "select")
	32	+ #createSelectElement($elementDataObj $elementTagName $requiredAttributes)
	33	+ #elseif($elementTagName == "textarea")
34	34	#else
35	35	#if($elementType == "text")
36		- #createTextElement($elementDataObj $elementGroupName)
	36	+ #createTextElement($elementDataObj $elementTagName)
37	37	#elseif($elementType == "number")
38	38	#elseif($elementType == "email")
39	39	#elseif($elementType == "range")
...	...	@@ -50,7 +50,7 @@
50	50	</label>
51	51	</p>
52	52	#end
53		- #if($elementGroupName == "checkradio")
	53	+ #if($elementTagName == "checkradio")
54	54	#if($elementType == "checkbox")
55	55	#elseif($elementType == "radio")
56	56	#end
...	...	@@ -61,8 +61,8 @@
61	61	{{/html}}
62	62	#end
63	63
64		-#macro(createSelectElement $O_elementData $O_groupName $O_requiredAttributes)
65		- <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock" ${O_requiredAttributes}data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_groupName}" id="${O_elementData.id}_${O_groupName}">
	64	+#macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
	65	+ <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock" ${O_requiredAttributes}data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
66	66	<option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
67	67	#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"))
68	68	#set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
...	...	@@ -76,7 +76,7 @@
76	76	#end
77	77	</select>
78	78	#end
79		-#macro(createTextElement $O_elementData $O_groupName $O_requiredAttributes)
	79	+#macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
80	80	#set($dataAttributes = '')
81	81	#if($O_elementData.data-query-type) #set($dataAttributes = '${dataAttributes} data-query-type="${O_elementData.data-query-type}"')#end
82	82	#if($O_elementData.data-query-list-type) #set($dataAttributes = '${dataAttributes} data-query-list-type="${O_elementData.data-query-list-type}"')#end
...	...	@@ -87,9 +87,7 @@
87	87	#if($O_elementData.data-xobj-classname) #set($dataAttributes = '${dataAttributes} data-xobj-classname="${O_elementData.data-xobj-classname}"')#end
88	88	#if($O_elementData.data-xobj-fieldname) #set($dataAttributes = '${dataAttributes} data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end
89	89	#if($O_elementData.data-query-list-editable) #set($dataAttributes = '${dataAttributes} data-query-list-editable="${O_elementData.data-query-list-editable}"')#end
90		-{{html}}
91		- <input type="text" class="form-control full" name="${O_elementData.id}_${O_groupName}" id="${O_elementData.id}_${O_groupName}" autocomplete="off" placeholder="$services.localization.render(${O_elementData.placeholder})" aria-describedby="${O_elementData.id}_helpBlock"${O_requiredAttributes} aria-label="${O_elementData.aria-label}"${dataAttributes}>
92		-{{/html}}
	90	+ <input type="text" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" placeholder="$services.localization.render(${O_elementData.placeholder})" aria-describedby="${O_elementData.id}_helpBlock"${O_requiredAttributes} aria-label="${O_elementData.aria-label}"${dataAttributes}>
93	93	#end
94	94
95	95	{{/velocity}}