Changes for page Macros

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

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -form-elements
1 +Macros
Content
... ... @@ -2,11 +2,19 @@
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)
6 + <div role="alert" class="form-response-output form-validation-errors" style="display: none">
7 + <p>
8 +$services.localization.render('formMaker.line.global_error_msg')
9 + </p>
10 + </div>
11 + <div role="alert" class="form-response-output form-validation-ok" style="display: none">
12 + <p>
13 +$services.localization.render('formMaker.line.global_ok_msg')
14 + </p>
15 + </div>
7 7  </form>
8 8  #end
9 -
10 10  #macro(createFormElement $elementDataObj)
11 11   #set($elementType = $elementDataObj.type)
12 12   #set($elementTagName = '')
... ... @@ -14,7 +14,7 @@
14 14   #set($requiredCSSClass = '')
15 15   #set($addedCSSClass = '')
16 16   #set($hint = '')
17 - #if($elementDataObj.required == "yes")
25 + #if($elementDataObj.required == "true")
18 18   #set($requiredCSSClass = ' class="required"')
19 19   #end
20 20   #if($elementType == "select")
... ... @@ -42,6 +42,7 @@
42 42   #if($elementType == "text")
43 43   #createTextElement($elementDataObj $elementType $requiredAttributes)
44 44   #elseif($elementType == "number")
53 + #createNumberElement($elementDataObj $elementType $requiredAttributes)
45 45   #elseif($elementType == "email")
46 46   #elseif($elementType == "range")
47 47   #end
... ... @@ -49,7 +49,7 @@
49 49   #if($elementDataObj.help-block != "")
50 50   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
51 51   #end
52 - #if($elementDataObj.required == "yes")
61 + #if($elementDataObj.required == "true")
53 53   <span class="required-input-field" title="Required input"></span>
54 54   <span role="alert" class="form-not-valid-tip"></span>
55 55   #end
... ... @@ -61,7 +61,7 @@
61 61   <p${requiredCSSClass}>
62 62   <span class="input-wrap${addedCSSClass}">
63 63   <span class="fieldset no-fieldset-border">
64 - <label for="${elementDataObj.id}_${elementTagName}" class="strong">
73 + <label for="${elementDataObj.id}" class="strong">
65 65   #if($elementType == "checkbox")
66 66  
67 67  #createCheckboxElement($elementDataObj)
... ... @@ -77,11 +77,11 @@
77 77   <p class="box errormessage">${hint}</p>
78 78   #end
79 79  #end
80 -
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
82 82  #macro(createSelectElement $O_elementData $O_tagName)
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}">
84 - <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
90 + <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}">
91 + #if($O_elementData.placeholder)
92 + <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
93 + #end
85 85   #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"))
86 86   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
87 87   #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -94,22 +94,35 @@
94 94   #end
95 95   </select>
96 96  #end
97 -
98 98  #macro(createTextElement $O_elementData $O_tagName)
99 - <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-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 + <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>
100 100  #end
101 -
109 +#macro(createNumberElement $O_elementData $O_tagName)
110 + <input type="number" 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 +#end
102 102  #macro(createCheckboxElement $O_elementData)
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
113 + <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
104 104  #end
105 -
106 106  #macro(createExpandStart $id $value)
107 107   <div id="${id}_section_${value}" class="togglee">
108 108  #end
109 -
110 110  #macro(createExpandEnd)
111 111   </div>
112 112  #end
113 -
121 +#macro(createSubmit $O_submit)
122 + <div class="clearfix">
123 + <p class="alert alert-warning alert-button-float-right">
124 + <span class="alert-button pull-right">
125 +#if ($xcontext.user != 'XWiki.XWikiGuest')
126 + <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
127 +#else
128 + <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
129 +#end
130 + </span>
131 + <span class="alert-text">
132 + ${O_submit.help-block}
133 + </span>
134 + </p>
135 + </div>
136 +#end
114 114  {{/velocity}}
115 -