Native search: adapt template, views and javascript

4 files changed, 5 insertions, 4 deletions

diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index 7887103..dbfdd46 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -97,7 +97,7 @@ var update_editroute = function(){
 };
 
 var action_map = function(){
-        $('#main_map').chimere('deactivateEdition');
+        $('#main-map').chimere('deactivateEdition');
         $('#message').hide();
         $('.map_button').hide();
         $("#main-map").chimere('cleanRoute');
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 7bc8426..1690189 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -115,7 +115,7 @@
    var has_search = {% if has_search %}true{% else %}false{% endif %};
    // array to keep trace of already displayed items
    var search_result = new Array();
-   var search_url = "/search/";
+   var search_url = "{% url 'chimere:search' area_name %}";
    $(function(){
        $("#modal-edit").on("hide.bs.modal", function() {
          $("#modal-edit .modal-body").html("");
diff --git a/templates/search/search.html b/templates/search/search_haystack.html
index 3727ee2..05ca407 100644
--- a/templates/search/search.html
+++ b/templates/search/search_haystack.html
@@ -1,10 +1,10 @@
-{% load url from future %}{% load i18n %}
+{% load i18n %}
 <script type='text/javascript'>
 var do_you_mean = "{% trans 'Do you mean: ' %}";
 var end_do_you_mean = "{% trans '?' %}";
 </script>
 {% if query %}
-{% include "search/search_js.html" %}
+{% include "search/search_haystack_js.html" %}
 <div id='search-listing'>
   <ul>
 {% for result in page.object_list %}{% if result.object %}
diff --git a/views.py b/views.py
index b6e59e6..39ddcb4 100644
--- a/views.py
+++ b/views.py
@@ -62,6 +62,7 @@ class DynCSS(TemplateView):
             context['categories'].append((cat.pk, color))
         return context
 
+
 editMarker = edit_page(get_edit_marker, ['M', 'B'], 'marker',
                        PointChooserWidget, init_widget=False)
 editRoute = edit_page(get_edit_route, ['R', 'B'], 'route',