Changes for page Homeopaths

Last modified by Jip-jan Alunkel on March 14, 20:13

From version 8.127
edited by Jip-jan Alunkel
on December 08, 21:13
Change comment: Renamed from xwiki:practices.WebHome
To version 8.141
edited by Jip-jan Alunkel
on December 22, 14:55
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -5,26 +5,17 @@
5 5  #set($discard = $services.localization.use('document', 'assets.pagemaker.translations'))
6 6  #set($discard = $xwiki.ssx.use('assets.pagemaker.WebHome', {'minify': false}))
7 7  #set($discard = $xwiki.jsx.use('assets.pagemaker.WebHome', {'minify': false}))
8 -
8 +$isGuest
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 :usr"))
15 -#set($r = $q.bindValue('usr', $xcontext.getUserReference().getName()).execute()
16 -###set($q = $services.query.xwql("where doc.space like 'homeopaths.%' and doc.name like '%practice%'"))
17 -##$q.execute()
18 -##
19 -#if($r.size() > 0)
20 -Practice page exists.
21 -#else
22 -No practice page.
23 -#end
24 24  </p>
25 25  <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 && !$isGuest)
26 26  
27 -
28 28  <h2>Add your practice to the map</h2>
29 29  #set($form_start = {
30 30   "id": "homeoworld_form",
... ... @@ -77,12 +77,6 @@
77 77  })
78 78  #createFormElement($country)
79 79  
80 -#*
81 - "data-create-xobj" : "true",
82 - "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
83 - "data-xobj-fieldname" : "country",
84 -*#
85 -
86 86  #set($address = {
87 87   "id" : "address",
88 88   "type" : "address",
... ... @@ -114,4 +114,6 @@
114 114   "use_captcha": "false"
115 115  })
116 116  #createFormEnd($form_end)
117 -
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))