Changes for page Homeopaths

Last modified by Jip-jan Alunkel on March 14, 20:13
From version 8.137
edited by Jip-jan Alunkel
on December 22, 14:37
Change comment: Renamed from xwiki:practices.WebHome
To version 8.122
edited by Jip-jan Alunkel
on December 08, 20:43
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -1,8 +4,6 @@
1 -
2 -{{velocity}}
3 -
4 4  {{include reference="assets.pagemaker.macros"/}}
5 5  
3 +{{velocity}}
6 6  #set($discard = $services.localization.use('document', 'homeopaths.Code.translations'))
7 7  #set($discard = $services.localization.use('document', 'assets.pagemaker.translations'))
8 8  #set($discard = $xwiki.ssx.use('assets.pagemaker.WebHome', {'minify': false}))
... ... @@ -11,13 +11,17 @@
11 11  {{html wiki="false" clean="false"}}
12 12  <p>
13 13  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.%' and doc.name like '%practice%'"))
17 +$q.execute()
18 +##$xcontext.getUserReference().getName()
14 14  </p>
15 15  <div id="homeopaths_map"></div>
16 -#set($q = $services.query.xwql("where doc.space like 'homeopaths.%' and doc.name like :usr"))
17 -#set($r = $q.bindValue('usr', $xcontext.getUserReference().getName()).execute())
18 -#set($practice_exists = $r.size() > 0)
19 -#if($practice_exists != false)
20 20  
22 +
21 21  <h2>Add your practice to the map</h2>
22 22  #set($form_start = {
23 23   "id": "homeoworld_form",
... ... @@ -38,7 +38,6 @@
38 38   "data-error-response-type" : "use_label_definite_1",
39 39   "data-auto-first-capital" : "true",
40 40   "data-query-type" : "XWQL",
41 - "data-page-name": "$xcontext.getUserReference().getName()",
42 42   "data-query-reference" : "assets.pagemaker.XWQL.matchTitle",
43 43   "data-query-scope" : "homeopaths",
44 44   "data-query-list-type" : "suggest-negate",
... ... @@ -70,6 +70,12 @@
70 70  })
71 71  #createFormElement($country)
72 72  
74 +#*
75 + "data-create-xobj" : "true",
76 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
77 + "data-xobj-fieldname" : "country",
78 +*#
79 +
73 73  #set($address = {
74 74   "id" : "address",
75 75   "type" : "address",
... ... @@ -81,6 +81,7 @@
81 81   "data-auto-first-capital" : "true",
82 82   "data-query-type" : "address",
83 83   "data-query-reference" : "",
91 + "data-page-name": "$xcontext.getUserReference().getName()",
84 84   "data-query-list-type" : "suggest-select",
85 85   "data-query-list-header" : "$services.localization.render('pagemaker.line.suggest_select_list')",
86 86   "data-query-list-contents" : "value/key",
... ... @@ -101,6 +101,4 @@
101 101   "use_captcha": "false"
102 102  })
103 103  #createFormEnd($form_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))