Merge branch 'v2.2'

Conflicts:
	chimere/actions.py
	chimere/admin.py
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/models.py
	chimere/urls.py
	chimere/utils.py
	chimere/views.py

1 files changed, 3 insertions, 2 deletions

diff --git a/chimere/templates/search/search.html b/chimere/templates/search/search.html
index 95d3937..ab3e61e 100644
--- a/chimere/templates/search/search.html
+++ b/chimere/templates/search/search.html
@@ -30,7 +30,7 @@ var end_do_you_mean = "{% trans '?' %}";
 {% 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"><span class='action-label'>{% trans "Search" %} </span><span class="glyphicon glyphicon-search"></span></button>
+    <button name='haystack-search' id='haystack-search' type='button' 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>
@@ -42,10 +42,11 @@ $(function(){
             $("#main-map").chimere("razMap");
             haystack_search(evt);
     });
+    {% if autocomplete %}
     window.autocomplete = new Autocomplete({
         form_selector: '.autocomplete-me'
     });
-    window.autocomplete.setup();
+    window.autocomplete.setup();{% endif %}
 });
 </script>
 {% endif %}