Changes for page Homeopaths

Last modified by Jip-jan Alunkel on March 14, 20:13
From version 8.115
edited by Jip-jan Alunkel
on December 08, 20:38
Change comment: Renamed from xwiki:practices.WebHome
To version 8.136
edited by Jip-jan Alunkel
on December 22, 14:36
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

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