1 files changed, 35 insertions, 8 deletions
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 56deff82e..f9fba7ba4 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -1,7 +1,5 @@
 {% load i18n %}
 
-<p class="text-center">
-
 <button id='search_{{name}}' class='btn btn-primary search_button'
         type="button">
     {% trans "Search" %}</button>
@@ -27,8 +25,8 @@
   </div>
 </div>
 
-{% if gallery %}
-{% include "blocks/DataTables-gallery.html" %}
+{% if gallery or use_map %}
+{% include "blocks/DataTables-tabs.html" %}
 {% else %}
 {% include "blocks/DataTables-content.html" %}
 {% endif %}
@@ -51,15 +49,22 @@ $('#modal_grid_{{name}}').on('hide.bs.modal', function (e) {
     current_modal = null;
 });
 
+{% if gallery or use_map %}
+$("#tab-grid-{{name}}").click(function(){
+    current_tab = "table";
+    datatable_submit_search();
+});
+{% endif %}
 {% if gallery %}
 $("#tab-gallery-{{name}}").click(function(){
     current_tab = "gallery";
     gallery_submit_search();
 });
-
-$("#tab-grid-{{name}}").click(function(){
-    current_tab = "table";
-    datatable_submit_search();
+{% endif %}
+{% if use_map %}
+$("#tab-map-{{name}}").click(function(){
+    current_tab = "map";
+    map_submit_search();
 });
 {% endif %}
 
@@ -95,6 +100,28 @@ gallery_submit_search = function(image_page){
     return false;
 };
 {% endif %}
+{% if use_map %}
+map_submit_search = function(){
+    var data = search_get_query_data(query_vars, "{{name}}");
+    var nb_select = jQuery("#id_{{name}}-length_map").val();
+    if (!nb_select) nb_select = 10;
+
+    var url = "{{source}}json-map?length=" + nb_select + "&submited=1&" + data;
+    $.getJSON(url, function(data) {
+        var timestamp = Math.floor(Date.now() / 1000);
+        var map_id = "map-" + timestamp;
+        var result = render_map(data, "{{name}}", nb_select, map_id);
+        $("#tab-content-map-{{name}}").html(result["html"]);
+        $("#id_{{name}}-length_map").change(map_submit_search);
+        register_map(map_id, result["points"]);
+    });
+
+    if ($('.modal-progress').length > 0){
+        $('.modal-progress').modal('hide');
+    }
+    return false;
+};
+{% endif %}
 
 datatable_submit_search = function(){
     var data = search_get_query_data(query_vars, "{{name}}");