Changes for page Homeopaths

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

From version 8.143
edited by Jip-jan Alunkel
on December 24, 13:33
Change comment: Renamed from xwiki:practices.WebHome
To version 8.126
edited by Jip-jan Alunkel
on December 08, 21:00
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -5,20 +5,21 @@
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 8  {{html wiki="false" clean="false"}}
9 9  <p>
10 10  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', $xcontext.getUserReference().getName()).execute()
16 +###set($q = $services.query.xwql("where doc.space like 'homeopaths.%' and doc.name like '%practice%'"))
17 +##$q.execute()
18 +##
11 11  </p>
12 12  <div id="homeopaths_map"></div>
13 -#if(!$isGuest)
14 14  
15 -$xcontext.getUserReference()
16 16  
17 - #set($q = $services.query.xwql("where doc.space like 'homeopaths.%' and doc.name like :usr"))
18 - #set($r = $q.bindValue('usr', $xcontext.getUserReference().getName()).execute())
19 - #set($practice_exists = $r.size() > 0)
20 - #if(!$practice_exists)
21 -
22 22  <h2>Add your practice to the map</h2>
23 23  #set($form_start = {
24 24   "id": "homeoworld_form",
... ... @@ -49,6 +49,7 @@
49 49   "help-block" : 'This will be used as the title of your practice page. The first character must be a letter.'
50 50  })
51 51  #createFormElement($practice_name)
53 +
52 52  #set($country = {
53 53   "id" : "country",
54 54   "type" : "text",
... ... @@ -69,6 +69,13 @@
69 69   "help-block" : 'Input and select the country where your practice resides.'
70 70  })
71 71  #createFormElement($country)
74 +
75 +#*
76 + "data-create-xobj" : "true",
77 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
78 + "data-xobj-fieldname" : "country",
79 +*#
80 +
72 72  #set($address = {
73 73   "id" : "address",
74 74   "type" : "address",
... ... @@ -100,7 +100,4 @@
100 100   "use_captcha": "false"
101 101  })
102 102  #createFormEnd($form_end)
103 - #end
104 -#end
105 -{{/html}}
106 -{{/velocity}}
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))