4 files changed, 38 insertions, 15 deletions
diff --git a/chimere/templates/search/indexes/chimere/marker_text.txt b/chimere/templates/search/indexes/chimere/marker_text.txt
index ad5bae1..7c7929d 100644
--- a/chimere/templates/search/indexes/chimere/marker_text.txt
+++ b/chimere/templates/search/indexes/chimere/marker_text.txt
@@ -1,3 +1,4 @@
 {% load unescape %}
 {{object.name}}
 {{object.description|safe|striptags|unescape}}
+{{object.keywords}}
diff --git a/chimere/templates/search/indexes/chimere/route_text.txt b/chimere/templates/search/indexes/chimere/route_text.txt
index 2fad18d..5e612cd 100644
--- a/chimere/templates/search/indexes/chimere/route_text.txt
+++ b/chimere/templates/search/indexes/chimere/route_text.txt
@@ -1 +1,2 @@
 {{object.name}}
+{{object.keywords}}
diff --git a/chimere/templates/search/search.html b/chimere/templates/search/search.html
index b40359a..95d3937 100644
--- a/chimere/templates/search/search.html
+++ b/chimere/templates/search/search.html
@@ -1,18 +1,10 @@
 {% load url from future %}{% load i18n %}
-{% if query %}
 <script type='text/javascript'>
-var geo_objects = [{% for result in page.object_list %}{{result.object.getGeoJSON|safe}}{% if not forloop.last %}, {% endif %}{% endfor %}];
-var geo_features = {};
-for (idx=0 ; idx < geo_objects.length ; idx++){
-    var c_idx = geo_objects[idx].properties.pk;
-    if (search_result.indexOf(c_idx) == -1){
-        search_result.push(c_idx);
-        geo_features[c_idx] = $('#main-map').chimere('addMarker',
-                                                     geo_objects[idx]);
-    }
-}
-{% if page.object_list.count %}$("#main-map").chimere("zoomToMarkerExtent");{% endif %}
+var do_you_mean = "{% trans 'Do you mean: ' %}";
+var end_do_you_mean = "{% trans '?' %}";
 </script>
+{% if query %}
+{% include "search/search_js.html" %}
 <div id='search-listing'>
   <ul>
 {% for result in page.object_list %}
@@ -26,16 +18,21 @@ for (idx=0 ; idx < geo_objects.length ; idx++){
 </div>
 {% if page.has_previous or page.has_next %}
     <div id='search-nav'>
-        {% if page.has_previous %}<a href="#" onclick="haystack_search(this, {{ page.previous_page_number }});">{% trans "Previous" %}</a>{% endif %}
-        {% if page.has_next %}<a href="#" onclick="haystack_search(this, {{ page.next_page_number }});">{% trans "More results..." %}</a>{% endif %}
+    <nav>
+      <ul class="pager">
+        {% if page.has_previous %}<li class="previous"><a href="#" onclick="haystack_search(this, {{ page.previous_page_number }});">&larr; {% trans "Previous" %}</a></li>{% endif %}
+        {% if page.has_next %}<li class="next"><a href="#" onclick="haystack_search(this, {{ page.next_page_number }});">{% trans "More results..." %} &rarr;</a></li>{% endif %}
+      </ul>
+    </nav>
     </div>
 {% endif %}
 
 {% else %}
 <form id='search-form' class='autocomplete-me'>
     <input type="text" id="id_q" name="q" autocomplete="off"/>
-    <button name='haystack-search' id='haystack-search' type='button' disabled='disabled' class="btn btn-default">{% trans "Search" %}</button>
+    <button name='haystack-search' id='haystack-search' type='button' disabled='disabled' class="btn btn-default"><span class='action-label'>{% trans "Search" %} </span><span class="glyphicon glyphicon-search"></span></button>
 </form>
+<div id='spelling'></div>
 <div id='search-result'></div>
 <script type='text/javascript'>
 no_result_message = "{% trans 'No exact match.' %}";
diff --git a/chimere/templates/search/search_js.html b/chimere/templates/search/search_js.html
new file mode 100644
index 0000000..c8d9812
--- /dev/null
+++ b/chimere/templates/search/search_js.html
@@ -0,0 +1,24 @@
+<script type='text/javascript'>
+$(function(){
+    // clean checked categories
+    $('.subcategory').each(function(){ $(this).removeClass('selected'); });
+    $('.subcategory input[type=checkbox]').attr('checked', false);
+
+    var geo_objects = [];
+    {% for result in page.object_list %}var c_lst ={{result.object.getGeoJSON|safe}};
+    for (idx in c_lst){
+        geo_objects.push(c_lst[idx]);
+    }{% endfor %}
+    var geo_features = {};
+    for (idx=0 ; idx < geo_objects.length ; idx++){
+        var c_idx = geo_objects[idx].properties.pk;
+        if (search_result.indexOf(c_idx) == -1){
+            search_result.push(c_idx);
+            geo_features[c_idx] = $('#main-map').chimere('addMarker',
+                                                         geo_objects[idx]);
+        }
+    }
+    window.setTimeout(function(){$("#main-map").chimere("zoomToMarkerExtent")}, 500);
+});
+</script>
+