Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.86
edited by Jip-jan Alunkel
on April 10, 15:49
Change comment: Renamed from xwiki:assets.formMaker.form-macros
To version 2.94
edited by Jip-jan Alunkel
on June 01, 19:07
Change comment: Renamed from xwiki:assets.formMaker.form-macros

Summary

Details

Page properties
Content
... ... @@ -50,11 +50,14 @@
50 50   #if($elementType == "text")
51 51   #createTextElement($elementDataObj $elementType $requiredAttributes)
52 52   #elseif($elementType == "number")
53 + #if(!$elementDataObj.data-decimals)#set($elementDataObj.data-decimals = 0)#end
54 + #if(!$elementDataObj.decimals-step)#set($elementDataObj.decimals-step = 1)#end
55 + #createNumberElement($elementDataObj $elementType $requiredAttributes)
53 53   #elseif($elementType == "email")
54 54   #elseif($elementType == "range")
55 55   #end
56 56   #end
57 - #if($elementDataObj.help-block != "")
60 + #if($elementDataObj.help-block && $elementDataObj.help-block != "")
58 58   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
59 59   #end
60 60   #if($elementDataObj.required == "true")
... ... @@ -90,15 +90,21 @@
90 90   #if($O_elementData.placeholder)
91 91   <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
92 92   #end
93 - #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"))
94 - #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
95 - #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
96 - #set($query = $query.bindValue('space', $spaceLikeRef))
97 - #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
98 - #set($results = $query.addFilter('unique').execute())
99 - #foreach ($item in $results)
100 - #set ($document = $xwiki.getDocument($item))
101 - <option value="$document.space">$document.getTitle()</option>
96 + #if($O_elementData.select-space-reference)
97 + #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"))
98 + #set($spaceLikeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
99 + #set($spaceExcludeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
100 + #set($query = $query.bindValue('space', $spaceLikeRef))
101 + #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
102 + #set($results = $query.addFilter('unique').execute())
103 + #foreach ($item in $results)
104 + #set ($document = $xwiki.getDocument($item))
105 + <option value="$document.space">$document.getTitle()</option>
106 + #end
107 + #elseif($O_elementData.select-json)
108 + #foreach($item in $O_elementData.select-json.entrySet())
109 + <option value="$item.key">$item.value</option>
110 + #end
102 102   #end
103 103   </select>
104 104  #end
... ... @@ -105,6 +105,9 @@
105 105  #macro(createTextElement $O_elementData $O_tagName)
106 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-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>
107 107  #end
117 +#macro(createNumberElement $O_elementData $O_tagName)
118 + <input type="number" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" min="0" pattern="[0-9]*[.,]?[0-9]+" data-decimals="${O_elementData.data-decimals}" step="${O_elementData.decimal-step}"#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>
119 +#end
108 108  #macro(createCheckboxElement $O_elementData)
109 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
110 110  #end
... ... @@ -116,7 +116,7 @@
116 116  #end
117 117  #macro(createSubmit $O_submit)
118 118   <div class="clearfix">
119 - <p class="alert alert-warning alert-button-float-right">
131 + <p class="alert alert-danger alert-button-float-right">
120 120   <span class="alert-button pull-right">
121 121  #if ($xcontext.user != 'XWiki.XWikiGuest')
122 122   <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />