Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.281
edited by Jip-jan Alunkel
on August 09, 14:11
Change comment: Update document after refactoring.
To version 2.288
edited by Jip-jan Alunkel
on August 16, 03:05
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -1,9 +1,9 @@
1 1  {{velocity}}
2 2  #macro(createFormStart $elementDataObj)
3 3   #if($elementDataObj.active == "false")
4 - $set($formclass = "pagemaker")
4 + #set($formclass = "pagemaker")
5 5   #else
6 - $set($formclass = "pagemaker active")
6 + #set($formclass = "pagemaker active")
7 7   #end
8 8   #if($elementDataObj.use_captcha == "true")
9 9  <script>
... ... @@ -12,11 +12,11 @@
12 12   "action": "${elementDataObj.url}",
13 13   "method": "${elementDataObj.method}",
14 14   "data-form-product": "${elementDataObj.product}",
15 - "class": $formclass,
15 + "class": "$formclass",
16 16   "novalidate": "novalidate"
17 17   }
18 18  </script>
19 -<div class="pagemaker">
19 +<div class="pagemaker active">
20 20   #else
21 21  <form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="$formclass" data-form-product="${elementDataObj.product}" novalidate="novalidate">
22 22   #end
... ... @@ -158,7 +158,7 @@
158 158   <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
159 159   #end
160 160   #end
161 - #set($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
161 + #set($mydoc = $xwiki.getDocument('assets.pagemaker.classes.pagemakerClass'))
162 162   #if($mydoc.isNew() && $hasProgramming)
163 163   #set ($myinternaldoc = $mydoc.getDocument())
164 164   #set ($myclass = $myinternaldoc.getXClass())
... ... @@ -186,7 +186,7 @@
186 186   #set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute())
187 187   #foreach($item in $result_add_xobj)
188 188   #set($doc = $xwiki.getDocument("${space}.${item}.WebHome"))
189 - #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
189 + #set($rightXObj = $doc.getObject("assets.pagemaker.classes.pagemakerClass", true))
190 190   #set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
191 191   #set($discard = $doc.save())
192 192   #end
... ... @@ -194,7 +194,7 @@
194 194  
195 195   #set($spaceExcludeRef = $space.replaceAll('([%_!])', '!$1').concat(".${codespace}"))
196 196   #set($spaceLikeRef = $space.replaceAll('([%_!])', '!$1').concat('.%'))
197 - #set($query = $services.query.xwql("from doc.object(assets.pagemaker.pagemakerClass) met where doc.space like :space and doc.space <> :spaceExclude and doc.name <> 'WebPreferences' order by met.pmSpaceOrder asc"))
197 + #set($query = $services.query.xwql("from doc.object(assets.pagemaker.classes.pagemakerClass) met where doc.space like :space and doc.space <> :spaceExclude and doc.name <> 'WebPreferences' order by met.pmSpaceOrder asc"))
198 198   #set($result = $query.bindValue('space', $spaceLikeRef).bindValue('spaceExclude', $spaceExcludeRef).addFilter('unique').execute())
199 199  
200 200   ## Generate the select options from all child spaces that have the 'assets.pagemaker.pagemakerClass' XClass.
... ... @@ -216,7 +216,7 @@
216 216   #if(!$isGuest && $O_elementData.select-json-to-spaces == "true")
217 217   #set($spaceDocTitle = $json.get($key))
218 218   #set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name.
219 - #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass", true)) ## Get or create the needed object.
219 + #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.classes.pagemakerClass", true)) ## Get or create the needed object.
220 220   #set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
221 221   #set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
222 222   #if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.
... ... @@ -245,7 +245,24 @@
245 245   #end
246 246  #end
247 247  #macro(createTextElement $O_elementData $O_tagName)
248 - <input type="text" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end 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-pattern) data-pattern="${O_elementData.data-pattern}"#end#if($O_elementData.data-auto-first-capital) data-auto-first-capital="${O_elementData.data-auto-first-capital}"#end#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}" data-query-reference="${O_elementData.data-query-reference}"#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-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#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-ajax-check) data-ajax-check="${O_elementData.data-ajax-check}"#end>
248 + <input type="text" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end 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-pattern) data-pattern="${O_elementData.data-pattern}"#end#if($O_elementData.data-auto-first-capital) data-auto-first-capital="${O_elementData.data-auto-first-capital}"#end#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}" data-query-reference="${O_elementData.data-query-reference}"#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-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#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-ajax-check) data-ajax-check="${O_elementData.data-ajax-check}"#end#if($O_elementData.data-modal-input) data-modal-input="${O_elementData.data-modal-input}" data-modal-glue="${O_elementData.data-modal-glue}"#end>
249 + #if($O_elementData.data-modal-input)
250 +<button class="btn btn-default" data-toggle="modal" data-target="#myModal">
251 +<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
252 + <div class="modal-dialog" role="document">
253 + <div class="modal-content">
254 + #foreach($entry in $O_elementData.data-modal-input)
255 + <p>
256 + <label for="input${foreach.count}">$entry
257 + <span class="input-wrap">
258 + <input type="text" class="form-control full" id="input${foreach.count}" placeholder="${entry}">
259 + </span>
260 + </label>
261 + </p>
262 + #end
263 + </div>
264 + </div>
265 +</div>
249 249  #end
250 250  #macro(createNumberElement $O_elementData $O_tagName)
251 251   <input type="number" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end 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-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#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>