Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.81
edited by Jip-jan Alunkel
on April 07, 13:14
Change comment: Renamed from xwiki:assets.formMaker.form-macros
To version 2.92
edited by Jip-jan Alunkel
on April 17, 22:25
Change comment: Renamed from xwiki:assets.formMaker.form-macros

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   <div role="alert" class="form-response-output form-validation-errors" style="display: none">
8 8   <p>
... ... @@ -16,7 +16,6 @@
16 16   </div>
17 17  </form>
18 18  #end
19 -
20 20  #macro(createFormElement $elementDataObj)
21 21   #set($elementType = $elementDataObj.type)
22 22   #set($elementTagName = '')
... ... @@ -52,11 +52,14 @@
52 52   #if($elementType == "text")
53 53   #createTextElement($elementDataObj $elementType $requiredAttributes)
54 54   #elseif($elementType == "number")
53 + #if(!$elementDataObj.data-decimals)#set($elementDataObj.data-decimals = 0)#end
54 + #if(!$elementDataObj.decimals-step)#set($elementDataObj.decimals-step = 1)#end
55 + #createNumberElement($elementDataObj $elementType $requiredAttributes)
55 55   #elseif($elementType == "email")
56 56   #elseif($elementType == "range")
57 57   #end
58 58   #end
59 - #if($elementDataObj.help-block != "")
60 + #if($elementDataObj.help-block && $elementDataObj.help-block != "")
60 60   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
61 61   #end
62 62   #if($elementDataObj.required == "true")
... ... @@ -87,7 +87,6 @@
87 87   <p class="box errormessage">${hint}</p>
88 88   #end
89 89  #end
90 -
91 91  #macro(createSelectElement $O_elementData $O_tagName)
92 92   <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}">
93 93   #if($O_elementData.placeholder)
... ... @@ -94,8 +94,8 @@
94 94   <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
95 95   #end
96 96   #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"))
97 - #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
98 - #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
97 + #set($spaceLikeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
98 + #set($spaceExcludeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
99 99   #set($query = $query.bindValue('space', $spaceLikeRef))
100 100   #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
101 101   #set($results = $query.addFilter('unique').execute())
... ... @@ -105,23 +105,21 @@
105 105   #end
106 106   </select>
107 107  #end
108 -
109 109  #macro(createTextElement $O_elementData $O_tagName)
110 - <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"#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-query-list-header) data-query-list-header="${O_elementData.data-query-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>
111 111  #end
112 -
111 +#macro(createNumberElement $O_elementData $O_tagName)
112 + <input type="number" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" min="0" pattern="[0-9]*[.,]?[0-9]+" data-decimals="${O_elementData.data-decimals}" step="${O_elementData.decimal-step}"#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-query-list-header) data-query-list-header="${O_elementData.data-query-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>
113 +#end
113 113  #macro(createCheckboxElement $O_elementData)
114 114   <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
115 115  #end
116 -
117 117  #macro(createExpandStart $id $value)
118 118   <div id="${id}_section_${value}" class="togglee">
119 119  #end
120 -
121 121  #macro(createExpandEnd)
122 122   </div>
123 123  #end
124 -
125 125  #macro(createSubmit $O_submit)
126 126   <div class="clearfix">
127 127   <p class="alert alert-warning alert-button-float-right">
... ... @@ -138,6 +138,4 @@
138 138   </p>
139 139   </div>
140 140  #end
141 -
142 142  {{/velocity}}
143 -