]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce7c428)
navbar: Show burger button only when menu exists
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Oct 2018 08:54:45 +0000 (09:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Oct 2018 08:54:45 +0000 (09:54 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/templates/base.html patch | blob | blame | history
src/templates/blog/base.html patch | blob | blame | history
src/templates/nopaste/base.html patch | blob | blame | history
src/templates/people/base.html patch | blob | blame | history

diff --git a/src/templates/base.html b/src/templates/base.html
index f9c64468384ea2b6d24e07f1e2bddce673db48f5..6b2232f1250014a19f242e58847217cad3cf82e9 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -18,17 +18,17 @@
        <body id="page-top">
                <nav class="navbar navbar-dark navbar-expand-lg mb-4">
                        <div class="container">
-                               <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 mx-auto" href="/">
                                        <strong>IPFire</strong> {% block subtitle %}{% end block %}
                                </a>
 
-                               <div class="collapse navbar-collapse" id="navbar">
-                                       {% block menu %}
+                               {% 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>
@@ -50,8 +50,8 @@
                                                <a class="btn btn-primary btn-donate ml-2 d-none d-sm-block" href="/donate">
                                                        <span class="fas fa-heart"></span> {{ _("Donate") }}
                                                </a>
-                                       {% end block %}
-                               </div>
+                                       </div>
+                               {% end block %}
                        </div>
                </nav>
 
diff --git a/src/templates/blog/base.html b/src/templates/blog/base.html
index cddf2ee514dd3b935c1c0dfab53f50ee1e1b4561..90e501bb7318b5fb59ec5aeabec89807700a2f9d 100644 (file)
--- a/src/templates/blog/base.html
+++ b/src/templates/blog/base.html
@@ -7,14 +7,21 @@
 {% block subtitle %}{{ _("Blog") }}{% end block %}
 
 {% block menu %}
-       <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>
+       <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="btn btn-primary btn-donate ml-2 d-none d-sm-block" href="/donate">
-               <span class="fas fa-heart"></span> {{ _("Donate") }}
-       </a>
+       <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 %}
diff --git a/src/templates/nopaste/base.html b/src/templates/nopaste/base.html
index 03c872a6cb7d19d2c4ba02e3e1553d8e22dca81f..6f1d78c234a82990d0c444d5acf8c694f0db7940 100644 (file)
--- a/src/templates/nopaste/base.html
+++ b/src/templates/nopaste/base.html
@@ -1,9 +1,16 @@
 {% extends "../base.html" %}
 
 {% block menu %}
-       <ul class="navbar-nav ml-auto">
-               <li class="nav-item">
-                       <a class="nav-link" href="/?mode=upload">{{ _("Upload file") }}</a>
-               </li>
-       </ul>   
+       <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 4628bc0d87e4b0c136008ff805d6673b36f322c5..8a28d21f52d6adbf531315b56ebc21673b5e9d6a 100644 (file)
--- a/src/templates/people/base.html
+++ b/src/templates/people/base.html
@@ -4,24 +4,31 @@
 
 {% block menu %}
        {% if current_user %}
-               <ul class="navbar-nav ml-auto mr-3">
-                       <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("/users/%s/calls" % current_user.uid) %}active{% end %}" href="/users/{{ current_user.uid }}/calls">
-                                       {{ _("Calls") }}
-                               </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>
+               <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" %}active{% end %}" href="/users">
+                                               {{ _("Users") }}
+                                       </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">
+                                               {{ _("Calls") }}
+                                       </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 %}
 
The website of ipfire.org.