Changes for page Homeopaths

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

From version 8.120
edited by Jip-jan Alunkel
on December 08, 20:42
Change comment: Renamed from xwiki:practices.WebHome
To version 8.132
edited by Jip-jan Alunkel
on December 22, 14:27
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -2,24 +2,27 @@
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}))
8 8  
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 -##$q.bindValue('usr', 'practice').execute()
16 -#set($q = $services.query.xwql("where doc.space like 'homeopaths%'"))
17 -$q.execute()
18 -##$xcontext.getUserReference().getName()
19 19  </p>
20 20  <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}}
21 21  
18 +{{include reference="assets.pagemaker.macros"/}}
22 22  
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"}}
23 23  <h2>Add your practice to the map</h2>
24 24  #set($form_start = {
25 25   "id": "homeoworld_form",
... ... @@ -40,6 +40,7 @@
40 40   "data-error-response-type" : "use_label_definite_1",
41 41   "data-auto-first-capital" : "true",
42 42   "data-query-type" : "XWQL",
46 + "data-page-name": "$xcontext.getUserReference().getName()",
43 43   "data-query-reference" : "assets.pagemaker.XWQL.matchTitle",
44 44   "data-query-scope" : "homeopaths",
45 45   "data-query-list-type" : "suggest-negate",
... ... @@ -71,12 +71,6 @@
71 71  })
72 72  #createFormElement($country)
73 73  
74 -#*
75 - "data-create-xobj" : "true",
76 - "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
77 - "data-xobj-fieldname" : "country",
78 -*#
79 -
80 80  #set($address = {
81 81   "id" : "address",
82 82   "type" : "address",
... ... @@ -88,7 +88,6 @@
88 88   "data-auto-first-capital" : "true",
89 89   "data-query-type" : "address",
90 90   "data-query-reference" : "",
91 - "data-page-name": "$xcontext.getUserReference().getName()",
92 92   "data-query-list-type" : "suggest-select",
93 93   "data-query-list-header" : "$services.localization.render('pagemaker.line.suggest_select_list')",
94 94   "data-query-list-contents" : "value/key",
... ... @@ -109,4 +109,4 @@
109 109   "use_captcha": "false"
110 110  })
111 111  #createFormEnd($form_end)
112 -
109 +#end
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))