Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.53
edited by Jip-jan Alunkel
on March 28, 16:08
Change comment: There is no comment for this version
To version 2.62
edited by Jip-jan Alunkel
on March 28, 16:56
Change comment: There is no comment for this version

Summary

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,9 @@
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($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#end
18 + #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")
... ... @@ -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}">
... ... @@ -65,11 +65,10 @@
65 65   #if($hint != "")
66 66   <p class="box errormessage">${hint}</p>
67 67   #end
68 -{{/html}}
69 69  #end
70 -
70 +##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#end
71 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}">
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}">
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('.%'))
... ... @@ -88,6 +88,8 @@
88 88  ##set($dataAttributes = ' data-query-type="$O_elementData.data-query-type"')
89 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 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>
91 +
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">
91 91  #end
92 92  
93 93  {{/velocity}}