Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.76
edited by Jip-jan Alunkel
on March 31, 18:27
Change comment: There is no comment for this version
To version 2.84
edited by Jip-jan Alunkel
on April 07, 13: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,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 = '')
... ... @@ -24,7 +24,7 @@
24 24   #set($requiredCSSClass = '')
25 25   #set($addedCSSClass = '')
26 26   #set($hint = '')
27 - #if($elementDataObj.required == "yes")
25 + #if($elementDataObj.required == "true")
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 == "yes")
60 + #if($elementDataObj.required == "true")
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}_${elementTagName}" class="strong">
72 + <label for="${elementDataObj.id}" class="strong">
75 75   #if($elementType == "checkbox")
76 76  
77 77  #createCheckboxElement($elementDataObj)
... ... @@ -87,11 +87,11 @@
87 87   <p class="box errormessage">${hint}</p>
88 88   #end
89 89  #end
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
92 92  #macro(createSelectElement $O_elementData $O_tagName)
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}">
89 + <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}">
90 + #if($O_elementData.placeholder)
94 94   <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
92 + #end
95 95   #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"))
96 96   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
97 97   #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -104,22 +104,32 @@
104 104   #end
105 105   </select>
106 106  #end
107 -
108 108  #macro(createTextElement $O_elementData $O_tagName)
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>
106 + <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>
110 110  #end
111 -
112 112  #macro(createCheckboxElement $O_elementData)
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
109 + <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
114 114  #end
115 -
116 116  #macro(createExpandStart $id $value)
117 117   <div id="${id}_section_${value}" class="togglee">
118 118  #end
119 -
120 120  #macro(createExpandEnd)
121 121   </div>
122 122  #end
123 -
117 +#macro(createSubmit $O_submit)
118 + <div class="clearfix">
119 + <p class="alert alert-warning alert-button-float-right">
120 + <span class="alert-button pull-right">
121 +#if ($xcontext.user != 'XWiki.XWikiGuest')
122 + <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
123 +#else
124 + <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
125 +#end
126 + </span>
127 + <span class="alert-text">
128 + ${O_submit.help-block}
129 + </span>
130 + </p>
131 + </div>
132 +#end
124 124  {{/velocity}}
125 -