Fix global and events menus to work with Bootstrap 5.3.3

amakarudze · May 23, 2024 · 623453a · 623453a
1 parent 94e0e5a
commit 623453a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/templates/admin/organize/eventapplication/change_form.html b/templates/admin/organize/eventapplication/change_form.html
@@ -7,6 +7,7 @@
 {% endblock %}
 
 {% block object-tools %}
+ {% if original %}
  <div class="row mb-3">
  <h4 class="italic-title">{% trans "Triaging" %}</h4>
  <div class="box save-box">
@@ -30,5 +31,6 @@ <h4 class="italic-title">{% trans "Triaging" %}</h4>
  {% endif %}
  </div>
  </div>
+ {% endif %}
  {{ block.super }}
 {% endblock %}
diff --git a/templates/event/menu.html b/templates/event/menu.html
@@ -1,22 +1,16 @@
 {% load core_tags i18n static %}
 
-<div class="navbar navbar-default" role="navigation">
+<div class="navbar navbar-expand-lg navbar-default" role="navigation">
  <div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".navbar-collapse">
- <span class="sr-only">{% trans "Toggle navigation" %}</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <div class="navbar-brand" href="/">
- <a href="/"><img src="{% static 'img/logo.png' %}" width="200" alt="Django Girls" /></a>
- </div>
- </div>
- <div class="navbar-collapse collapse">
- <ul class="nav navbar-nav">
+ <a class="navbar-brand" href="/"><img src="{% static 'img/logo.png' %}" width="200" alt="Django Girls" /></a>
+ <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent">{% trans "Toggle navigation" %}
+ <span class="navbar-toggler-icon"></span>
+ </button>
+
+ <div class="navbar-collapse collapse" id="navbarSupportedContent">
+ <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
  {% for item in menu %}
- <li><a href="{% build_menu_item_url item.url event.page_url %}">{{ item.title }}</a></li>
+ <li class="nav-item px-2"><a href="{% build_menu_item_url item.url event.page_url %}">{{ item.title }}</a></li>
  {% endfor %}
  </ul>
  </div><!--/.nav-collapse -->

diff --git a/templates/global/menu.html b/templates/global/menu.html
@@ -3,7 +3,7 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-white" role="navigation">
  <div class="container">
  <a class="navbar-brand logo" href="{% url 'core:index' %}"><img src="{% static 'img/global/logo.png' %}" alt="Django Girls" /></a>
- <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+ <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false">{% trans "Toggle navigation" %}
  <span class="navbar-toggler-icon"></span>
  </button>
  <div class="collapse navbar-collapse" id="navbarSupportedContent">