From 525b047b4fff39daf5ccd344f4ae2f098a34691c Mon Sep 17 00:00:00 2001
From: Bartuccio Antoine <klmp200@klmp200.net>
Date: Wed, 5 Dec 2018 18:18:24 +0100
Subject: [PATCH] forum: display search bar on every forum pages

---
 forum/templates/forum/forum.jinja  | 3 ++-
 forum/templates/forum/macros.jinja | 6 ++++++
 forum/templates/forum/main.jinja   | 7 ++-----
 forum/templates/forum/reply.jinja  | 3 ++-
 forum/templates/forum/topic.jinja  | 3 ++-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/forum/templates/forum/forum.jinja b/forum/templates/forum/forum.jinja
index 89a0e3a7..ca53fb7b 100644
--- a/forum/templates/forum/forum.jinja
+++ b/forum/templates/forum/forum.jinja
@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from 'forum/macros.jinja' import display_forum, display_topic %}
+{% from 'forum/macros.jinja' import display_forum, display_topic, display_search_bar %}
 
 {% block title %}
 {{ forum }}
@@ -12,6 +12,7 @@
     > <a href="{{ f.get_absolute_url() }}">{{ f }}</a>
     {% endfor %}
     > <a href="{{ forum.get_absolute_url() }}">{{ forum }}</a>
+    {{ display_search_bar() }}
 </div>
 <div id="forum">
     <h3>{{ forum.name }}</h3>
diff --git a/forum/templates/forum/macros.jinja b/forum/templates/forum/macros.jinja
index 0b6804eb..5e2cc7d5 100644
--- a/forum/templates/forum/macros.jinja
+++ b/forum/templates/forum/macros.jinja
@@ -155,3 +155,9 @@
 {{ m.mark_as_read(user) or "" }}
 {% endmacro %}
 
+{% macro display_search_bar() %}
+<form action="{{ url('forum:search') }}" method="GET" style="text-align: right;">
+    <input type="text" placeholder="{% trans %}Search{% endtrans %}" name="query"/>
+    <input type="submit" value="{% trans %}Search{% endtrans %}"/>
+</form>
+{% endmacro %}
diff --git a/forum/templates/forum/main.jinja b/forum/templates/forum/main.jinja
index 065007f8..c6199c16 100644
--- a/forum/templates/forum/main.jinja
+++ b/forum/templates/forum/main.jinja
@@ -1,6 +1,6 @@
 {% extends "core/base.jinja" %}
 {% from 'core/macros.jinja' import user_profile_link %}
-{% from 'forum/macros.jinja' import display_forum %}
+{% from 'forum/macros.jinja' import display_forum, display_search_bar %}
 
 {% block title %}
 {% trans %}Forum{% endtrans %}
@@ -12,6 +12,7 @@
 </p>
 <div id="forum">
     <h3>{% trans %}Forum{% endtrans %}</h3>
+    {{ display_search_bar() }}
     <p>
         <a class="ib button" href="{{ url('forum:last_unread') }}">{% trans %}View last unread messages{% endtrans %}</a>
         <a class="ib button" href="{{ url('forum:favorite_topics') }}">{% trans %}Favorite topics{% endtrans %}</a>
@@ -21,10 +22,6 @@
         <a href="{{ url('forum:new_forum') }}">{% trans %}New forum{% endtrans %}</a>
     </p>
     {% endif %}
-                <form action="{{ url('forum:search') }}" method="GET" id="header_search">
-                    <input type="text" placeholder="{% trans %}Search{% endtrans %}" name="query" id="search" />
-                    <input type="submit" value="{% trans %}Search{% endtrans %}" style="display: none;" />
-                </form>
     <div>
         <div class="ib w_big">
             {% trans %}Title{% endtrans %}
diff --git a/forum/templates/forum/reply.jinja b/forum/templates/forum/reply.jinja
index 3a4b49de..8cafbbba 100644
--- a/forum/templates/forum/reply.jinja
+++ b/forum/templates/forum/reply.jinja
@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from 'forum/macros.jinja' import display_message %}
+{% from 'forum/macros.jinja' import display_message, display_search_bar %}
 
 {% block title %}
 {% if topic %}
@@ -11,6 +11,7 @@
 
 {% block content %}
 {% if topic %}
+{{ display_search_bar() }}
 <p>
 <a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
 {% for f in topic.forum.get_parent_list() %}
diff --git a/forum/templates/forum/topic.jinja b/forum/templates/forum/topic.jinja
index 918b9665..ba165b75 100644
--- a/forum/templates/forum/topic.jinja
+++ b/forum/templates/forum/topic.jinja
@@ -1,6 +1,6 @@
 {% extends "core/base.jinja" %}
 {% from 'core/macros.jinja' import user_profile_link %}
-{% from 'forum/macros.jinja' import display_message %}
+{% from 'forum/macros.jinja' import display_message, display_search_bar %}
 
 {% block title %}
 {{ topic }}
@@ -27,6 +27,7 @@
 
 {% block content %}
     <p>
+    {{ display_search_bar() }}
     <a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
     {% for f in topic.forum.get_parent_list()|reverse %}
     > <a href="{{ f.get_absolute_url() }}">{{ f }}</a>