Изменения документа Macros

Сводка

• Свойства страницы (1 изменено, 0 добавлено, 0 удалено)

Подробности

Свойства страницы

Содержимое

...	...	@@ -14,8 +14,7 @@
14	14	#set($requiredCSSClass = '')
15	15	#set($addedCSSClass = '')
16	16	#set($hint = '')
17		- #if($O_elementData.required === true)
18		- #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
	17	+ #if($elementDataObj.required == "yes")
19	19	#set($requiredCSSClass = ' class="required"')
20	20	#end
21	21	#if($elementType == "select")
...	...	@@ -24,6 +24,7 @@
24	24	#elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
25	25	#set($elementTagName = "input")
26	26	#elseif($elementType == "checkbox" || $elementType == "radio")
	26	+ #set($addedCSSClass = " checkradio")
27	27	#set($elementTagName = "checkradio")
28	28	#elseif($elementType == "textarea")
29	29	#set($elementTagName = "textarea")
...	...	@@ -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,9 +58,21 @@
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()
	68	+
62	62	#elseif($elementType == "radio")
63	63	#end
	71	+ <input type="checkbox" name="extra_info" id="extra_info" data-mod-display="extra_info_contents" value="yes" />$elementDataObj.label
	72	+ </label>
	73	+ </span>
	74	+ </span>
	75	+ </p>
64	64	#end
65	65	#if($hint != "")
66	66	<p class="box errormessage">${hint}</p>
...	...	@@ -67,8 +67,9 @@
67	67	#end
68	68	#end
69	69
70		-#macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
71		- <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}">
	82	+##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
	83	+#macro(createSelectElement $O_elementData $O_tagName)
	84	+ <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}">
72	72	<option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
73	73	#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"))
74	74	#set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
...	...	@@ -82,12 +82,13 @@
82	82	#end
83	83	</select>
84	84	#end
85		-#macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
86		-###set($dataAttributes = '')
87		-##set($dataAttributes = ' data-query-type="$O_elementData.data-query-type"')
88		-##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
89		- <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>
	98	+
	99	+#macro(createTextElement $O_elementData $O_tagName)
	100	+ <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>
90	90	#end
	102	+#macro(createCheckboxElement $O_elementData)
	103	+ <input type="checkbox" name="${elementDataObj.id}" id="${elementDataObj.id}" data-mod-display="${elementDataObj.id}_contents" value="yes" />Extra information (optional)
	104	+#end
91	91
92	92	{{/velocity}}
93	93