Merge branch 'master' into saclay

3 files changed, 24 insertions, 1 deletions

diff --git a/settings.py b/settings.py
index ef31399..b86c620 100644
--- a/settings.py
+++ b/settings.py
@@ -53,6 +53,10 @@ CHIMERE_DISPLAY_AREAS = True
 # don't forget to run the upgrade.py script to create appropriate fields in
 # the database
 CHIMERE_DAYS_BEFORE_EVENT = 30
+# Dated events must usualy be checked as 'front page' to be displayed
+# on front page - set CHIMERE_ALL_DATED_ARE_FRONT to True if you want to
+# display all events on front page
+CHIMERE_ALL_DATED_ARE_FRONT = True
 # allow feeds
 CHIMERE_FEEDS = True
 
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index 76a63da..3f23a72 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -156,9 +156,26 @@ $(function(){
             par.removeClass('opened');
         }
     });
-
+    $('input[name="transport"]').change(change_routing_transport);
+    $('input[name="speed"]').change(change_routing_speed);
+    $('#id_speed').change(change_routing_speed);
 });
 
+function change_routing_speed(){
+    var speed = $('#id_speed option:selected').val();
+    if(!speed){
+       speed = $('input[name=speed]:checked').val();
+    }
+    if (!speed) return;
+    speed = speed.split('_')[1]
+    $('#main-map').chimere('routingChangeSpeed', speed);
+}
+
+function change_routing_transport(){
+    $('#main-map').chimere('routingChangeTransport',
+                           $('input[name="transport"]:checked').val());
+}
+
 function display_feature_detail(data, settings){
     settings.current_popup.setContentHTML("<div class='cloud'>" + data + "</div>");
     $('.detail_zoomin').bind("click", function(event){
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 2990781..e2e8292 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -154,6 +154,8 @@ $(function(){
     {% if p_routing_end_lon %}chimere_init_options["routing_end_lon"] = {{ p_routing_end_lon }};{% endif %}
     {% if p_routing_end_lat %}chimere_init_options["routing_end_lat"] = {{ p_routing_end_lat }};{% endif %}
     {% 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['marker_hover_offset'] = new OpenLayers.Pixel(7, 20);