JS: allow custom windows opening function fro routing

1 files changed, 27 insertions, 7 deletions

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index d148a8e..c1d028c 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -77,11 +77,15 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             controls:[new OpenLayers.Control.Navigation(),
                       new OpenLayers.Control.SimplePanZoom(),
                       new OpenLayers.Control.ScaleLine()],
+            category_accordion: true, // category opening behave like an accordion
             maxResolution: 156543.0399,
             units: 'm',
             projection: new OpenLayers.Projection('EPSG:4326'),
             theme:null,
             routing: false, // enable routing management
+            routing_panel_open: function(){
+                                    $('#chimere_itinerary_panel').dialog('open');
+                                },
             current_feature: null, // To store the active POI
             current_control: null, // To store the current control
             current_popup: null, // To store the current POI popup displayed
@@ -284,7 +288,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         * Display menu on the map
         */
         displayMapMenu: function(e) {
-            if (helpers.hidePopup()) return;
+            if (methods.hidePopup()) return;
             if ($('#chimere_map_menu').is(":visible")){
                 $('#chimere_map_menu').hide();
             } else{
@@ -377,6 +381,14 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                 } else {
                     master_check.removeAttr('checked');
                 }
+
+                if($('#action-categories').length){
+                    if ($('#categories input[type=checkbox]:checked').length){
+                        $('#action-categories').addClass('category-selected');
+                    } else {
+                        $('#action-categories').removeClass('category-selected');
+                    }
+                }
                 return master_check;
             };
             var _init_categories = function () {
@@ -554,7 +566,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         // set the start point for routing
         routingFrom: function(){
             $('#chimere_map_menu').hide();
-            $('#chimere_itinerary_panel').dialog('open');
+            settings.routing_panel_open();
             $('#map_menu_clear').show();
             settings.routing_start = new OpenLayers.Marker(
                                           settings.current_position.clone(),
@@ -571,7 +583,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         // add a step point for routing
         routingAddStep: function(){
             $('#chimere_map_menu').hide();
-            $('#chimere_itinerary_panel').dialog('open');
+            settings.routing_panel_open();
             $('#map_menu_clear').show();
             settings.routing_steps.push(new OpenLayers.Marker(
                                           settings.current_position.clone(),
@@ -584,7 +596,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         // set the finish point for routing
         routingTo: function(){
             $('#chimere_map_menu').hide();
-            $('#chimere_itinerary_panel').dialog('open');
+            settings.routing_panel_open();
             $('#map_menu_clear').show();
             settings.routing_end = new OpenLayers.Marker(
                                           settings.current_position.clone(),
@@ -658,7 +670,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                                             data.properties.description);
                         $('#chimere_itinerary').show();
                         $('#chimere_itinerary_form').hide();
-                        $('#chimere_itinerary_panel').dialog('open');
+                        settings.routing_panel_open();
                     },
                     error: function (data) {
                         settings.layerRoute.removeAllFeatures();
@@ -745,9 +757,11 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             // Check if element is currently visible or not
             var was_visible = $("#maincategory_" + id).is(":visible");
             // Close all categories
-            $("#categories ul.subcategories").hide();
+            if (settings.category_accordion){
+                $("#categories ul.subcategories").hide();
+                $("#categories img.toggle_category").attr("src", STATIC_URL + "chimere/img/plus.png");
+            }
             // Put a minus image
-            $("#categories img.toggle_category").attr("src", STATIC_URL + "chimere/img/plus.png");
             if (!was_visible)
             {
                 // Show the subcategories
@@ -756,6 +770,12 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                 $("#maincategory_img_" + id).attr("src", STATIC_URL + "chimere/img/minus.png");
                 settings.current_category = id;
             }
+            if (!settings.category_accordion && was_visible)
+            {
+                $("#maincategory_" + id).toggle();
+                // Put a minus image
+                $("#maincategory_img_" + id).attr("src", STATIC_URL + "chimere/img/plus.png");
+            }
         },
         zoomToCurrentExtent: function(){
             /* zoom to current extent */