Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.83
edited by Jip-jan Alunkel
on April 07, 13:29
Change comment: Renamed from xwiki:assets.formMaker.form-macros
To version 2.75
edited by Jip-jan Alunkel
on March 31, 18:16
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -Macros
1 +form-elements
Content
... ... @@ -24,7 +24,7 @@
24 24   #set($requiredCSSClass = '')
25 25   #set($addedCSSClass = '')
26 26   #set($hint = '')
27 - #if($elementDataObj.required == "true")
27 + #if($elementDataObj.required == "yes")
28 28   #set($requiredCSSClass = ' class="required"')
29 29   #end
30 30   #if($elementType == "select")
... ... @@ -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 == "true")
62 + #if($elementDataObj.required == "yes")
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
... ... @@ -71,7 +71,7 @@
71 71   <p${requiredCSSClass}>
72 72   <span class="input-wrap${addedCSSClass}">
73 73   <span class="fieldset no-fieldset-border">
74 - <label for="${elementDataObj.id}" class="strong">
74 + <label for="${elementDataObj.id}_${elementTagName}" class="strong">
75 75   #if($elementType == "checkbox")
76 76  
77 77  #createCheckboxElement($elementDataObj)
... ... @@ -88,11 +88,10 @@
88 88   #end
89 89  #end
90 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
91 91  #macro(createSelectElement $O_elementData $O_tagName)
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 - #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}">
94 94   <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
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 97   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
98 98   #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -107,33 +107,20 @@
107 107  #end
108 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" 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>
111 111  #end
112 112  
113 113  #macro(createCheckboxElement $O_elementData)
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
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
115 115  #end
116 116  
117 117  #macro(createExpandStart $id $value)
118 118   <div id="${id}_section_${value}" class="togglee">
119 119  #end
119 +
120 120  #macro(createExpandEnd)
121 121   </div>
122 122  #end
123 -#macro(createSubmit $O_submit)
124 - <div class="clearfix">
125 - <p class="alert alert-warning alert-button-float-right">
126 - <span class="alert-button pull-right">
127 -#if ($xcontext.user != 'XWiki.XWikiGuest')
128 - <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
129 -#else
130 - <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
131 -#end
132 - </span>
133 - <span class="alert-text">
134 - ${O_submit.help-block}
135 - </span>
136 - </p>
137 - </div>
138 -#end
123 +
139 139  {{/velocity}}
125 +