Changes for page Macros

Summary

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

Details

Page properties

Content

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