Wijzigen voor document Macros

Laatst gewijzigd door Jip-jan Alunkel op april 15, 18:09
Van versie 2.89
gewijzigd door Jip-jan Alunkel
op april 10, 16:33
Opmerking bij wijziging: Renamed from xwiki:assets.formMaker.form-macros
Naar versie 2.95
gewijzigd door Jip-jan Alunkel
op juni 01, 19:08
Opmerking bij wijziging: Renamed from xwiki:assets.formMaker.form-macros

Samenvatting

Details

Paginaeigenschappen
Inhoud
... ... @@ -50,6 +50,8 @@
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
53 53   #createNumberElement($elementDataObj $elementType $requiredAttributes)
54 54   #elseif($elementType == "email")
55 55   #elseif($elementType == "range")
... ... @@ -91,15 +91,21 @@
91 91   #if($O_elementData.placeholder)
92 92   <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
93 93   #end
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 - #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
96 - #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
97 - #set($query = $query.bindValue('space', $spaceLikeRef))
98 - #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
99 - #set($results = $query.addFilter('unique').execute())
100 - #foreach ($item in $results)
101 - #set ($document = $xwiki.getDocument($item))
102 - <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
103 103   #end
104 104   </select>
105 105  #end
... ... @@ -107,7 +107,7 @@
107 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>
108 108  #end
109 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>
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>
111 111  #end
112 112  #macro(createCheckboxElement $O_elementData)
113 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
... ... @@ -120,7 +120,7 @@
120 120  #end
121 121  #macro(createSubmit $O_submit)
122 122   <div class="clearfix">
123 - <p class="alert alert-warning alert-button-float-right">
131 + <p class="alert alert-danger alert-button-float-right">
124 124   <span class="alert-button pull-right">
125 125  #if ($xcontext.user != 'XWiki.XWikiGuest')
126 126   <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />