Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.85
edited by Jip-jan Alunkel
on April 07, 14:02
Change comment: Renamed from xwiki:assets.formMaker.form-macros
To version 2.79
edited by Jip-jan Alunkel
on March 31, 19:59
Change comment: Renamed from xwiki:assets.formMaker.form-macros

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   <div role="alert" class="form-response-output form-validation-errors" style="display: none">
7 7   <p>
... ... @@ -15,6 +15,7 @@
15 15   </div>
16 16  </form>
17 17  #end
19 +
18 18  #macro(createFormElement $elementDataObj)
19 19   #set($elementType = $elementDataObj.type)
20 20   #set($elementTagName = '')
... ... @@ -22,7 +22,7 @@
22 22   #set($requiredCSSClass = '')
23 23   #set($addedCSSClass = '')
24 24   #set($hint = '')
25 - #if($elementDataObj.required == "true")
27 + #if($elementDataObj.required == "yes")
26 26   #set($requiredCSSClass = ' class="required"')
27 27   #end
28 28   #if($elementType == "select")
... ... @@ -57,7 +57,7 @@
57 57   #if($elementDataObj.help-block != "")
58 58   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
59 59   #end
60 - #if($elementDataObj.required == "true")
62 + #if($elementDataObj.required == "yes")
61 61   <span class="required-input-field" title="Required input"></span>
62 62   <span role="alert" class="form-not-valid-tip"></span>
63 63   #end
... ... @@ -69,7 +69,7 @@
69 69   <p${requiredCSSClass}>
70 70   <span class="input-wrap${addedCSSClass}">
71 71   <span class="fieldset no-fieldset-border">
72 - <label for="${elementDataObj.id}" class="strong">
74 + <label for="${elementDataObj.id}_${elementTagName}" class="strong">
73 73   #if($elementType == "checkbox")
74 74  
75 75  #createCheckboxElement($elementDataObj)
... ... @@ -85,11 +85,11 @@
85 85   <p class="box errormessage">${hint}</p>
86 86   #end
87 87  #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
88 88  #macro(createSelectElement $O_elementData $O_tagName)
89 - <select class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") 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}">
90 - #if($O_elementData.placeholder)
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}">
91 91   <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
92 - #end
93 93   #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 94   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
95 95   #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -102,18 +102,23 @@
102 102   #end
103 103   </select>
104 104  #end
107 +
105 105  #macro(createTextElement $O_elementData $O_tagName)
106 - <input type="text" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off"#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#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>
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>
107 107  #end
111 +
108 108  #macro(createCheckboxElement $O_elementData)
109 - <input type="checkbox" name="${O_elementData.id}" id="${O_elementData.id}" data-mod-display="${O_elementData.id}_checkradio" value="${O_elementData.value}"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end>$O_elementData.label
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
110 110  #end
115 +
111 111  #macro(createExpandStart $id $value)
112 112   <div id="${id}_section_${value}" class="togglee">
113 113  #end
119 +
114 114  #macro(createExpandEnd)
115 115   </div>
116 116  #end
123 +
117 117  #macro(createSubmit $O_submit)
118 118   <div class="clearfix">
119 119   <p class="alert alert-warning alert-button-float-right">
... ... @@ -130,4 +130,6 @@
130 130   </p>
131 131   </div>
132 132  #end
140 +
133 133  {{/velocity}}
142 +