fix search in episode section

diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py
index 9877b3ba498f9053e714a073cb454f1bb149abfe..1340ee5f4ff100a2fa816c66f501ec05f5fe8e79 100644 (file)
--- a/panikweb/paniktags/templatetags/paniktags.py
+++ b/panikweb/paniktags/templatetags/paniktags.py
@@ -56,6 +56,7 @@ def emission_nav(context, date=None, klass=None):
         'episodes': context.get('episodes'),
         'emission': context.get('emission'),
         'episode': context.get('episode'),
+        'search_query': context.get('search_query'),
     }
 
 @register.inclusion_tag('episodes/inline.html', takes_context=True)

diff --git a/panikweb_templates/templates/emissions/episodes.html b/panikweb_templates/templates/emissions/episodes.html
index d37fa26354c38d522ffddaab13224585c39f9e0f..e6671fd17c330712dd50b505ed8f30017b7b60c4 100644 (file)
--- a/panikweb_templates/templates/emissions/episodes.html
+++ b/panikweb_templates/templates/emissions/episodes.html
@@ -5,13 +5,6 @@
 {% endblock %}
 
 {% block main %}
-<form method="get" action="." class="padded center" id="search-form">
-       <div class="big ">
-               <label for="id_q">Rechercher :</label>
-               <input id="id_q" name="q" type="text" {% if search_query %}value="{{ search_query }}"{% endif %}>
-               <button class="icon-search"></button>
-       </div>
-</form>
 <div class="wrapper {% if episodes %}sided{% endif %}">
 
        {% if search_query and not episodes %}

diff --git a/panikweb_templates/templates/emissions/nav.html b/panikweb_templates/templates/emissions/nav.html
index 94c8a7fcb6a8ac832c342b0155062274ea923999..600247a7c6a4687c20b80265308122f204805bfd 100644 (file)
--- a/panikweb_templates/templates/emissions/nav.html
+++ b/panikweb_templates/templates/emissions/nav.html
@@ -58,8 +58,10 @@
                {% endif %}
             </div>
             <div class="rightPart">
-                        <form method="get" action="." class="" id="search-form">
-                                <label for="id_q">Rechercher:</label><input id="id_q" name="q" type="text"><button class="icon-search"></button>
+                    <form method="get" action="{% url 'emissionEpisodes' slug=emission.slug %}" class="" id="search-form">
+                                <label for="id_q">Rechercher :</label>
+                                <input id="id_q" name="q" type="text" {% if search_query %}value="{{ search_query }}"{% endif %}>
+                                <button class="icon-search"></button>
                         </form>
             </div>
            </header>