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

Conflicts:
	static/saclay/js/interface.js

1 files changed, 39 insertions, 33 deletions

diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index 6fdfd93..0aadafd 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -109,7 +109,41 @@ var update_editroute = function(){
         });
 };
 
+var action_map = function(){
+        $('#main_map').chimere('deactivateEdition');
+        $('#message').hide();
+        $('.map_button').hide();
+        $("#main-map").chimere('cleanRoute');
+        $("#main-map").chimere('cleanMarker');
+        $("#main-map").chimere('activateContextMenu');
+        if($("#itinerary_field").html()){
+            $("#chimere_itinerary_form").appendTo("#chimere_itinerary_panel");
+            if($("#chimere_itinerary").css('display') != 'none'){
+                $("#chimere_itinerary_form").hide();
+            }
+        }
+        $('#action-participate').removeClass('state-active');
+        $('#action-carte').addClass('state-active');
+        $('#edit-actions').hide();
+        $('#map-actions').show();
+        $('#edit-panel').hide();
+        $('#map-panel').show();
+};
+
+var action_participate = function(){
+        $('.map_button').hide();
+        $('#message').hide();
+        $('#action-carte').removeClass('state-active');
+        $('#action-participate').addClass('state-active');
+        $('#map-actions').hide();
+        $('#edit-actions').show();
+        $('#map-panel').hide();
+        $('#edit-panel').show();
+        update_editmarker();
+};
+
 var routing_panel_open = function(){
+    action_map();
     $('#frm_categories').hide();
     $('#search-box').hide();
     $('#frm-edit-marker').hide();
@@ -118,6 +152,7 @@ var routing_panel_open = function(){
 };
 
 var category_panel_open = function(){
+    action_map();
     $('#chimere_itinerary_panel').hide();
     $('#search-result').hide();
     $('#frm-edit-marker').hide();
@@ -127,6 +162,7 @@ var category_panel_open = function(){
 };
 
 var search_panel_open = function(){
+    action_map();
     $('#chimere_itinerary_panel').hide();
     $('#frm_categories').hide();
     $('#frm-edit-marker').hide();
@@ -136,8 +172,7 @@ var search_panel_open = function(){
 };
 
 var edit_panel_open = function(){
-    update_editmarker();
-    $('#chimere_itinerary_panel').hide();
+    action_participate();
     $('#search-box').hide();
     $('#search-result').hide();
     $('#frm_categories').hide();
@@ -213,38 +248,9 @@ $(function(){
     $("#action-news").click(function(){
         $('#news').dialog('open');
     });
-    $("#action-carte").click(function(){
-        $('#main_map').chimere('deactivateEdition');
-        $('#message').hide();
-        $('.map_button').hide();
-        $("#main-map").chimere('cleanRoute');
-        $("#main-map").chimere('cleanMarker');
-        $("#main-map").chimere('activateContextMenu');
-        if($("#itinerary_field").html()){
-            $("#chimere_itinerary_form").appendTo("#chimere_itinerary_panel");
-            if($("#chimere_itinerary").css('display') != 'none'){
-                $("#chimere_itinerary_form").hide();
-            }
-        }
-        $('#action-participate').removeClass('state-active');
-        $('#action-carte').addClass('state-active');
-        $('#edit-actions').hide();
-        $('#map-actions').show();
-        $('#edit-panel').hide();
-        $('#map-panel').show();
-    });
+    $("#action-carte").click(action_map);
 
-    $("#action-participate").click(function(){
-        $('.map_button').hide();
-        $('#message').hide();
-        $('#action-carte').removeClass('state-active');
-        $('#action-participate').addClass('state-active');
-        $('#map-actions').hide();
-        $('#edit-actions').show();
-        $('#map-panel').hide();
-        $('#edit-panel').show();
-        update_editmarker();
-    });
+    $("#action-participate").click(action_participate);
 
     $("#action-edit-event").click(update_editevent);
     $("#action-edit-marker").click(update_editmarker);