From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 4 Sep 2015 15:46:29 +0000 (+0200)
Subject: Merge branch 'dev' into feature/haystack
X-Git-Tag: 1.6a^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ecfea0b3846f42a8afece6dc2576e02be9f6e323;p=telemeta.git

Merge branch 'dev' into feature/haystack
---

ecfea0b3846f42a8afece6dc2576e02be9f6e323
diff --cc telemeta/templates/telemeta/base.html
index 3977c873,4e1121d6..94400ad7
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@@ -91,10 -91,14 +91,11 @@@
  {% endif %}
  </div>
  
+ {% block search %}
  <div id="quick_search">
 -<form action="{% url "telemeta-search" %}" id="_quickSearchForm" method="get">
 +<form action="{% url "haystack_search" %}" id="_quickSearchForm" method="get">
      <div class="input-group">
 -      <input type="text" class="form-control" name="pattern">
 -      <span class="input-group-btn">
 -        <button class="btn btn-default" type="button" onclick="$('#_quickSearchForm').submit();"><span class="glyphicon glyphicon-search"></span></button>
 -      </span>
 +       <input class="form-control" id="id_q" name="q" type="text" /><span class="input-group-btn"><button type="submit" id="btn" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button></span>
      </div>
  </form>
  </div>