Move navigation into base template

Otherwise the wrong or no navigation would have been
shown on error pages, etc.

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

diff --git a/src/templates/auth/login.html b/src/templates/auth/login.html
index e153d4c87f8248e469d4b94324819f90f8dff68f..2199a929ab051e360d41a1b001dcbc68802b2cd5 100644 (file)
--- a/src/templates/auth/login.html
+++ b/src/templates/auth/login.html
@@ -2,8 +2,6 @@
 
 {% block title %}{{ _("Log In") }}{% end block %}
 
-{% block menu %}{% end block %}
-
 {% block content %}
        <div class="row justify-content-center my-5">
                <div class="col col-md-4">

diff --git a/src/templates/base.html b/src/templates/base.html
index 9d2e707cc01ccecdb863b15c46f633ef6e58b841..7b0e7a5980b4c55064e73c562ade6606435d5df9 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -19,38 +19,119 @@
                <nav class="navbar navbar-dark navbar-expand-lg mb-4">
                        <div class="container">
                                <a class="navbar-brand mx-auto" href="/">
-                                       <strong>IPFire</strong> {% block subtitle %}{% end block %}
+                                       <strong>IPFire</strong>
+
+                                       {% if hostname == "blog.ipfire.org" %}
+                                               {{ _("Blog") }}
+                                       {% elif hostname == "people.ipfire.org" %}
+                                               {{ _("People") }}
+                                       {% end %}
                                </a>
 
                                {% block menu %}
-                                       <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>
-
-                                       <div class="collapse navbar-collapse" id="navbar">
-                                               <ul class="navbar-nav ml-auto">
-                                                       <li class="nav-item d-sm-block d-md-block d-lg-none">
-                                                               <a class="nav-link {% if request.path == "/" %}active{% end %}" href="/">{{ _("Home") }}</a>
-                                                       </li>
-
-                                                       <li class="nav-item">
-                                                               <a class="nav-link {% if request.path == "/features" %}active{% end %}" href="/features">{{ _("Features") }}</a>
-                                                       </li>
-
-                                                       <li class="nav-item">
-                                                               <a class="nav-link {% if request.path.startswith("/download") %}active{% end %}" href="/download">{{ _("Download") }}</a>
-                                                       </li>
-
-                                                       <li class="nav-item">
-                                                               <a class="nav-link {% if request.path == "/support" %}active{% end %}" href="/support">{{ _("Support") }}</a>
-                                                       </li>
-                                               </ul>
-
-                                               <a class="btn btn-primary btn-donate ml-2 d-none d-sm-block" href="/donate">
-                                                       <span class="fas fa-heart"></span> {{ _("Donate") }}
-                                               </a>
-                                       </div>
+                                       {% 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>
+                                               </button>
+
+                                               <div class="collapse navbar-collapse" id="navbar">
+                                                       <ul class="navbar-nav ml-auto">
+                                                               <li class="nav-item d-sm-block d-md-block d-lg-none">
+                                                                       <a class="nav-link {% if request.path == "/" %}active{% end %}" href="/">{{ _("Home") }}</a>
+                                                               </li>
+
+                                                               <li class="nav-item">
+                                                                       <a class="nav-link {% if request.path == "/features" %}active{% end %}" href="/features">{{ _("Features") }}</a>
+                                                               </li>
+
+                                                               <li class="nav-item">
+                                                                       <a class="nav-link {% if request.path.startswith("/download") %}active{% end %}" href="/download">{{ _("Download") }}</a>
+                                                               </li>
+
+                                                               <li class="nav-item">
+                                                                       <a class="nav-link {% if request.path == "/support" %}active{% end %}" href="/support">{{ _("Support") }}</a>
+                                                               </li>
+                                                       </ul>
+
+                                                       <a class="btn btn-primary btn-donate ml-2 d-none d-sm-block" href="/donate">
+                                                               <span class="fas fa-heart"></span> {{ _("Donate") }}
+                                                       </a>
+                                               </div>
+                                       {% elif hostname == "blog.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>
+                                               </button>
+                                       
+                                               <div class="collapse navbar-collapse" id="navbar">
+                                                       <form class="form-inline ml-auto my-2 my-lg-0" action="/search" method="GET">
+                                                               <input class="form-control form-control-sm mr-sm-2" type="search" name="q"
+                                                                       placeholder="{{ _("Search...") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">
+                                                       </form>
+                                       
+                                                       <a class="btn btn-primary btn-donate ml-2 d-none d-sm-block" href="/donate">
+                                                               <span class="fas fa-heart"></span> {{ _("Donate") }}
+                                                       </a>
+                                               </div>
+                                       {% elif hostname == "nopaste.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>
+                                               </button>
+                                       
+                                               <div class="collapse navbar-collapse" id="navbar">
+                                                       <ul class="navbar-nav ml-auto">
+                                                               <li class="nav-item">
+                                                                       <a class="nav-link" href="/?mode=upload">{{ _("Upload file") }}</a>
+                                                               </li>
+                                                       </ul>
+                                               </div>
+                                       {% elif hostname == "people.ipfire.org" %}
+                                               {% if current_user %}
+                                                       <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>
+                                       
+                                                       <div class="collapse navbar-collapse" id="navbar">
+                                                               <ul class="navbar-nav ml-auto mr-3">
+                                                                       <li class="nav-item">
+                                                                               <a class="nav-link {% if request.path == "/users/%s" % current_user.uid %}active{% end %}" href="/users/{{ current_user.uid }}">
+                                                                                       {{ _("My Profile") }}
+                                                                               </a>
+                                                                       </li>
+                                       
+                                                                       <li class="nav-item">
+                                                                               <a class="nav-link {% if request.path.startswith("/users/%s/calls" % current_user.uid) %}active{% end %}" href="/users/{{ current_user.uid }}/calls">
+                                                                                       {{ _("My Calls") }}
+                                       
+                                                                                       {% if current_user.sip_channels %}
+                                                                                               <span class="badge badge-primary ml-2">{{ len(current_user.sip_channels) }}</span>
+                                                                                       {% end %}
+                                                                               </a>
+                                                                       </li>
+                                       
+                                                                       <li class="nav-item">
+                                                                               <a class="nav-link {% if request.path == "/users" %}active{% end %}" href="/users">
+                                                                                       {{ _("Users") }}
+                                                                               </a>
+                                                                       </li>
+                                       
+                                                                       <li class="nav-item">
+                                                                               <a class="nav-link {% if request.path.startswith("/conferences") %}active{% end %}" href="/conferences">
+                                                                                       {{ _("Conferences") }}
+                                                                               </a>
+                                                                       </li>
+                                                               </ul>
+                                       
+                                                               <form class="form-inline my-2 my-lg-0" action="/search" method="GET">
+                                                                       <input class="form-control form-control-sm mr-sm-2" type="search" name="q"
+                                                                               placeholder="{{ _("Search") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">
+                                                               </form>
+                                                       </div>
+                                               {% end %}
+                                       {% end %}
                                {% end block %}
                        </div>
                </nav>

diff --git a/src/templates/blog/base.html b/src/templates/blog/base.html
index 90e501bb7318b5fb59ec5aeabec89807700a2f9d..58cf769fab564cdcc76b0d2559380000d6cb06c7 100644 (file)
--- a/src/templates/blog/base.html
+++ b/src/templates/blog/base.html
@@ -4,26 +4,6 @@
        <link rel="alternate" type="application/rss+xml" title="RSS" href="https://blog.ipfire.org/feed.xml" />
 {% end block %}
 
-{% block subtitle %}{{ _("Blog") }}{% end block %}
-
-{% block menu %}
-       <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>
-
-       <div class="collapse navbar-collapse" id="navbar">
-               <form class="form-inline ml-auto my-2 my-lg-0" action="/search" method="GET">
-                       <input class="form-control form-control-sm mr-sm-2" type="search" name="q"
-                               placeholder="{{ _("Search...") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">
-               </form>
-
-               <a class="btn btn-primary btn-donate ml-2 d-none d-sm-block" href="/donate">
-                       <span class="fas fa-heart"></span> {{ _("Donate") }}
-               </a>
-       </div>
-{% end block %}
-
 {% block content %}
        <div class="row">
                <div class="col-12 col-md-3">

diff --git a/src/templates/nopaste/base.html b/src/templates/nopaste/base.html
index 6f1d78c234a82990d0c444d5acf8c694f0db7940..d108a0c0c623381e06b8133768d16d3d577b44ac 100644 (file)
--- a/src/templates/nopaste/base.html
+++ b/src/templates/nopaste/base.html
@@ -1,16 +1 @@
 {% extends "../base.html" %}
-
-{% block menu %}
-       <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>
-
-       <div class="collapse navbar-collapse" id="navbar">
-               <ul class="navbar-nav ml-auto">
-                       <li class="nav-item">
-                               <a class="nav-link" href="/?mode=upload">{{ _("Upload file") }}</a>
-                       </li>
-               </ul>
-       </div>
-{% end block %}

diff --git a/src/templates/people/base.html b/src/templates/people/base.html
index 4b84dbcdb08ce2b770d55f5fbbfb45e5e6559753..d108a0c0c623381e06b8133768d16d3d577b44ac 100644 (file)
--- a/src/templates/people/base.html
+++ b/src/templates/people/base.html
@@ -1,49 +1 @@
 {% extends "../base.html" %}
-
-{% block subtitle %}{{ _("People") }}{% end block %}
-
-{% block menu %}
-       {% if current_user %}
-               <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>
-
-               <div class="collapse navbar-collapse" id="navbar">
-                       <ul class="navbar-nav ml-auto mr-3">
-                               <li class="nav-item">
-                                       <a class="nav-link {% if request.path == "/users/%s" % current_user.uid %}active{% end %}" href="/users/{{ current_user.uid }}">
-                                               {{ _("My Profile") }}
-                                       </a>
-                               </li>
-
-                               <li class="nav-item">
-                                       <a class="nav-link {% if request.path.startswith("/users/%s/calls" % current_user.uid) %}active{% end %}" href="/users/{{ current_user.uid }}/calls">
-                                               {{ _("My Calls") }}
-
-                                               {% if current_user.sip_channels %}
-                                                       <span class="badge badge-primary ml-2">{{ len(current_user.sip_channels) }}</span>
-                                               {% end %}
-                                       </a>
-                               </li>
-
-                               <li class="nav-item">
-                                       <a class="nav-link {% if request.path == "/users" %}active{% end %}" href="/users">
-                                               {{ _("Users") }}
-                                       </a>
-                               </li>
-
-                               <li class="nav-item">
-                                       <a class="nav-link {% if request.path.startswith("/conferences") %}active{% end %}" href="/conferences">
-                                               {{ _("Conferences") }}
-                                       </a>
-                               </li>
-                       </ul>
-
-                       <form class="form-inline my-2 my-lg-0" action="/search" method="GET">
-                               <input class="form-control form-control-sm mr-sm-2" type="search" name="q"
-                                       placeholder="{{ _("Search") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">
-                       </form>
-               </div>
-       {% end %}
-{% end block %}