blog: Move search into top navigation bar

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/base.html b/src/templates/base.html
index fb427afb4717579bbcfbfa1b84d0dca754601bea..c0de34bdd81ecc3526c5a7e94025c400e91d4594 100644 (file)
--- 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 d65e4f0fdde974945b5246f208812b9f89fa7eb2..84d8f29c67104879839f53475ec97fd6486e055c 100644 (file)
--- 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 %}