Changes for page Homeopaths

Last modified by Jip-jan Alunkel on March 14, 20:13
From version 8.132
edited by Jip-jan Alunkel
on December 22, 14:27
Change comment: Renamed from xwiki:practices.WebHome
To version 8.122
edited by Jip-jan Alunkel
on December 08, 20:43
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -2,27 +2,24 @@
2 2  
3 3  {{velocity}}
4 4  #set($discard = $services.localization.use('document', 'homeopaths.Code.translations'))
5 +#set($discard = $services.localization.use('document', 'assets.pagemaker.translations'))
6 +#set($discard = $xwiki.ssx.use('assets.pagemaker.WebHome', {'minify': false}))
7 +#set($discard = $xwiki.jsx.use('assets.pagemaker.WebHome', {'minify': false}))
5 5  
6 6  {{html wiki="false" clean="false"}}
7 7  <p>
8 8  All about homeopaths.
12 +##from XWikiSpace as space where doc.space = space.reference and ((doc.name <> 'WebHome' and lower(doc.name) like '%wiki%') or (doc.name = 'WebHome' and lower(space.name) like '%wiki%'))
13 +
14 +##set($q = $services.query.xwql("where doc.space like 'homeopaths' and doc.name like :usr"))
15 +##$q.bindValue('usr', 'practice').execute()
16 +#set($q = $services.query.xwql("where doc.space like 'homeopaths.%' and doc.name like '%practice%'"))
17 +$q.execute()
18 +##$xcontext.getUserReference().getName()
9 9  </p>
10 10  <div id="homeopaths_map"></div>
11 -#set($q = $services.query.xwql("where doc.space like 'homeopaths.%' and doc.name like :usr"))
12 -#set($r = $q.bindValue('usr', $xcontext.getUserReference().getName()).execute())
13 -#set($practice_exists = $r.size() > 0)
14 -#if($practice_exists != false)
15 -{{/html}}
16 -{{/velocity}}
17 17  
18 -{{include reference="assets.pagemaker.macros"/}}
19 19  
20 -{{velocity}}
21 -#set($discard = $services.localization.use('document', 'assets.pagemaker.translations'))
22 -#set($discard = $xwiki.ssx.use('assets.pagemaker.WebHome', {'minify': false}))
23 -#set($discard = $xwiki.jsx.use('assets.pagemaker.WebHome', {'minify': false}))
24 -
25 -{{html wiki="false" clean="false"}}
26 26  <h2>Add your practice to the map</h2>
27 27  #set($form_start = {
28 28   "id": "homeoworld_form",
... ... @@ -43,7 +43,6 @@
43 43   "data-error-response-type" : "use_label_definite_1",
44 44   "data-auto-first-capital" : "true",
45 45   "data-query-type" : "XWQL",
46 - "data-page-name": "$xcontext.getUserReference().getName()",
47 47   "data-query-reference" : "assets.pagemaker.XWQL.matchTitle",
48 48   "data-query-scope" : "homeopaths",
49 49   "data-query-list-type" : "suggest-negate",
... ... @@ -75,6 +75,12 @@
75 75  })
76 76  #createFormElement($country)
77 77  
74 +#*
75 + "data-create-xobj" : "true",
76 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
77 + "data-xobj-fieldname" : "country",
78 +*#
79 +
78 78  #set($address = {
79 79   "id" : "address",
80 80   "type" : "address",
... ... @@ -86,6 +86,7 @@
86 86   "data-auto-first-capital" : "true",
87 87   "data-query-type" : "address",
88 88   "data-query-reference" : "",
91 + "data-page-name": "$xcontext.getUserReference().getName()",
89 89   "data-query-list-type" : "suggest-select",
90 90   "data-query-list-header" : "$services.localization.render('pagemaker.line.suggest_select_list')",
91 91   "data-query-list-contents" : "value/key",
... ... @@ -106,4 +106,4 @@
106 106   "use_captcha": "false"
107 107  })
108 108  #createFormEnd($form_end)
109 -#end
112 +
XWiki.JavaScriptExtension[0]
Code
... ... @@ -1,5 +3,3 @@
1 -/* Leaflet interactive maps javascript library, based on OpenStreetMap */
2 -/* ------------------------------------------------------------------- */
3 3   var map = L.map('homeopaths_map').setView([18, 10], 2);
4 4   L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
5 5   maxZoom: 19,
... ... @@ -23,7 +23,7 @@
23 23   #end
24 24   #set($address = "${address}${address_item.trim()}${linebreak}")
25 25   #end
26 - #set($info = "<h4><a href='$xwiki.getURL($result_doc.documentReference)'>${stringtool.capitalize($result_doc.getDisplayTitle())}</a></h4><address>${address}</address>")
24 + #set($info = "<h4><a href='$xwiki.getURL($result_doc.documentReference)'>${stringtool.capitalize($result_doc.documentReference.getName())}</a></h4><address>${address}</address>")
27 27   #set($discard = $map.put($info, $result_obj.getProperty("latlong").value))
28 28   #end
29 29   #if($objecttool.allNull($map))