From 623453a7db6715b8ed8b81971f39adc4b02acdfe Mon Sep 17 00:00:00 2001
From: Anna Makarudze <amakarudze@gmail.com>
Date: Thu, 23 May 2024 22:27:08 +0200
Subject: [PATCH] Fix global and events menus to work with Bootstrap 5.3.3

---
 .../eventapplication/change_form.html         |  2 ++
 templates/event/menu.html                     | 24 +++++++------------
 templates/global/menu.html                    |  2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/templates/admin/organize/eventapplication/change_form.html b/templates/admin/organize/eventapplication/change_form.html
index 25fc0bf65..97bb319d2 100644
--- 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
index 2f72e4940..1b8f6a83d 100644
--- 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
index a90361493..b152ae37d 100644
--- 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">