Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.80
edited by Jip-jan Alunkel
on April 06, 20:15
Change comment: Renamed from xwiki:assets.formMaker.form-macros
To version 2.65
edited by Jip-jan Alunkel
on March 28, 17:34
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -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")
... ... @@ -33,7 +33,6 @@
33 33   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
34 34   #set($elementTagName = "input")
35 35   #elseif($elementType == "checkbox" || $elementType == "radio")
36 - #set($addedCSSClass = " checkradio")
37 37   #set($elementTagName = "checkradio")
38 38   #elseif($elementType == "textarea")
39 39   #set($elementTagName = "textarea")
... ... @@ -54,12 +54,14 @@
54 54   #elseif($elementType == "number")
55 55   #elseif($elementType == "email")
56 56   #elseif($elementType == "range")
46 + #elseif($elementType == "checkbox")
47 + #elseif($elementType == "radio")
57 57   #end
58 58   #end
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")
53 + #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
... ... @@ -68,20 +68,9 @@
68 68   </p>
69 69   #end
70 70   #if($elementTagName == "checkradio")
71 - <p${requiredCSSClass}>
72 - <span class="input-wrap${addedCSSClass}">
73 - <span class="fieldset no-fieldset-border">
74 - <label for="${elementDataObj.id}_${elementTagName}" class="strong">
75 75   #if($elementType == "checkbox")
76 -
77 -#createCheckboxElement($elementDataObj)
78 -
79 79   #elseif($elementType == "radio")
80 80   #end
81 - </label>
82 - </span>
83 - </span>
84 - </p>
85 85   #end
86 86   #if($hint != "")
87 87   <p class="box errormessage">${hint}</p>
... ... @@ -88,9 +88,10 @@
88 88   #end
89 89  #end
90 90  
71 +##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" aria-label="${O_elementData.aria-label}" 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 - <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
73 + <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}">
74 + <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
94 94   #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"))
95 95   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
96 96   #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -103,39 +103,9 @@
103 103   #end
104 104   </select>
105 105  #end
106 -
107 107  #macro(createTextElement $O_elementData $O_tagName)
108 - <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 == "true") 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>
88 + <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>
109 109  #end
110 110  
111 -#macro(createCheckboxElement $O_elementData)
112 - <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 == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end>$O_elementData.label
113 -#end
114 -
115 -#macro(createExpandStart $id $value)
116 - <div id="${id}_section_${value}" class="togglee">
117 -#end
118 -
119 -#macro(createExpandEnd)
120 - </div>
121 -#end
122 -
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
139 -
140 140  {{/velocity}}
141 141