From 1a7dde089b3552f70122c9194afb5370c4944149 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Tue, 1 Dec 2020 16:20:05 +0100
Subject: [PATCH] Migrate base template to bootstrap 4.5
---
templates/base.html | 72 +++++++++++++++++++--------------------------
1 file changed, 30 insertions(+), 42 deletions(-)
diff --git a/templates/base.html b/templates/base.html
index cee87dd..a40fa66 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -36,52 +36,40 @@
<body>
<header>
<!-- Navigation -->
- <nav class="navbar navbar-default">
- <div class="container-fluid">
- <!-- Brand and toggle get grouped for better mobile display -->
- <div class="navbar-header page-scroll">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
- <span class="sr-only">Toggle navigation</span>
- <span class="glyphicon glyphicon-th-list"></span>
- </button>
- <a class="navbar-brand" href="{{ SITEURL }}">
- <img id="logo" src="{{ SITELOGO }}" alt="{{ SITENAME }}">
- </a>
- </div>
+ <nav class="navbar navbar-expand-lg navbar-light">
+ <a class="navbar-brand" href="{{ SITEURL }}">
+ <img id="logo" src="{{ SITELOGO }}" alt="{{ SITENAME }}">
+ </a>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-controls="navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
- <!-- Collect the nav links, forms, and other content for toggling -->
- <div class="collapse navbar-collapse" id="navbar-collapse">
- <ul class="nav navbar-nav navbar-right" id="menuitem-list">
- {% for title,url in MENUITEMS %}
- {% if url is string %}
- <li {% if output_file == url %}class="active"{% endif %}>
- <a href="{{ genurl( url ) }}" >{{ title }}</a>
- </li>
- {% elif url is iterable %}
- <li class="btn-group
- {%- for title,item_url in url -%}
- {%- if item_url == output_file -%}
- {{- ' active' -}}
- {%- endif -%}
- {%- endfor -%}
- ">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- {{- title }}<b class="caret"></b>
- </a>
- <ul class="dropdown-menu" role="menu">
+ <div class="collapse navbar-collapse" id="navbar-collapse">
+ <ul class="navbar-nav navbar-right mr auto">
+ {% for title,url in MENUITEMS %}
+ {% if url is string %}
+ <li class="nav-item{% if output_file == url %}active{% endif %}">
+ <a class="nav-link" href="{{ genurl( url ) }}" >{{ title }}</a>
+ </li>
+ {% elif url is iterable %}
+ <li class="nav-item dropdown
+ {%- for title,item_url in url -%}
+ {%- if item_url == output_file -%}
+ {{- ' active' -}}
+ {%- endif -%}
+ {%- endfor -%}
+ ">
+ <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{- title }}</a>
+ <div class="dropdown-menu" aria-labelledby="navbarDropdown">
{% for title,item_url in url %}
- <li {% if item_url == output_url %}class="active"{% endif %}>
- <a href="{{ genurl( item_url ) }}">{{ title }}</a>
- </li>
+ <a class="dropdown-item {% if item_url == output_url %}active{% endif %}" href="{{ genurl( item_url ) }}">{{ title }}</a>
{% endfor %}
- </ul>
- {% endif %}
- {% endfor %}
- </ul>
- </div>
- <!-- /.navbar-collapse -->
+ </div>
+ </li>
+ {% endif %}
+ {% endfor %}
+ </ul>
</div>
- <!-- /.container -->
</nav>
<!-- Page Header -->
--
GitLab