replace the previous search form/link with the new one

diff --git a/telemeta/templates/search/search.html b/telemeta/templates/search/search.html
index 04162e4a495110e064de974202776a560802ff16..dde6aa6e925c4125fffe44dcb3f4b79a19934773 100644 (file)
--- a/telemeta/templates/search/search.html
+++ b/telemeta/templates/search/search.html
@@ -4,7 +4,6 @@
 {% load bootstrap_pagination %}
 
 {% block title %}
-{% trans "Search" %}
 {% endblock %}
 {% block extra_stylesheets %}
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery-ui.css" />
@@ -55,14 +54,6 @@
     </style>
 {% endblock %}
 {% block content %}
-
-    <form method="get" action=".">
-        <div class="input-group col-md-3">
-            {{ form.q.errors }}
-            {{form.q}}<span class="input-group-btn"><button type="submit" id="btn" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button></span>
-        </div>
-        <div ><a href="{% url "haystack_advance_search" %}">&raquo; recherche avancée</a></div></br>
-    </form>
         {% if query %}
 
 

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 51dcb80c2b090cdf5c6dd0ecce9807d71e8cdd62..3977c8732f6d52d9788da8fa0d1a9377bc5a5ef9 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -92,12 +92,9 @@
 </div>
 
 <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>
@@ -125,7 +122,7 @@
 
  <li><a href="{% url "telemeta-geo-continents" %}" class="yellow">{% trans "Geo Navigator" %}</a></li>
 
- <li><a href="{% url "telemeta-search-criteria" %}" class="orange">{% trans "Advanced search" %}</a></li>
+ <li><a href="{% url "haystack_advance_search" %}" class="orange">{% trans "Advanced search" %}</a></li>
  {% if user.is_authenticated %}
   {% if user.is_staff or not perms.telemeta.can_not_view_users_and_profiles %}
   <li><a href="{% url "telemeta-users" %}" class="red">{% trans "Users" %}</a></li>