Merge branch 'master-v3.0' into saclay-v3.0

Conflicts:
	templates/chimere/blocks/map.html

2 files changed, 14 insertions, 1 deletions

diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 7acd7b0..006eed7 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -1001,6 +1001,11 @@ ul#action{
     height:auto;
 }
 
+.layer-switcher{
+    top: 0.5em;
+    right: 3.5em;
+}
+
 #layer_selection{
     top:40px;
     left:auto;
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 00c5079..f482ecd 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -184,12 +184,19 @@ $("#{{map_id}}").show();
     if (!permalink) $('#{{map_id}}').chimere('zoom', {'area':{{zoom}} });
     {% endif %}
 
-    $('#{{map_id}}').chimere('addJSON', "{{STATIC_URL}}saclay/json/limites.json");
+    {% for overlay in json_overlays %}
+    $('#{{map_id}}').chimere('addJSON', '{{overlay.overlay_file.url}}',
+                           "{{overlay.name}}"{% if overlay.style %},
+                           "EPSG:4326",
+                           {{overlay.style|safe}}{% endif %});
+    {% endfor %}
+
     function update_permalink(){
         $('#{{map_id}}').chimere('update_permalink');
     };
 
     // init layer selection
+    {% comment %}
     $(function() {
         {% for layer_name, js, def in map_layers %}
         $('#layer_list').append("<li class='layer_map{% if def %} selected{%endif%}'><input type='radio' value='{{forloop.counter0}}' name='layer_type' id='layer_{{forloop.counter}}'{% if def %} checked='checked'{% endif %}><label for='layer_{{forloop.counter}}'>{{layer_name}}</li>");{% endfor %}
@@ -223,6 +230,7 @@ $("#{{map_id}}").show();
             }
         });
     });
+    {% endcomment %}
 </script>
 <div id='marker_hover'><div id='marker_hover_content'></div></div>
 <div class="modal fade" id="cluster_list" tabindex="-1" role="dialog" aria-labelledby="cluster-label" aria-hidden="true">