diff options
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere-leaflet.js | 12 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/map.html | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere-leaflet.js b/chimere/static/chimere/js/jquery.chimere-leaflet.js index c75a3b7..873f2f4 100644 --- a/chimere/static/chimere/js/jquery.chimere-leaflet.js +++ b/chimere/static/chimere/js/jquery.chimere-leaflet.js @@ -128,7 +128,11 @@ See the file COPYING for details. for (idx=0 ; idx < settings.map_layers.length ; idx++){ map_layers[settings.map_layer_names[idx]] = settings.map_layers[idx]; } - settings.layer_control = L.control.layers(map_layers).addTo(map); + var layer_control_options = {}; + if (settings.simple){ + layer_control_options['position'] = 'topleft'; + } + settings.layer_control = L.control.layers(map_layers, null, layer_control_options).addTo(map); if(settings.zoom && settings.lat && settings.lon){ map.setView([settings.lat, settings.lon], settings.zoom); } else { @@ -577,11 +581,11 @@ See the file COPYING for details. settings.display_feature_detail_fx(data, settings); } else { - if (!settings.popupContentFull) { - $('#detail').html(data).show(); + if (settings.popupContentFull || settings.simple) { + settings.map._popup.setContent("<div class='cloud'>" + data + "</div>"); } else { - settings.current_popup.setContentHTML("<div class='cloud'>" + data + "</div>"); + $('#detail').html(data).show(); } } } diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html index 5268fd3..262c7f2 100644 --- a/chimere/templates/chimere/blocks/map.html +++ b/chimere/templates/chimere/blocks/map.html @@ -19,6 +19,9 @@ {% if single_category %} $(function() {$('#panel').hide()});{% endif %} var chimere_init_options = {}; + if (typeof simple != 'undefined'){ + chimere_init_options['simple'] = simple; + } chimere_init_options["default_icon"] = '{{STATIC_URL}}img/marker-green.png'; chimere_init_options["map_layers"] = [{{js_map_layers|safe|escape}}]; chimere_init_options["map_layer_names"] = [{{js_map_layer_names|safe|escape}}]; |