Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.70
edited by Jip-jan Alunkel
on March 29, 16:31
Change comment: There is no comment for this version
To version 2.64
edited by Jip-jan Alunkel
on March 28, 17:02
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -14,7 +14,9 @@
14 14   #set($requiredCSSClass = '')
15 15   #set($addedCSSClass = '')
16 16   #set($hint = '')
17 +##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#end
17 17   #if($elementDataObj.required == "yes")
19 + #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="$elementDataObj.data-error-response-type"')
18 18   #set($requiredCSSClass = ' class="required"')
19 19   #end
20 20   #if($elementType == "select")
... ... @@ -23,7 +23,6 @@
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")
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 $elementType $requiredAttributes)
44 + #createTextElement($elementDataObj $elementTagName $requiredAttributes)
44 44   #elseif($elementType == "number")
45 45   #elseif($elementType == "email")
46 46   #elseif($elementType == "range")
... ... @@ -58,28 +58,16 @@
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">
65 65   #if($elementType == "checkbox")
66 -
67 -#createCheckboxElement($elementDataObj)
68 -
69 69   #elseif($elementType == "radio")
70 70   #end
71 - </label>
72 - </span>
73 - </span>
74 - </p>
75 75   #end
76 76   #if($hint != "")
77 77   <p class="box errormessage">${hint}</p>
78 78   #end
79 79  #end
80 -
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)
70 +##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#end
71 +#macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
83 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}">
84 84   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
85 85   #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"))
... ... @@ -94,23 +94,14 @@
94 94   #end
95 95   </select>
96 96  #end
97 -
98 -#macro(createTextElement $O_elementData $O_tagName)
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
99 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>
100 -#end
101 101  
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
92 +## <input type="text" class="form-control full" name="main_complaint_textinput" id="main_complaint_textinput" placeholder="${services.localization.render('cases.wordgroup.main_complaint.placeholder')}" aria-describedby="main_complaint_helpBlock" aria-required="true" aria-label="Enter the main complaint" required="required" data-error-response-type="use_label_defined_1" data-query-type="XWQL.matchTitle" data-query-list-type="suggest-negate" data-query-list-contents="value" data-create-page="true" data-query-scope="cases" autocomplete="off">
105 105  #end
106 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 -
115 115  {{/velocity}}
116 116