diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-21 20:05:47 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-21 20:05:47 +0100 |
| commit | b834a47ecafc41d5bafe38e7b085b2845406a47c (patch) | |
| tree | 347edf5446fba447703cd93cf47e3124d01e46be /chimere/templates | |
| parent | d5bcdc7eab034a1770335190fb9ebc09c3e6d3f6 (diff) | |
| download | Chimère-b834a47ecafc41d5bafe38e7b085b2845406a47c.tar.bz2 Chimère-b834a47ecafc41d5bafe38e7b085b2845406a47c.zip | |
OL3: marker and popup OK
Diffstat (limited to 'chimere/templates')
| -rw-r--r-- | chimere/templates/chimere/blocks/map.html | 4 | ||||
| -rw-r--r-- | chimere/templates/chimere/main_map.html | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html index 065fc34..99c8738 100644 --- a/chimere/templates/chimere/blocks/map.html +++ b/chimere/templates/chimere/blocks/map.html @@ -46,9 +46,7 @@ $(function(){ {% if p_routing_steps %}chimere_init_options["routing_steps_lonlat"] = [{{ p_routing_steps }}];{% endif %} {% if p_routing_transport %}chimere_init_options["routing_transport"] = "{{ p_routing_transport }}";{% endif %} {% if p_routing_speed %}chimere_init_options["routing_speed"] = "{{ p_routing_speed }}";{% endif %} - // chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}}, - // {{icon_offset_y}}); - chimere_init_options["icon_offset"] = ({{icon_offset_x}}, {{icon_offset_y}}); + chimere_init_options["icon_offset"] = [{{icon_offset_x}}, {{icon_offset_y}}]; chimere_init_options["dynamic_categories"] = {{ dynamic_categories }}; {% if p_display_submited %}chimere_init_options["display_submited"] = {{ p_display_submited }};{% endif %} chimere_init_options["checked_categories"] = [{% for cc in checked_categories %}{% if forloop.counter0 > 0 %}, {% endif %}{{cc}}{% endfor %}]; diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html index a3dec9a..6f53611 100644 --- a/chimere/templates/chimere/main_map.html +++ b/chimere/templates/chimere/main_map.html @@ -45,6 +45,7 @@ {% endblock %} {% block content %} {{block.super}} + <div id='popup'></div> <div id='main-map'></div> <script type="text/javascript"> $("#main-map").show(); |