Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -4,16 +4,6 @@
4 4  #end
5 5  
6 6  #macro(createFormEnd)
7 - <div role="alert" class="form-response-output form-validation-errors" style="display: none">
8 - <p>
9 -$services.localization.render('formMaker.line.global_error_msg')
10 - </p>
11 - </div>
12 - <div role="alert" class="form-response-output form-validation-ok" style="display: none">
13 - <p>
14 -$services.localization.render('formMaker.line.global_ok_msg')
15 - </p>
16 - </div>
17 17  </form>
18 18  #end
19 19  
... ... @@ -24,7 +24,9 @@
24 24   #set($requiredCSSClass = '')
25 25   #set($addedCSSClass = '')
26 26   #set($hint = '')
17 +##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#end
27 27   #if($elementDataObj.required == "yes")
19 + #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="$elementDataObj.data-error-response-type"')
28 28   #set($requiredCSSClass = ' class="required"')
29 29   #end
30 30   #if($elementType == "select")
... ... @@ -33,7 +33,6 @@
33 33   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
34 34   #set($elementTagName = "input")
35 35   #elseif($elementType == "checkbox" || $elementType == "radio")
36 - #set($addedCSSClass = " checkradio")
37 37   #set($elementTagName = "checkradio")
38 38   #elseif($elementType == "textarea")
39 39   #set($elementTagName = "textarea")
... ... @@ -50,7 +50,7 @@
50 50   #elseif($elementTagName == "textarea")
51 51   #else
52 52   #if($elementType == "text")
53 - #createTextElement($elementDataObj $elementType $requiredAttributes)
44 + #createTextElement($elementDataObj $elementTagName $requiredAttributes)
54 54   #elseif($elementType == "number")
55 55   #elseif($elementType == "email")
56 56   #elseif($elementType == "range")
... ... @@ -59,7 +59,7 @@
59 59   #if($elementDataObj.help-block != "")
60 60   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
61 61   #end
62 - #if($elementDataObj.required == "yes")
53 + #if($elementDataObj.required == true)
63 63   <span class="required-input-field" title="Required input"></span>
64 64   <span role="alert" class="form-not-valid-tip"></span>
65 65   #end
... ... @@ -68,30 +68,18 @@
68 68   </p>
69 69   #end
70 70   #if($elementTagName == "checkradio")
71 - <p${requiredCSSClass}>
72 - <span class="input-wrap${addedCSSClass}">
73 - <span class="fieldset no-fieldset-border">
74 - <label for="${elementDataObj.id}_${elementTagName}" class="strong">
75 75   #if($elementType == "checkbox")
76 -
77 -#createCheckboxElement($elementDataObj)
78 -
79 79   #elseif($elementType == "radio")
80 80   #end
81 - </label>
82 - </span>
83 - </span>
84 - </p>
85 85   #end
86 86   #if($hint != "")
87 87   <p class="box errormessage">${hint}</p>
88 88   #end
89 89  #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
92 -#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)
93 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}">
94 - <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
73 + <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
95 95   #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"))
96 96   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
97 97   #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -104,22 +104,14 @@
104 104   #end
105 105   </select>
106 106  #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"#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>
107 107  
108 -#macro(createTextElement $O_elementData $O_tagName)
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>
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">
110 110  #end
111 111  
112 -#macro(createCheckboxElement $O_elementData)
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 -#end
115 -
116 -#macro(createExpandStart $id $value)
117 - <div id="${id}_section_${value}" class="togglee">
118 -#end
119 -
120 -#macro(createExpandEnd)
121 - </div>
122 -#end
123 -
124 124  {{/velocity}}
125 125