Modifiche per il documento Macros

Ultima modifica di Jip-jan Alunkel il aprile 15, 18:09
Dalla versione 2.81
modificato da Jip-jan Alunkel
il aprile 07, 13:14
Cambia il commento: Renamed from xwiki:assets.formMaker.form-macros
Alla versione 2.74
modificato da Jip-jan Alunkel
il marzo 31, 17:55
Cambia il commento: Nessun commento per questa versione

Summary

Details

Page properties
Titolo
... ... @@ -1,1 +1,1 @@
1 -Macros
1 +form-elements
Content
... ... @@ -4,16 +4,6 @@
4 4  #end
5 5  
6 6  #macro(createFormEnd)
7 - <div role="alert" class="form-response-output form-validation-errors" style="display: none">
8 - <p>
9 -$services.localization.render('formMaker.line.global_error_msg')
10 - </p>
11 - </div>
12 - <div role="alert" class="form-response-output form-validation-ok" style="display: none">
13 - <p>
14 -$services.localization.render('formMaker.line.global_ok_msg')
15 - </p>
16 - </div>
17 17  </form>
18 18  #end
19 19  
... ... @@ -24,7 +24,7 @@
24 24   #set($requiredCSSClass = '')
25 25   #set($addedCSSClass = '')
26 26   #set($hint = '')
27 - #if($elementDataObj.required == "true")
17 + #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")
52 + #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">
64 + <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  
81 +##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)
83 + <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,11 +107,11 @@
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>
99 + <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
103 + <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)
... ... @@ -122,22 +122,5 @@
122 122   </div>
123 123  #end
124 124  
125 -#macro(createSubmit $O_submit)
126 - <div class="clearfix">
127 - <p class="alert alert-warning alert-button-float-right">
128 - <span class="alert-button pull-right">
129 -#if ($xcontext.user != 'XWiki.XWikiGuest')
130 - <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
131 -#else
132 - <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
133 -#end
134 - </span>
135 - <span class="alert-text">
136 - ${O_submit.help-block}
137 - </span>
138 - </p>
139 - </div>
140 -#end
141 -
142 142  {{/velocity}}
143 143