Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -2,6 +2,7 @@
2	2	#macro(createFormStart $id $product)
3	3	<form action="" id="${id}" method="post" class="formMaker" data-form-product="${product}" novalidate="novalidate">
4	4	#end
	5	+
5	5	#macro(createFormEnd)
6	6	</form>
7	7	#end
...	...	@@ -13,8 +13,7 @@
13	13	#set($requiredCSSClass = '')
14	14	#set($addedCSSClass = '')
15	15	#set($hint = '')
16		- #if($O_elementData.required == true)
17		- #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
	17	+ #if($elementDataObj.required == "yes")
18	18	#set($requiredCSSClass = ' class="required"')
19	19	#end
20	20	#if($elementType == "select")
...	...	@@ -23,6 +23,7 @@
23	23	#elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
24	24	#set($elementTagName = "input")
25	25	#elseif($elementType == "checkbox" || $elementType == "radio")
	26	+ #set($addedCSSClass = " checkradio")
26	26	#set($elementTagName = "checkradio")
27	27	#elseif($elementType == "textarea")
28	28	#set($elementTagName = "textarea")
...	...	@@ -29,7 +29,6 @@
29	29	#else
30	30	#set($hint = "This type of element does not exist, read the manual for more information about element types.")
31	31	#end
32		-{{html}}
33	33	#if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
34	34	<p${requiredCSSClass}>
35	35	<label for="${elementDataObj.id}_${elementTagName}">
...	...	@@ -40,7 +40,7 @@
40	40	#elseif($elementTagName == "textarea")
41	41	#else
42	42	#if($elementType == "text")
43		- #createTextElement($elementDataObj $elementTagName $requiredAttributes)
	43	+ #createTextElement($elementDataObj $elementType $requiredAttributes)
44	44	#elseif($elementType == "number")
45	45	#elseif($elementType == "email")
46	46	#elseif($elementType == "range")
...	...	@@ -49,7 +49,7 @@
49	49	#if($elementDataObj.help-block != "")
50	50	<span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
51	51	#end
52		- #if($elementDataObj.required == true)
	52	+ #if($elementDataObj.required == "yes")
53	53	<span class="required-input-field" title="Required input"></span>
54	54	<span role="alert" class="form-not-valid-tip"></span>
55	55	#end
...	...	@@ -58,18 +58,29 @@
58	58	</p>
59	59	#end
60	60	#if($elementTagName == "checkradio")
	61	+ <p${requiredCSSClass}>
	62	+ <span class="input-wrap${addedCSSClass}">
	63	+ <span class="fieldset no-fieldset-border">
	64	+ <label for="${elementDataObj.id}_${elementTagName}" class="strong">
61	61	#if($elementType == "checkbox")
	66	+
	67	+#createCheckboxElement($elementDataObj)
	68	+
62	62	#elseif($elementType == "radio")
63	63	#end
	71	+ </label>
	72	+ </span>
	73	+ </span>
	74	+ </p>
64	64	#end
65	65	#if($hint != "")
66	66	<p class="box errormessage">${hint}</p>
67	67	#end
68		-{{/html}}
69	69	#end
70	70
71		-#macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
72		- <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}">
	81	+##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end
	82	+#macro(createSelectElement $O_elementData $O_tagName)
	83	+ <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "yes") 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}">
73	73	<option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
74	74	#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"))
75	75	#set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
...	...	@@ -83,12 +83,23 @@
83	83	#end
84	84	</select>
85	85	#end
86		-#macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
87		-###set($dataAttributes = '')
88		-##set($dataAttributes = ' data-query-type="$O_elementData.data-query-type"')
89		-##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-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
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}"#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-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>
	97	+
	98	+#macro(createTextElement $O_elementData $O_tagName)
	99	+ <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"#if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end aria-label="${O_elementData.aria-label}"#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-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>
91	91	#end
92	92
	102	+#macro(createCheckboxElement $O_elementData)
	103	+ $O_elementData.label
	104	+ <input type="checkbox" name="${O_elementData.id}" id="${O_elementData.id}" data-mod-display="${O_elementData.id}" value="${O_elementData.value}"#if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end>$O_elementData.label
	105	+#end
	106	+
	107	+#macro(createExpandStart $id $value)
	108	+ <div id="${id}_section_${value}" class="togglee">
	109	+#end
	110	+
	111	+#macro(createExpandEnd)
	112	+ </div>
	113	+#end
	114	+
93	93	{{/velocity}}
94	94