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	<div role="alert" class="form-response-output form-validation-errors" style="display: none">
7	7	<p>
...	...	@@ -15,6 +15,7 @@
15	15	</div>
16	16	</form>
17	17	#end
	19	+
18	18	#macro(createFormElement $elementDataObj)
19	19	#set($elementType = $elementDataObj.type)
20	20	#set($elementTagName = '')
...	...	@@ -22,7 +22,7 @@
22	22	#set($requiredCSSClass = '')
23	23	#set($addedCSSClass = '')
24	24	#set($hint = '')
25		- #if($elementDataObj.required == "true")
	27	+ #if($elementDataObj.required == "yes")
26	26	#set($requiredCSSClass = ' class="required"')
27	27	#end
28	28	#if($elementType == "select")
...	...	@@ -50,15 +50,14 @@
50	50	#if($elementType == "text")
51	51	#createTextElement($elementDataObj $elementType $requiredAttributes)
52	52	#elseif($elementType == "number")
53		- #createNumberElement($elementDataObj $elementType $requiredAttributes)
54	54	#elseif($elementType == "email")
55	55	#elseif($elementType == "range")
56	56	#end
57	57	#end
58		- #if($elementDataObj.help-block && $elementDataObj.help-block != "")
	59	+ #if($elementDataObj.help-block != "")
59	59	<span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
60	60	#end
61		- #if($elementDataObj.required == "true")
	62	+ #if($elementDataObj.required == "yes")
62	62	<span class="required-input-field" title="Required input"></span>
63	63	<span role="alert" class="form-not-valid-tip"></span>
64	64	#end
...	...	@@ -70,7 +70,7 @@
70	70	<p${requiredCSSClass}>
71	71	<span class="input-wrap${addedCSSClass}">
72	72	<span class="fieldset no-fieldset-border">
73		- <label for="${elementDataObj.id}" class="strong">
	74	+ <label for="${elementDataObj.id}_${elementTagName}" class="strong">
74	74	#if($elementType == "checkbox")
75	75
76	76	#createCheckboxElement($elementDataObj)
...	...	@@ -86,11 +86,11 @@
86	86	<p class="box errormessage">${hint}</p>
87	87	#end
88	88	#end
	90	+
	91	+##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
89	89	#macro(createSelectElement $O_elementData $O_tagName)
90		- <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}">
91		- #if($O_elementData.placeholder)
	93	+ <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}">
92	92	<option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
93		- #end
94	94	#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"))
95	95	#set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
96	96	#set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
...	...	@@ -103,21 +103,23 @@
103	103	#end
104	104	</select>
105	105	#end
	107	+
106	106	#macro(createTextElement $O_elementData $O_tagName)
107		- <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>
	109	+ <input type="text" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" placeholder="${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-suggest-list-header) data-suggest-list-header="${O_elementData.data-suggest-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>
108	108	#end
109		-#macro(createNumberElement $O_elementData $O_tagName)
110		- <input type="number" 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>
111		-#end
	111	+
112	112	#macro(createCheckboxElement $O_elementData)
113		- <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
	113	+ <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
114	114	#end
	115	+
115	115	#macro(createExpandStart $id $value)
116	116	<div id="${id}_section_${value}" class="togglee">
117	117	#end
	119	+
118	118	#macro(createExpandEnd)
119	119	</div>
120	120	#end
	123	+
121	121	#macro(createSubmit $O_submit)
122	122	<div class="clearfix">
123	123	<p class="alert alert-warning alert-button-float-right">
...	...	@@ -134,4 +134,6 @@
134	134	</p>
135	135	</div>
136	136	#end
	140	+
137	137	{{/velocity}}
	142	+