]> git.ipfire.org Git - ipfire.org.git/commitdiff
blog: Make navigation look as part of the main site
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 18 Nov 2020 22:58:06 +0000 (22:58 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 18 Nov 2020 22:58:06 +0000 (22:58 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/templates/base.html

index 0c0c0b6f5c1f6d03a1bca5ca15f16a22997e4b70..e48839ba24bad663821bbe17e01674d88f0f09c3 100644 (file)
        <body id="page-top" class="{{ hostname.replace(".", "-") }}">
                <nav class="navbar navbar-light navbar-expand-lg">
                        <div class="container">
-                               {% if hostname == "www.ipfire.org" and request.path.startswith("/blog") %}
-                                       <a class="navbar-brand" href="/blog">
-                                               IPFire<span class="text-primary">_</span>Blog
-                                       </a>
-                               {% else %}
-                                       <a class="navbar-brand" href="/">
-                                               IPFire<span class="text-primary">_</span>
-
-                                               {% if hostname == "fireinfo.ipfire.org" %}
-                                                       {{ _("Fireinfo") }}
-                                               {% elif hostname == "location.ipfire.org" %}
-                                                       {{ _("Location") }}
-                                               {% elif hostname == "mirrors.ipfire.org" %}
-                                                       {{ _("Mirrors") }}
-                                               {% elif hostname == "people.ipfire.org" %}
-                                                       {{ _("People") }}
-                                               {% elif hostname == "wiki.ipfire.org" %}
-                                                       {{ _("Wiki") }}
-                                               {% end %}
-                                       </a>
-                               {% end %}
-
-                               {% block menu %}
-                                       {% if hostname == "www.ipfire.org" and request.path.startswith("/blog") %}
-                                               <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
-                                                               aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-                                                       <span class="fas fa-bars"></span>
-                                               </button>
-
-                                               <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
-                                                               aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-                                                       <span class="fas fa-bars"></span>
-                                               </button>
+                               <a class="navbar-brand" href="/">
+                                       IPFire<span class="text-primary">_</span>
 
-                                               <div class="collapse navbar-collapse" id="navbar">
-                                                       <ul class="navbar-nav ml-auto">
-                                                               {% if current_user %}
-                                                                       <li class="nav-item">
-                                                                               <a class="nav-link {% if request.path == "/blog/drafts" %}active{% end %}" href="/blog/drafts">
-                                                                                       {{ _("My Drafts") }}
-                                                                               </a>
-                                                                       </li>
-                                                               {% end %}
-
-                                                               <li class="nav-item">
-                                                                       <a class="nav-link {% if request.path == "/blog/tags/featured" %}active{% end %}" href="/blog/tags/featured">
-                                                                               {{ _("Featured") }}
-                                                                       </a>
-                                                               </li>
-                                                       </ul>
-
-                                                       <form class="form-inline my-2 my-lg-0" action="/blog/search" method="GET">
-                                                               <input class="form-control form-control-sm" type="search" name="q"
-                                                                       placeholder="{{ _("Search...") }}" aria-label="{{ _("Search") }}"
-                                                                       value="{% try %}{{ q }}{% except %}{% end %}">
-                                                       </form>
+                                       {% if hostname == "fireinfo.ipfire.org" %}
+                                               {{ _("Fireinfo") }}
+                                       {% elif hostname == "location.ipfire.org" %}
+                                               {{ _("Location") }}
+                                       {% elif hostname == "mirrors.ipfire.org" %}
+                                               {{ _("Mirrors") }}
+                                       {% elif hostname == "people.ipfire.org" %}
+                                               {{ _("People") }}
+                                       {% elif hostname == "wiki.ipfire.org" %}
+                                               {{ _("Wiki") }}
+                                       {% end %}
+                               </a>
 
-                                                       <a class="btn btn-primary mt-2 mt-lg-0 ml-lg-2" href="/donate">
-                                                               {{ _("Donate") }}
-                                                       </a>
-                                               </div>
-                                       {% elif hostname in ("www.ipfire.org", "dev.ipfire.org") %}
+                               {% block menu %}
+                                       {% if hostname in ("www.ipfire.org", "dev.ipfire.org") %}
                                                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
                                                                aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
                                                        <span class="fas fa-bars"></span>
                                                                </li>
 
                                                                <li class="nav-item">
-                                                                       <a class="nav-link" href="/blog">{{ _("Blog") }}</a>
+                                                                       <a class="nav-link {% if request.path.startswith("/blog") %}active{% end %}" href="/blog">{{ _("Blog") }}</a>
                                                                </li>
                                                        </ul>