From 815f98e4df5ebdf96155deabb62e8db8f3b2877a Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Jul 2023 14:04:06 +0000
Subject: [PATCH] blog: Move search into top navigation bar

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/base.html       | 18 +++++++++++++++++-
 src/templates/blog/index.html | 17 +----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/templates/base.html b/src/templates/base.html
index fb427afb..c0de34bd 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -50,8 +50,24 @@
 					{% block menu %}
 						{% if hostname.startswith("www.") or hostname.startswith("dev.") %}
 							<div class="navbar-end">
+								{# Show a search bar for blog #}
+								{% if request.path.startswith("/blog") %}
+									<div class="navbar-item">
+										<form action="/blog" method="GET">
+											<div class="field">
+												<div class="control has-icons-left">
+													<input class="input" type="text"
+														name="q" {% if "q" in locals() and q %}value="{{ q }}"{% end %}
+														placeholder="{{ _("Search Blog...") }}">
+													<span class="icon is-small is-left">
+														<i class="fas fa-search"></i>
+													</span>
+												</div>
+											</div>
+										</form>
+									</div>
 								{# Show a search bar for docs #}
-								{% if request.path.startswith("/docs") %}
+								{% elif request.path.startswith("/docs") %}
 									<div class="navbar-item">
 										<form action="/docs/search" method="GET">
 											<div class="field">
diff --git a/src/templates/blog/index.html b/src/templates/blog/index.html
index d65e4f0f..84d8f29c 100644
--- a/src/templates/blog/index.html
+++ b/src/templates/blog/index.html
@@ -64,21 +64,6 @@
 				</div>
 
 				<div class="column is-4">
-					<div class="block">
-						<form method="GET" action="">
-							<div class="field">
-								<div class="control has-icons-left">
-									<input class="input is-medium" type="text"
-										name="q" {% if q %}value="{{ q }}"{% end %}
-										placeholder="{{ _("Search...") }}">
-									<span class="icon is-small is-left">
-										<i class="fas fa-search"></i>
-									</span>
-								</div>
-							</div>
-						</form>
-					</div>
-
 					<div class="block">
 						<div class="notification">
 							<h5 class="title is-5">Follow Us!</h5>
@@ -114,4 +99,4 @@
 			</div>
 		</div>
 	</section>
-{% end block %}
\ No newline at end of file
+{% end block %}
-- 
2.47.2