Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.66
edited by Jip-jan Alunkel
on March 28, 19:52
Change comment: There is no comment for this version
To version 2.79
edited by Jip-jan Alunkel
on March 31, 19:59
Change comment: Renamed from xwiki:assets.formMaker.form-macros

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -form-elements
1 +Macros
Content
... ... @@ -4,6 +4,16 @@
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>
7 7  </form>
8 8  #end
9 9  
... ... @@ -64,11 +64,10 @@
64 64   <label for="${elementDataObj.id}_${elementTagName}" class="strong">
65 65   #if($elementType == "checkbox")
66 66  
67 -#createCheckboxElement()
68 -
77 +#createCheckboxElement($elementDataObj)
78 +
69 69   #elseif($elementType == "radio")
70 70   #end
71 - <input type="checkbox" name="extra_info" id="extra_info" data-mod-display="extra_info_contents" value="yes" />$elementDataObj.label
72 72   </label>
73 73   </span>
74 74   </span>
... ... @@ -82,7 +82,7 @@
82 82  ##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
83 83  #macro(createSelectElement $O_elementData $O_tagName)
84 84   <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}">
85 - <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
94 + <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
86 86   #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"))
87 87   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
88 88   #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -97,11 +97,37 @@
97 97  #end
98 98  
99 99  #macro(createTextElement $O_elementData $O_tagName)
100 - <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 + <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>
101 101  #end
111 +
102 102  #macro(createCheckboxElement $O_elementData)
103 - <input type="checkbox" name="${elementDataObj.id}" id="${elementDataObj.id}" data-mod-display="${elementDataObj.id}_contents" value="yes" />Extra information (optional)
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
104 104  #end
105 105  
116 +#macro(createExpandStart $id $value)
117 + <div id="${id}_section_${value}" class="togglee">
118 +#end
119 +
120 +#macro(createExpandEnd)
121 + </div>
122 +#end
123 +
124 +#macro(createSubmit $O_submit)
125 + <div class="clearfix">
126 + <p class="alert alert-warning alert-button-float-right">
127 + <span class="alert-button pull-right">
128 +#if ($xcontext.user != 'XWiki.XWikiGuest')
129 + <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />
130 +#else
131 + <a data-toggle="modal" data-target="#displayLogin" href="#" class="btn btn-primary">$services.localization.render('login')</a>
132 +#end
133 + </span>
134 + <span class="alert-text">
135 + ${O_submit.help-block}
136 + </span>
137 + </p>
138 + </div>
139 +#end
140 +
106 106  {{/velocity}}
107 107