Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -2,7 +2,6 @@
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 -
6 6  #macro(createFormEnd)
7 7  </form>
8 8  #end
... ... @@ -14,9 +14,8 @@
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
18 - #if($elementDataObj.required == "yes")
19 - #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="$elementDataObj.data-error-response-type"')
16 + #if($O_elementData.required == true)
17 + #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
20 20   #set($requiredCSSClass = ' class="required"')
21 21   #end
22 22   #if($elementType == "select")
... ... @@ -31,6 +31,7 @@
31 31   #else
32 32   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
33 33   #end
32 +{{html}}
34 34   #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
35 35   <p${requiredCSSClass}>
36 36   <label for="${elementDataObj.id}_${elementTagName}">
... ... @@ -50,7 +50,7 @@
50 50   #if($elementDataObj.help-block != "")
51 51   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
52 52   #end
53 - #if($elementDataObj.required == "yes")
52 + #if($elementDataObj.required == true)
54 54   <span class="required-input-field" title="Required input"></span>
55 55   <span role="alert" class="form-not-valid-tip"></span>
56 56   #end
... ... @@ -66,10 +66,11 @@
66 66   #if($hint != "")
67 67   <p class="box errormessage">${hint}</p>
68 68   #end
68 +{{/html}}
69 69  #end
70 -##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#end
70 +
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"#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 + <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('.%'))
... ... @@ -87,9 +87,7 @@
87 87  ###set($dataAttributes = '')
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 - <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>
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">
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>
93 93  #end
94 94  
95 95  {{/velocity}}