Changes for page Homeopaths

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

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

Summary

Details

Page properties
Content
... ... @@ -9,13 +9,22 @@
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
12 12  </p>
13 13  <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)
18 18  
27 +
19 19  <h2>Add your practice to the map</h2>
20 20  #set($form_start = {
21 21   "id": "homeoworld_form",
... ... @@ -68,6 +68,12 @@
68 68  })
69 69  #createFormElement($country)
70 70  
80 +#*
81 + "data-create-xobj" : "true",
82 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
83 + "data-xobj-fieldname" : "country",
84 +*#
85 +
71 71  #set($address = {
72 72   "id" : "address",
73 73   "type" : "address",
... ... @@ -99,6 +99,4 @@
99 99   "use_captcha": "false"
100 100  })
101 101  #createFormEnd($form_end)
102 -#end
103 -{{/html}}
104 -{{/velocity}}
117 +
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))