From a8764f225f6641fc782c63b6200637e5a4628d17 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Mon, 15 Nov 2021 16:49:09 +0000
Subject: [PATCH] Track CSS class name changes in bs5.  - Legacy-Id: 19663

---
 ietf/doc/templatetags/ballot_icon.py          |  2 +-
 ietf/meeting/tests_js.py                      | 18 ++++----
 ietf/static/css/ietf.scss                     |  2 +-
 ietf/static/js/agenda_timezone.js             |  4 +-
 ietf/static/js/ietf.js                        | 11 ++++-
 ietf/templates/api/index.html                 |  6 +--
 ietf/templates/base/menu_wg.html              |  2 +-
 ietf/templates/community/manage_list.html     |  2 +-
 ietf/templates/debug.html                     |  6 +--
 ietf/templates/doc/ballot_popup.html          |  4 +-
 .../doc/document_ballot_content.html          |  2 +-
 ietf/templates/doc/document_draft.html        |  8 ++--
 ietf/templates/doc/document_history.html      |  2 +-
 ietf/templates/doc/edit_telechat_date.html    |  4 +-
 .../doc/search/search_result_row.html         |  4 +-
 .../doc/yang-check-modal-overlay.html         |  4 +-
 ietf/templates/group/active_wgs.html          |  6 +--
 ietf/templates/group/all_photos.html          |  6 +--
 .../group/change_reviewer_settings.html       |  2 +-
 ietf/templates/group/concluded_groups.html    |  4 +-
 ietf/templates/group/customize_workflow.html  |  2 +-
 ietf/templates/group/group_photos.html        |  6 +--
 ietf/templates/iesg/agenda.html               |  6 +--
 ietf/templates/iesg/discusses.html            |  2 +-
 ietf/templates/iesg/past_documents.html       |  2 +-
 ietf/templates/iesg/photos.html               |  6 +--
 ietf/templates/ipr/list.html                  |  6 +--
 ietf/templates/meeting/agenda.html            | 45 ++++++++-----------
 .../templates/meeting/agenda_personalize.html | 26 +++++------
 .../meeting/edit_meeting_schedule.html        | 20 ++++-----
 .../meeting/interim_session_buttons.html      |  2 +-
 ietf/templates/meeting/materials.html         |  6 +--
 ietf/templates/meeting/past.html              |  2 +-
 ietf/templates/meeting/proceedings.html       |  6 +--
 ietf/templates/meeting/requests.html          |  6 +--
 ietf/templates/meeting/room-view.html         |  2 +-
 .../meeting/session_details_panel.html        |  2 +-
 ietf/templates/meeting/timeslot_edit.html     |  4 +-
 ietf/templates/meeting/upcoming.html          |  2 +-
 ietf/templates/nomcom/announcements.html      |  6 +--
 ietf/templates/nomcom/chair_help.html         |  6 +--
 ietf/templates/nomcom/history.html            |  6 +--
 .../nomcom/iesg_position_requirements.html    |  2 +-
 .../templates/nomcom/nomcom_private_base.html |  4 +-
 ietf/templates/nomcom/nomcom_public_base.html |  2 +-
 ietf/templates/nomcom/questionnaires.html     |  2 +-
 ietf/templates/nomcom/requirements.html       |  2 +-
 ietf/templates/nomcom/view_feedback.html      |  8 ++--
 .../nomcom/view_feedback_nominee.html         |  2 +-
 .../nomcom/view_feedback_pending.html         |  6 +--
 .../templates/nomcom/view_feedback_topic.html |  2 +-
 .../nomcom/view_feedback_unrelated.html       |  2 +-
 ietf/templates/submit/edit_submission.html    |  6 +--
 ietf/templates/submit/manual_post.html        |  2 +-
 ietf/templates/submit/submission_status.html  | 16 +++----
 ietf/templates/submit/upload_submission.html  |  2 +-
 56 files changed, 165 insertions(+), 163 deletions(-)

diff --git a/ietf/doc/templatetags/ballot_icon.py b/ietf/doc/templatetags/ballot_icon.py
index 383307981..4f05f33bb 100644
--- a/ietf/doc/templatetags/ballot_icon.py
+++ b/ietf/doc/templatetags/ballot_icon.py
@@ -109,7 +109,7 @@ def ballot_icon(context, doc):
     else:
         typename = "IESG"
 
-    res = ['<a %s href="%s" data-toggle="modal" data-target="#modal-%d" title="%s positions (click to show more)" class="ballot-icon"><table' % (
+    res = ['<a %s href="%s" data-bs-toggle="modal" data-bs-target="#modal-%d" title="%s positions (click to show more)" class="ballot-icon"><table' % (
             right_click_string,
             urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
             ballot.pk,
diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py
index b7b038988..c5159c5af 100644
--- a/ietf/meeting/tests_js.py
+++ b/ietf/meeting/tests_js.py
@@ -267,7 +267,7 @@ class EditMeetingScheduleTests(IetfSeleniumTestCase):
         self.driver.find_element(By.CSS_SELECTOR, "#timeslot-toggle-modal-open").click()
         self.assertTrue(self.driver.find_element(By.CSS_SELECTOR, "#timeslot-group-toggles-modal").is_displayed())
         self.driver.find_element(By.CSS_SELECTOR, "#timeslot-group-toggles-modal [value=\"{}\"]".format("ts-group-{}-{}".format(slot2.time.strftime("%Y%m%d-%H%M"), int(slot2.duration.total_seconds() / 60)))).click()
-        self.driver.find_element(By.CSS_SELECTOR, "#timeslot-group-toggles-modal [data-dismiss=\"modal\"]").click()
+        self.driver.find_element(By.CSS_SELECTOR, "#timeslot-group-toggles-modal [data-bs-dismiss=\"modal\"]").click()
         self.assertTrue(not self.driver.find_element(By.CSS_SELECTOR, "#timeslot-group-toggles-modal").is_displayed())
 
         # swap days
@@ -1215,7 +1215,7 @@ class AgendaTests(IetfSeleniumTestCase):
         """Click the 'customize' anchor to reveal the group buttons"""
         customize_anchor = wait.until(
             expected_conditions.element_to_be_clickable(
-                (By.CSS_SELECTOR, '#accordion a[data-toggle="collapse"]')
+                (By.CSS_SELECTOR, '#accordion a[data-bs-toggle="collapse"]')
             )
         )
         customize_anchor.click()
@@ -1390,7 +1390,7 @@ class AgendaTests(IetfSeleniumTestCase):
         # Click the 'customize' anchor to reveal the group buttons
         customize_anchor = WebDriverWait(self.driver, 2).until(
             expected_conditions.element_to_be_clickable(
-                (By.CSS_SELECTOR, '#accordion a[data-toggle="collapse"]')
+                (By.CSS_SELECTOR, '#accordion a[data-bs-toggle="collapse"]')
             )
         )
         customize_anchor.click()
@@ -1511,7 +1511,7 @@ class AgendaTests(IetfSeleniumTestCase):
         # Click the 'materials' button
         open_modal_button = WebDriverWait(self.driver, 2).until(
             expected_conditions.element_to_be_clickable(
-                (By.CSS_SELECTOR, '[data-target="#modal-%s"]' % slug)
+                (By.CSS_SELECTOR, '[data-bs-target="#modal-%s"]' % slug)
             ),
             'Modal open button not found or not clickable',
         )
@@ -1544,7 +1544,7 @@ class AgendaTests(IetfSeleniumTestCase):
         # Now close the modal
         close_modal_button = WebDriverWait(self.driver, 2).until(
             expected_conditions.element_to_be_clickable(
-                (By.CSS_SELECTOR, '.modal-footer button[data-dismiss="modal"]')
+                (By.CSS_SELECTOR, '.modal-footer button[data-bs-dismiss="modal"]')
             ),
             'Modal close button not found or not clickable',
         )
@@ -1564,7 +1564,7 @@ class AgendaTests(IetfSeleniumTestCase):
         # Click the 'materials' button
         open_modal_button = WebDriverWait(self.driver, 2).until(
             expected_conditions.element_to_be_clickable(
-                (By.CSS_SELECTOR, '[data-target="#modal-%s"]' % slug)
+                (By.CSS_SELECTOR, '[data-bs-target="#modal-%s"]' % slug)
             ),
             'Modal open button not found or not clickable for refresh test',
         )
@@ -2468,7 +2468,7 @@ class InterimTests(IetfSeleniumTestCase):
         # Click the 'materials' button
         open_modal_button = self.wait.until(
             expected_conditions.element_to_be_clickable(
-                (By.CSS_SELECTOR, '[data-target="#modal-%s"]' % slug)
+                (By.CSS_SELECTOR, '[data-bs-target="#modal-%s"]' % slug)
             ),
             'Modal open button not found or not clickable',
         )
@@ -2482,7 +2482,7 @@ class InterimTests(IetfSeleniumTestCase):
         close_modal_button = self.wait.until(
             presence_of_element_child_by_css_selector(
                 modal_div,
-                '.modal-footer button[data-dismiss="modal"]',
+                '.modal-footer button[data-bs-dismiss="modal"]',
             ),
             'Modal close button not found or not clickable',
         )
@@ -2621,7 +2621,7 @@ class EditTimeslotsTests(IetfSeleniumTestCase):
         if cancel:
             cancel_button = self.wait.until(
                 expected_conditions.element_to_be_clickable(
-                    (By.CSS_SELECTOR, '#delete-modal button[data-dismiss="modal"]')
+                    (By.CSS_SELECTOR, '#delete-modal button[data-bs-dismiss="modal"]')
                 ))
             cancel_button.click()
         else:
diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss
index 08638c39c..50cf558df 100644
--- a/ietf/static/css/ietf.scss
+++ b/ietf/static/css/ietf.scss
@@ -37,7 +37,7 @@ $enable-negative-margins: true;
 @import "~/node_modules/bootstrap/scss/badge";
 @import "~/node_modules/bootstrap/scss/alert";
 // @import "~/node_modules/bootstrap/scss/progress";
-// @import "~/node_modules/bootstrap/scss/list-group";
+@import "~/node_modules/bootstrap/scss/list-group";
 @import "~/node_modules/bootstrap/scss/close";
 // @import "~/node_modules/bootstrap/scss/toasts";
 @import "~/node_modules/bootstrap/scss/modal";
diff --git a/ietf/static/js/agenda_timezone.js b/ietf/static/js/agenda_timezone.js
index 56d235843..e590ce7aa 100644
--- a/ietf/static/js/agenda_timezone.js
+++ b/ietf/static/js/agenda_timezone.js
@@ -48,9 +48,9 @@ window.format_time = function (t, tz, fmt) {
 
     switch (fmt) {
         case 0:
-            out = t.tz(tz).format('dddd, ') + '<span class="hidden-xs">' +
+            out = t.tz(tz).format('dddd, ') + '<span class="d-none d-sm-block">' +
                 t.tz(tz).format('MMMM Do YYYY, ') + '</span>' +
-                t.tz(tz).format('HH:mm') + '<span class="hidden-xs">' +
+                t.tz(tz).format('HH:mm') + '<span class="d-none d-sm-block">' +
                 t.tz(tz).format(' Z z') + '</span>';
             break;
         case 1:
diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js
index 776287faf..dc7b3a1b3 100644
--- a/ietf/static/js/ietf.js
+++ b/ietf/static/js/ietf.js
@@ -9,7 +9,7 @@ import "bootstrap/js/dist/dropdown";
 import "bootstrap/js/dist/modal";
 // import "bootstrap/js/dist/offcanvas";
 // import "bootstrap/js/dist/popover";
-// import "bootstrap/js/dist/scrollspy";
+import "bootstrap/js/dist/scrollspy";
 import "bootstrap/js/dist/tab";
 // import "bootstrap/js/dist/toast";
 import "bootstrap/js/dist/tooltip";
@@ -39,6 +39,15 @@ jQuery.ajaxSetup({
     }
 });
 
+// Use the Bootstrap tooltip plugin for all elements with a title attribute
+$(document)
+    .ready(function () {
+        $('[title][title!=""]')
+            .not("th")
+            .attr("data-bs-toggle", "tooltip")
+            .tooltip();
+    });
+
 $(document)
     .ready(function () {
 
diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html
index b226dc31f..13b8a47e6 100644
--- a/ietf/templates/api/index.html
+++ b/ietf/templates/api/index.html
@@ -2,7 +2,7 @@
 {% extends "base.html" %}
 {% load static %}
 {% block title %}API Notes{% endblock %}
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 {% block content %}
 
     <h2>Datatracker API Notes</h2>
@@ -362,8 +362,8 @@ payload = jwstoken.payload
 
     </div>
 
-    <div class="col-md-1 hidden-print bs-docs-sidebar" id="affix">
-        <ul class="nav nav-pills nav-stacked small fixed" data-spy="affix">
+    <div class="col-md-1 d-print-none bs-docs-sidebar" id="affix">
+        <ul class="nav nav-pills nav-stacked small fixed" data-bs-spy="affix">
 
             <li><a href="#framework">Framework API</a></li>
             <li><a href="#framework-documents">&nbsp; Framework API: Documents</a></li>
diff --git a/ietf/templates/base/menu_wg.html b/ietf/templates/base/menu_wg.html
index b1f128851..71a30fc27 100644
--- a/ietf/templates/base/menu_wg.html
+++ b/ietf/templates/base/menu_wg.html
@@ -4,7 +4,7 @@
 {% origin %}
 
 {% for p in parents %}
-    <li class="hidden-nojs dropend group-menu group-parent-{{ p.id }}">
+    <li class="dropend group-menu group-parent-{{ p.id }}">
         <a class="dropdown-item dropdown-toggle {% if flavor != 'top' %}text-wrap link-primary{% endif %}" href="{{ p.menu_url }}">
             {{ p.short_name }}
         </a>
diff --git a/ietf/templates/community/manage_list.html b/ietf/templates/community/manage_list.html
index ac68b1fff..1fc6fe6e9 100644
--- a/ietf/templates/community/manage_list.html
+++ b/ietf/templates/community/manage_list.html
@@ -105,7 +105,7 @@
 
     {% endif %}
 
-    <div><a class="btn btn-primary" data-toggle="collapse" data-target="#add-new-rule">Add a new rule</a></div>
+    <div><a class="btn btn-primary" data-bs-toggle="collapse" data-bs-target="#add-new-rule">Add a new rule</a></div>
 
     <div id="add-new-rule" {% if not rule_type_form.errors and not rule_form %}class="collapse"{% endif %}>
         <h3>Add a new rule</h3>
diff --git a/ietf/templates/debug.html b/ietf/templates/debug.html
index 29e1e9140..a047ab549 100644
--- a/ietf/templates/debug.html
+++ b/ietf/templates/debug.html
@@ -36,13 +36,13 @@
                                 <td>
                                     {{ query.loc }}
                                     {% if query.origin %}
-                                        <button type="button" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#modal-{{forloop.counter}}" >Origin</button>
+                                        <button type="button" class="btn btn-primary btn-xs" data-bs-toggle="modal" data-bs-target="#modal-{{forloop.counter}}" >Origin</button>
                                     {% endif %}
                                     <div class="modal fade" id="modal-{{forloop.counter}}" tabindex="-1" role="dialog" aria-labelledby="modal-title-{{forloop.counter}}">
                                         <div class="modal-dialog modal-max" role="document">
                                             <div class="modal-content">
                                                 <div class="modal-header">
-                                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                                                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                                                     <h4 class="modal-title" id="modal-title-{{forloop.counter}}">QuerySet Origin for Query #{{forloop.counter}}</h4>
                                                 </div>
                                                 <div class="modal-body">
@@ -74,7 +74,7 @@
                                                     </table>
                                                 </div>
                                                 <div class="modal-footer">
-                                                    <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                                                    <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                                                 </div>
                                             </div>
                                         </div>
diff --git a/ietf/templates/doc/ballot_popup.html b/ietf/templates/doc/ballot_popup.html
index 2759cf075..1a16221e8 100644
--- a/ietf/templates/doc/ballot_popup.html
+++ b/ietf/templates/doc/ballot_popup.html
@@ -10,7 +10,7 @@
 
     <body>
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal">
+            <button type="button" class="close" data-bs-dismiss="modal">
                 <span aria-hidden="true">&times;</span>
                 <span class="sr-only">Close</span>
             </button>
@@ -42,7 +42,7 @@
                     {% endif %}
                 {% endif %}
             {% endif %}
-            <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+            <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
         </div>
     </body>
 </html>
diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html
index 01c287e4e..f18f49037 100644
--- a/ietf/templates/doc/document_ballot_content.html
+++ b/ietf/templates/doc/document_ballot_content.html
@@ -3,7 +3,7 @@
 {% load textfilters %}
 
 <div class="row">
-    <div class="col-md-2 hidden-sm hidden-xs">
+    <div class="col-md-2 d-none d-md-block d-sm-block d-lg-block d-xl-block d-xxl-block">
 
         {% for n, positions in position_groups %}
             <h4><span class="badge bg-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index da67e068f..5cf1e67a3 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -217,11 +217,11 @@
                         <td class="edit"></td>
                         <td>
                             {% if check.errors or check.warnings %}
-                                <span class="checker-warning" data-toggle="modal" data-target="#check-{{check.pk}}" title="{{check.checker|title}} returned warnings or errors." >{{ check.symbol|safe }}</span>
+                                <span class="checker-warning" data-bs-toggle="modal" data-bs-target="#check-{{check.pk}}" title="{{check.checker|title}} returned warnings or errors." >{{ check.symbol|safe }}</span>
                             {% else %}
-                                <span class="checker-success" data-toggle="modal" data-target="#check-{{check.pk}}" title="{{check.checker|title}} passed">{{ check.symbol|safe }}</span>
+                                <span class="checker-success" data-bs-toggle="modal" data-bs-target="#check-{{check.pk}}" title="{{check.checker|title}} passed">{{ check.symbol|safe }}</span>
                             {% endif %}
-                            <a href="#" data-toggle="modal" data-target="#check-{{check.pk}}">
+                            <a href="#" data-bs-toggle="modal" data-bs-target="#check-{{check.pk}}">
                                 {{ check.errors }} errors, {{ check.warnings }} warnings.
                             </a>
                             {% include "doc/yang-check-modal-overlay.html" %}
@@ -683,7 +683,7 @@
         <a class="btn btn-primary btn-xs" href="{% url 'ietf.doc.views_doc.document_referenced_by' doc.canonical_name %}" rel="nofollow"><span class="bi bi-arrow-right"></span> Referenced by</a>
         <a class="btn btn-primary btn-xs" href="{{settings.IDNITS_BASE_URL}}?url=https://www.ietf.org/archive/id/{{ doc.filename_with_rev }}" rel="nofollow" target="_blank"><span class="bi bi-exclamation"></span> Nits</a>
         <div class="dropdown inline">
-            <button class="btn btn-primary btn-xs dropdown-toggle" type="button" id="ddSearchMenu" data-toggle="dropdown" aria-expanded="true">
+            <button class="btn btn-primary btn-xs dropdown-toggle" type="button" id="ddSearchMenu" data-bs-toggle="dropdown" aria-expanded="true">
                 <span class="bi bi-search"></span> Search lists <span class="caret"></span>
             </button>
             <ul class="dropdown-menu" role="menu">
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index 527011bc2..d0ecd7c4e 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -71,7 +71,7 @@
                     <label class="control-label">Diff format</label>
                 </div>
                 <div class="col-sm-10">
-                    <div class="btn-group" data-toggle="buttons">
+                    <div class="btn-group" data-bs-toggle="buttons">
                         <label class="btn btn-primary active">
                             <input type="radio" name="difftype" value="--html"> Side-by-side
                         </label>
diff --git a/ietf/templates/doc/edit_telechat_date.html b/ietf/templates/doc/edit_telechat_date.html
index 019fa0fbd..42538101c 100644
--- a/ietf/templates/doc/edit_telechat_date.html
+++ b/ietf/templates/doc/edit_telechat_date.html
@@ -18,7 +18,7 @@
         {% csrf_token %}
         {% bootstrap_form form %}
 
-        <div id="large_page_count_warning" class="hidden-nojs alert alert-warning">
+        <div id="large_page_count_warning" class="alert alert-warning">
             Putting the document on this telechat gives the telechat a very large document page count. Please consider choosing another telechat date for this document.
         </div>
 
@@ -54,4 +54,4 @@
             toggleWarning($(this).val());
         });
     </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index 7e15df22d..b7c502475 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -88,9 +88,9 @@
     {% for check in doc.submission.latest_checks %}
       {% if check.passed != None and check.symbol.strip %}
 	{% if check.errors or check.warnings %}
-	   <span class="checker-warning float-end" data-toggle="modal" data-target="#check-{{check.pk}}" title="{{check.checker|title}} returned warnings or errors." >{{ check.symbol|safe }}</span>
+	   <span class="checker-warning float-end" data-bs-toggle="modal" data-bs-target="#check-{{check.pk}}" title="{{check.checker|title}} returned warnings or errors." >{{ check.symbol|safe }}</span>
 	{% else %}
-	   <span class="checker-success float-end" data-toggle="modal" data-target="#check-{{check.pk}}" title="{{check.checker|title}} passed">{{ check.symbol|safe }}</span>
+	   <span class="checker-success float-end" data-bs-toggle="modal" data-bs-target="#check-{{check.pk}}" title="{{check.checker|title}} passed">{{ check.symbol|safe }}</span>
 	{% endif %}
 	{% include "doc/yang-check-modal-overlay.html" %}
       {% endif %}
diff --git a/ietf/templates/doc/yang-check-modal-overlay.html b/ietf/templates/doc/yang-check-modal-overlay.html
index 18615b3ce..0b0fd4d03 100644
--- a/ietf/templates/doc/yang-check-modal-overlay.html
+++ b/ietf/templates/doc/yang-check-modal-overlay.html
@@ -3,14 +3,14 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title" id="nitslabel">{{ check.checker|title }} for {{ doc.name }}-{{ doc.rev }} on {{ check.time|date:"Y-m-d" }}</h4>
             </div>
             <div class="modal-body">
                 <pre class="pasted">{{ check.message|zaptmp }}</pre>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
             </div>
         </div>
     </div>
diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html
index 4e120a44e..672bc5753 100644
--- a/ietf/templates/group/active_wgs.html
+++ b/ietf/templates/group/active_wgs.html
@@ -8,7 +8,7 @@
 
 {% block title %}Active IETF working groups{% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block content %}
     {% origin %}
@@ -85,8 +85,8 @@
             {% endfor %}
 
         </div>
-        <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-            <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+        <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+            <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
                 {% for area in areas %}
                     <li><a href="#{{area.acronym}}">{{ area.name }}</a></li>
                 {% endfor %}
diff --git a/ietf/templates/group/all_photos.html b/ietf/templates/group/all_photos.html
index 23c6db74f..27bb9caa4 100644
--- a/ietf/templates/group/all_photos.html
+++ b/ietf/templates/group/all_photos.html
@@ -6,7 +6,7 @@
     .well { max-width: 150px;}
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block title %}Chair Photos{% endblock %}
 
@@ -55,8 +55,8 @@
         {% endfor %}
     </div>
 
-    <div class="col-md-1 hidden-print bs-docs-sidebar" id="affix">
-        <ul class="nav nav-pills nav-stacked small fixed" data-spy="affix">
+    <div class="col-md-1 d-print-none bs-docs-sidebar" id="affix">
+        <ul class="nav nav-pills nav-stacked small fixed" data-bs-spy="affix">
             {% for letter in alphabet_blocks %}
                 <li><a href="#{{letter.grouper}}">{{letter.grouper}}</a></li>
             {% endfor %}
diff --git a/ietf/templates/group/change_reviewer_settings.html b/ietf/templates/group/change_reviewer_settings.html
index 018defb4b..3777449c6 100644
--- a/ietf/templates/group/change_reviewer_settings.html
+++ b/ietf/templates/group/change_reviewer_settings.html
@@ -70,7 +70,7 @@
         <p>No periods found.</p>
     {% endif %}
 
-    <div><a class="btn btn-primary" data-toggle="collapse" data-target="#add-new-period">Add a new period</a></div>
+    <div><a class="btn btn-primary" data-bs-toggle="collapse" data-bs-target="#add-new-period">Add a new period</a></div>
 
     <div id="add-new-period" {% if not period_form.errors %}class="collapse"{% endif %}>
         <h4>Add a new period</h4>
diff --git a/ietf/templates/group/concluded_groups.html b/ietf/templates/group/concluded_groups.html
index 8abc3d1fb..187697c99 100644
--- a/ietf/templates/group/concluded_groups.html
+++ b/ietf/templates/group/concluded_groups.html
@@ -18,7 +18,7 @@
 
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#navscroller"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#navscroller"{% endblock %}
 
 {% block title %}Concluded groups{% endblock %}
 
@@ -92,7 +92,7 @@
         {% endfor %}
     </div>
 
-    <div class="col-md-2 hidden-print bs-docs-sidebar" id="navscroller">
+    <div class="col-md-2 d-print-none bs-docs-sidebar" id="navscroller">
         <ul class="nav nav-pills nav-stacked small fixed" >
             {% for label, groups in sections.items %}
                 <li>
diff --git a/ietf/templates/group/customize_workflow.html b/ietf/templates/group/customize_workflow.html
index 94c545d15..95e06a65c 100644
--- a/ietf/templates/group/customize_workflow.html
+++ b/ietf/templates/group/customize_workflow.html
@@ -48,7 +48,7 @@
                                 {% endif %}
 
                                 <div>
-                                    <button class="btn btn-primary btn-sm {% if not state.used %}disabled{% endif %}" title="Click to set next states for state" data-toggle="collapse" data-target="#nexts{{ state.pk }}" aria-expanded="false" aria-controls="nexts{{ state.pk }}">
+                                    <button class="btn btn-primary btn-sm {% if not state.used %}disabled{% endif %}" title="Click to set next states for state" data-bs-toggle="collapse" data-bs-target="#nexts{{ state.pk }}" aria-expanded="false" aria-controls="nexts{{ state.pk }}">
                                         <span class="caret"></span> Customize
                                     </button>
                                 </div>
diff --git a/ietf/templates/group/group_photos.html b/ietf/templates/group/group_photos.html
index 72f9f8f8b..c5a1a4e93 100644
--- a/ietf/templates/group/group_photos.html
+++ b/ietf/templates/group/group_photos.html
@@ -8,7 +8,7 @@
 
 {% block title %}{{ group }} ({{group.acronym}}) Photos{% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block group_content %}
     {% origin %}
@@ -52,8 +52,8 @@
         {% endfor %}
     </div>
 
-    <div class="col-md-1 hidden-print bs-docs-sidebar" id="affix">
-        <ul class="nav nav-pills nav-stacked small fixed" data-spy="affix">
+    <div class="col-md-1 d-print-none bs-docs-sidebar" id="affix">
+        <ul class="nav nav-pills nav-stacked small fixed" data-bs-spy="affix">
             {% for role_name in role_groups %}
                 <li><a href="#{{role_name.grouper|urlencode}}">{{role_name.grouper}}</a></li>
             {% endfor %}
diff --git a/ietf/templates/iesg/agenda.html b/ietf/templates/iesg/agenda.html
index f633e1ec8..4ac589b80 100644
--- a/ietf/templates/iesg/agenda.html
+++ b/ietf/templates/iesg/agenda.html
@@ -16,7 +16,7 @@
 
 {% block title %}IESG agenda: {{ date }}{% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block content %}
     {% origin %}
@@ -124,8 +124,8 @@
             {% endfor %}
         </div>
 
-        <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-            <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+        <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+            <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
                 {% for num, section in sections %}
                     {% if num|sectionlevel <= 1 %}
                         <li><a href="#{{num}}">{{ section.title|safe }}</a></li>
diff --git a/ietf/templates/iesg/discusses.html b/ietf/templates/iesg/discusses.html
index ddfd13a13..9052c0009 100644
--- a/ietf/templates/iesg/discusses.html
+++ b/ietf/templates/iesg/discusses.html
@@ -26,7 +26,7 @@
 
 
     {% if user|has_role:"Area Director" %}
-        <p class="btn-group" data-toggle="buttons">
+        <p class="btn-group" data-bs-toggle="buttons">
             <label class="btn btn-primary active discuss">
                 <input type="radio" value="all">All
             </label>
diff --git a/ietf/templates/iesg/past_documents.html b/ietf/templates/iesg/past_documents.html
index 07cc3fc19..7b37d6b89 100644
--- a/ietf/templates/iesg/past_documents.html
+++ b/ietf/templates/iesg/past_documents.html
@@ -27,7 +27,7 @@
 
     <!--
   {% if user|has_role:"Area Director" %}
-    <p class="btn-group" data-toggle="buttons">
+    <p class="btn-group" data-bs-toggle="buttons">
       <label class="btn btn-primary active discuss">
         <input type="radio" value="all">All
       </label>
diff --git a/ietf/templates/iesg/photos.html b/ietf/templates/iesg/photos.html
index 7ed270c1c..9e45b6ad6 100644
--- a/ietf/templates/iesg/photos.html
+++ b/ietf/templates/iesg/photos.html
@@ -11,7 +11,7 @@
 
 {% block title %}{{ group_type | upper }} {{ role }} Photos{% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block content %}
     {% origin %}
@@ -64,8 +64,8 @@
         {% endfor %}
     </div>
 
-    <div class="col-md-1 hidden-print bs-docs-sidebar" id="affix">
-        <ul class="nav nav-pills nav-stacked small fixed" data-spy="affix">
+    <div class="col-md-1 d-print-none bs-docs-sidebar" id="affix">
+        <ul class="nav nav-pills nav-stacked small fixed" data-bs-spy="affix">
             {% for letter in alphabet_blocks %}
                 <li><a href="#{{letter.grouper}}">{{letter.grouper}}</a></li>
             {% endfor %}
diff --git a/ietf/templates/ipr/list.html b/ietf/templates/ipr/list.html
index 175529efc..40a451d49 100644
--- a/ietf/templates/ipr/list.html
+++ b/ietf/templates/ipr/list.html
@@ -6,7 +6,7 @@
 
 {% block title %}Intellectual property rights disclosures{% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/datatables.css" %}">
@@ -47,8 +47,8 @@
 
         </div>
 
-        <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-            <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+        <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+            <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
                 <li><a href="#generic">General IPR disclosures</a></li>
                 <li><a href="#specific">Specific IPR disclosures</a></li>
                 <li><a href="#notify">Specific third-party IPR disclosures</a></li>
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 0c9e2f79f..ae58cd0bf 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -17,7 +17,7 @@
     iframe#weekview { height: 25em; }
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix" data-bs-offset="0" tabindex="0"{% endblock %}
 
 {% block content %}
     {% origin %}
@@ -115,12 +115,12 @@
                                 data-slot-start-ts="{{item.start_timestamp}}"
                                 data-slot-end-ts="{{item.end_timestamp}}">
                                 <td class="text-nowrap text-right">
-                                    <div class="hidden-xs">
+                                    <div class="d-none d-sm-block">
                                         {% include "meeting/timeslot_start_end.html" %}
                                     </div>
                                 </td>
                                 <td colspan="3">
-                                    <div class="hidden-sm hidden-md hidden-lg">
+                                    <div class="d-none d-md-block d-lg-block d-xl-block d-xxl-block">
                                         {% include "meeting/timeslot_start_end.html" %}
                                     </div>
                                     {% location_anchor item.timeslot %}
@@ -129,7 +129,7 @@
                         {% if item.timeslot.show_location and item.timeslot.get_html_location %}
                             {% with item.timeslot.location.floorplan as floor %}
                                 {% if item.timeslot.location.floorplan %}
-                                    <div class="hidden-xs">
+                                    <div class="d-none d-sm-block">
                                         <a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
                                             class="float-end" title="{{floor.name}}"><span class="badge bg-secondary label-wide">{{floor.short}}</span></a>
                                     </div>
@@ -169,12 +169,12 @@
                             data-slot-start-ts="{{item.start_timestamp}}"
                             data-slot-end-ts="{{item.end_timestamp}}">
                             <th class="text-nowrap text-right">
-                                <div class="hidden-xs">
+                                <div class="d-none d-sm-block">
                                     {% include "meeting/timeslot_start_end.html" %}
                                 </div>
                             </th>
                             <th colspan="4">
-                                <div class="hidden-sm hidden-md hidden-lg">
+                                <div class="d-none d-md-block d-lg-block d-xl-block d-xxl-block">
                                     {% include "meeting/timeslot_start_end.html" %}
                                 </div>
                                 {{ item.timeslot.time|date:"l"}}
@@ -192,12 +192,12 @@
                         data-slot-end-ts="{{item.end_timestamp}}">
                         {% if item.slot_type.slug == 'plenary' %}
                             <th class="text-nowrap text-right">
-                                <div class="hidden-xs">
+                                <div class="d-none d-sm-block">
                                     {% include "meeting/timeslot_start_end.html" %}
                                 </div>
                             </th>
                             <td colspan="3">
-                                <div class="hidden-sm hidden-md hidden-lg">
+                                <div class="d-none d-md-block d-lg-block d-xl-block d-xxl-block">
                                     {% include "meeting/timeslot_start_end.html" %}
                                 </div>
                                 {% location_anchor item.timeslot %}
@@ -209,7 +209,7 @@
                     <td>
                         {% with item.timeslot.location.floorplan as floor %}
                             {% if item.timeslot.location.floorplan %}
-                                <div class="hidden-xs">
+                                <div class="d-none d-sm-block">
                                     <a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
                                         class="float-end" title="{{floor.name}}"><span class="badge bg-secondary">{{floor.short}}</span></a>
                                 </div>
@@ -222,7 +222,7 @@
                 {% end_location_anchor %}
                 </td>
 
-                <td><div class="hidden-xs">{{item.session.historic_group.historic_parent.acronym}}</div></td>
+                <td><div class="d-none d-sm-block">{{item.session.historic_group.historic_parent.acronym}}</div></td>
 
                 <td>
                     {% if item.session.historic_group %}
@@ -277,27 +277,20 @@
 {% endif %}
 {% endfor %}
 </table>
-
 </div>
-<div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-    <ul class="nav nav-pills nav-stacked small" data-spy="affix">
-        <li><a href="#now">Now</a></li>
+
+<div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+    <ul class="nav nav-pills flex-column small" data-bs-spy="affix">
+        <li class="nav-item">
+            <a class="nav-link" href="#now">Now</a>
+        </li>
         {% for item in filtered_assignments %}
             {% ifchanged item.timeslot.time|date:"Y-m-d" %}
-                <li><a href="#{{item.timeslot.time|slugify}}">{{ item.timeslot.time|date:"l, F j, Y" }}</a></li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#{{item.timeslot.time|slugify}}">{{ item.timeslot.time|date:"l, F j, Y" }}</a>
+                </li>
             {% endifchanged %}
         {% endfor %}
-        <li><hr/></li>
-        <li class="tz-display">Showing <span class="current-tz">{{ timezone }}</span> time</li>
-        <li class="tz-display"><span> {# span avoids applying nav link styling to these shortcuts #}
-            <a onclick="ietf_timezone.use('{{ timezone }}')">Meeting time</a> |
-            <a onclick="ietf_timezone.use('local')">Local time</a> |
-            <a onclick="ietf_timezone.use('UTC')">UTC</a></span>
-        </li>
-        {% if settings.DEBUG and settings.DEBUG_AGENDA %}
-            <li><hr/></li>
-            <li><span id="current-time"></span></li>
-        {% endif %}
     </ul>
 </div>
 </div>
diff --git a/ietf/templates/meeting/agenda_personalize.html b/ietf/templates/meeting/agenda_personalize.html
index 97cc9f326..ffa4cc86c 100644
--- a/ietf/templates/meeting/agenda_personalize.html
+++ b/ietf/templates/meeting/agenda_personalize.html
@@ -44,7 +44,7 @@
     }
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block content %}
     {% origin %}
@@ -116,12 +116,12 @@
                                     data-slot-end-ts="{{ item.end_timestamp }}">
                                     <td class="leftmarker"></td>
                                     <th class="text-nowrap text-right">
-                                        <span class="hidden-xs">
+                                        <span class="d-none d-sm-block">
                                             {% include "meeting/timeslot_start_end.html" %}
                                         </span>
                                     </th>
                                     <th colspan="4">
-                                        <span class="hidden-sm hidden-md hidden-lg">
+                                        <span class="d-none d-md-block d-lg-block d-xl-block d-xxl-block">
                                             {% include "meeting/timeslot_start_end.html" %}
                                         </span>
                                         {{ item.timeslot.time|date:"l" }}
@@ -150,12 +150,12 @@
                                     {% endif %}
                                 </td>
                                 <td class="text-nowrap text-right">
-                                    <span class="hidden-xs">
+                                    <span class="d-none d-sm-block">
                                         {% include "meeting/timeslot_start_end.html" %}
                                     </span>
                                 </td>
                                 <td colspan="3">
-                                    <span class="hidden-sm hidden-md hidden-lg">
+                                    <span class="d-none d-md-block d-lg-block d-xl-block d-xxl-block">
                                         {% include "meeting/timeslot_start_end.html" %}
                                     </span>
                                     {% if item.timeslot.show_location and item.timeslot.get_html_location %}
@@ -171,7 +171,7 @@
                                         {% endif %}
                                         {% with item.timeslot.location.floorplan as floor %}
                                             {% if item.timeslot.location.floorplan %}
-                                                <span class="hidden-xs">
+                                                <span class="d-none d-sm-block">
                                                     <a
                                                         href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{ floor.name|xslugify }}"
                                                         class="float-end" title="{{ floor.name }}"><span
@@ -218,12 +218,12 @@
                                     </td>
                                     {% if item.timeslot.type.slug == 'plenary' %}
                                         <th class="text-nowrap text-right">
-                                            <span class="hidden-xs">
+                                            <span class="d-none d-sm-block">
                                                 {% include "meeting/timeslot_start_end.html" %}
                                             </span>
                                         </th>
                                         <td colspan="3">
-                                            <span class="hidden-sm hidden-md hidden-lg">
+                                            <span class="d-none d-md-block d-lg-block d-xl-block d-xxl-block">
                                                 {% include "meeting/timeslot_start_end.html" %}
                                             </span>
                                             {% if item.timeslot.show_location and item.timeslot.get_html_location %}
@@ -244,7 +244,7 @@
                                         <td>
                                             {% with item.timeslot.location.floorplan as floor %}
                                                 {% if item.timeslot.location.floorplan %}
-                                                    <span class="hidden-xs">
+                                                    <span class="d-none d-sm-block">
                                                         <a
                                                             href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{ floor.name|xslugify }}"
                                                             class="float-end" title="{{ floor.name }}"><span
@@ -268,7 +268,7 @@
                                             {% endif %}
                                         </td>
 
-                                        <td><span class="hidden-xs">{{ item.session.historic_group.historic_parent.acronym }}</span></td>
+                                        <td><span class="d-none d-sm-block">{{ item.session.historic_group.historic_parent.acronym }}</span></td>
 
                                         <td>
                                             {% if item.session.historic_group %}
@@ -340,8 +340,8 @@
                 {% include "meeting/agenda_personalize_buttonlist.html" with meeting=schedule.meeting only %}
 
                 </div>
-                <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-                    <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+                <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+                    <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
                         <li><a href="#now">Now</a></li>
                         {% for item in filtered_assignments %}
                             {% ifchanged item.timeslot.time|date:"Y-m-d" %}
@@ -405,4 +405,4 @@
         /* pull this from the agenda_personalize js module to make available to agenda_timezone */
         meeting_timezone = agenda_personalize.meeting_timezone;
     </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html
index 084d59091..a2e954401 100644
--- a/ietf/templates/meeting/edit_meeting_schedule.html
+++ b/ietf/templates/meeting/edit_meeting_schedule.html
@@ -194,9 +194,9 @@
                     </span>
 
                     {% if session_purposes|length > 1 %}
-                        <button id="session-toggle-modal-open" class="btn btn-default" data-toggle="modal" data-target="#session-toggles-modal"><input type="checkbox" checked="checked" disabled> Sessions</button>
+                        <button id="session-toggle-modal-open" class="btn btn-default" data-bs-toggle="modal" data-bs-target="#session-toggles-modal"><input type="checkbox" checked="checked" disabled> Sessions</button>
                     {% endif %}
-                    <button id="timeslot-toggle-modal-open" class="btn btn-default" data-toggle="modal" data-target="#timeslot-group-toggles-modal"><input type="checkbox" checked="checked" disabled> Timeslots</button>
+                    <button id="timeslot-toggle-modal-open" class="btn btn-default" data-bs-toggle="modal" data-bs-target="#timeslot-group-toggles-modal"><input type="checkbox" checked="checked" disabled> Timeslots</button>
                 </div>
             </div>
 
@@ -207,7 +207,7 @@
             <div class="modal-dialog modal-lg" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">
+                        <button type="button" class="close" data-bs-dismiss="modal">
                             <span aria-hidden="true">&times;</span>
                             <span class="sr-only">Close</span>
                         </button>
@@ -241,7 +241,7 @@
                     </div>
 
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                        <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                     </div>
                 </div>
             </div>
@@ -251,7 +251,7 @@
             <div class="modal-dialog modal-lg" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">
+                        <button type="button" class="close" data-bs-dismiss="modal">
                             <span aria-hidden="true">&times;</span>
                             <span class="sr-only">Close</span>
                         </button>
@@ -271,7 +271,7 @@
                     </div>
 
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                        <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                     </div>
                 </div>
             </div>
@@ -281,7 +281,7 @@
             <div class="modal-dialog modal-lg" role="document">
                 <form class="modal-content" method="post">{% csrf_token %}
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">
+                        <button type="button" class="close" data-bs-dismiss="modal">
                             <span aria-hidden="true">&times;</span>
                             <span class="sr-only">Close</span>
                         </button>
@@ -303,7 +303,7 @@
                     </div>
 
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                        <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                         <button type="submit" name="action" value="swapdays" class="btn btn-primary">Swap days</button>
                     </div>
                 </form>
@@ -314,7 +314,7 @@
             <div class="modal-dialog modal-lg" role="document">
                 <form class="modal-content" method="post">{% csrf_token %}
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">
+                        <button type="button" class="close" data-bs-dismiss="modal">
                             <span aria-hidden="true">&times;</span>
                             <span class="sr-only">Close</span>
                         </button>
@@ -351,7 +351,7 @@
                     </div>
 
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                        <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                         <button type="submit" name="action" value="swaptimeslots" class="btn btn-primary">Swap timeslots</button>
                     </div>
                 </form>
diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html
index 311593e62..7d6e55d84 100644
--- a/ietf/templates/meeting/interim_session_buttons.html
+++ b/ietf/templates/meeting/interim_session_buttons.html
@@ -8,7 +8,7 @@
         {# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
         {% include "meeting/session_agenda_include.html" with slug=item.slug session=session timeslot=item.timeslot only %}
         <!-- agenda pop-up button -->
-        <a data-toggle="modal" data-target="#modal-{{item.slug}}" title="Show meeting materials"><span class="bi bi-arrows-fullscreen"></span></a>
+        <a data-bs-toggle="modal" data-bs-target="#modal-{{item.slug}}" title="Show meeting materials"><span class="bi bi-arrows-fullscreen"></span></a>
         <!-- materials tar file -->
         <a href="/meeting/{{meeting.number}}/agenda/{{acronym}}-drafts.tgz" title="Download meeting materials as .tar archive"><span class="bi bi-file-zip"></span></a>
         <!-- materials PDF file -->
diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html
index 4cecb6bcf..158f936ba 100644
--- a/ietf/templates/meeting/materials.html
+++ b/ietf/templates/meeting/materials.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/datatables.css" %}">
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block title %}IETF {{ meeting.number }} preliminary &amp; interim materials{% endblock %}
 
@@ -254,8 +254,8 @@
                 {% endwith %}
             </div>
 
-            <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-                <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+            <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+                <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
                     {% if plenaries %}
                         <li><a href="#plenaries">Plenaries</a></li>
                     {% endif %}
diff --git a/ietf/templates/meeting/past.html b/ietf/templates/meeting/past.html
index 99ddb8e8b..886d81242 100644
--- a/ietf/templates/meeting/past.html
+++ b/ietf/templates/meeting/past.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/datatables.css" %}">
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block title %}Past Meetings{% endblock %}
 
diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html
index 50deedc24..6b7d1a92c 100644
--- a/ietf/templates/meeting/proceedings.html
+++ b/ietf/templates/meeting/proceedings.html
@@ -47,7 +47,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/datatables.css" %}">
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block title %}IETF {{ meeting.number }} {% if not meeting.proceedings_final %}Draft{% endif %} Proceedings {% endblock %}
 
@@ -225,8 +225,8 @@
             {% endcache %}
         </div>
 
-        <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-            <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+        <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+            <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
                 <li><a href="#introduction">Introduction</a></li>
                 {% if plenaries %}
                     <li><a href="#plenaries">Plenaries</a></li>
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index c244c6c5d..81a403907 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/datatables.css" %}">
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block title %}IETF {{ meeting.number }} timeslot requests{% endblock %}
 
@@ -129,8 +129,8 @@
                 </table>
             {% endfor %}
         </div>
-        <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-            <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+        <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+            <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
                 {% for area in area_sessions %}
                     <li><a href="#{{area.grouper.acronym}}">{{ area.grouper.acronym|upper }}</a></li>
                 {% endfor %}
diff --git a/ietf/templates/meeting/room-view.html b/ietf/templates/meeting/room-view.html
index 5baf3cf66..3fa53e43f 100644
--- a/ietf/templates/meeting/room-view.html
+++ b/ietf/templates/meeting/room-view.html
@@ -589,7 +589,7 @@
   <div id="daycontainer" role="tabpanel">
     <ul id="daytabs" class="nav nav-tabs" role="tablist">
     {% for day in days %}
-      <li {% if forloop.first %}class="active"{% endif %} role="presentation"><a href="#day{{forloop.counter0}}" id="day{{forloop.counter0}}-tab" role="tab" data-toggle="tab" area-controls="day{{forloop.counter0}}">{{day|date:"D M d"}}</a></li>
+      <li {% if forloop.first %}class="active"{% endif %} role="presentation"><a href="#day{{forloop.counter0}}" id="day{{forloop.counter0}}-tab" role="tab" data-bs-toggle="tab" area-controls="day{{forloop.counter0}}">{{day|date:"D M d"}}</a></li>
     {% endfor %}
     </ul>
     <div class="tab-content">
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index e2c04d04e..06b73e1d3 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -94,7 +94,7 @@
             </div>
         </div>
         <div class="panel ">
-            <div class="card-header" data-toggle="tooltip" title="Drag and drop to reorder slides">Slides</div>
+            <div class="card-header" data-bs-toggle="tooltip" title="Drag and drop to reorder slides">Slides</div>
             <div class="card-body">
                 <table class="table table-sm table-striped slides" id="slides_{{session.pk}}">
                     <tbody session="{{session.pk}}" addToSession="{% url 'ietf.meeting.views.ajax_add_slides_to_session' session_id=session.pk num=session.meeting.number %}" removeFromSession="{% url 'ietf.meeting.views.ajax_remove_slides_from_session' session_id=session.pk num=session.meeting.number %}" reorderInSession="{% url 'ietf.meeting.views.ajax_reorder_slides_in_session' session_id=session.pk num=session.meeting.number %}">
diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html
index eb377d3bd..ec61578e2 100644
--- a/ietf/templates/meeting/timeslot_edit.html
+++ b/ietf/templates/meeting/timeslot_edit.html
@@ -136,7 +136,7 @@
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">
+                        <button type="button" class="close" data-bs-dismiss="modal">
                             <span aria-hidden="true">&times;</span>
                             <span class="sr-only">Close</span>
                         </button>
@@ -176,7 +176,7 @@
                     </div>
 
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                        <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
                         <button type="button" id="confirm-delete-button" class="btn btn-primary">Delete</button>
                     </div>
                 </div>
diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html
index af63224eb..937a23b05 100644
--- a/ietf/templates/meeting/upcoming.html
+++ b/ietf/templates/meeting/upcoming.html
@@ -11,7 +11,7 @@
 
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block title %}Upcoming Meetings{% endblock %}
 
diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html
index 3a9b2e089..8e3860b93 100644
--- a/ietf/templates/nomcom/announcements.html
+++ b/ietf/templates/nomcom/announcements.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/datatables.css" %}">
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block title %}NomCom{% endblock %}
 
@@ -69,8 +69,8 @@
 
 
         </div>
-        <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-            <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+        <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+            <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
                 {% for regime in regimes %}
                     <li><a href="#{{ regime.group.start_year }}">{{ regime.group.start_year }}/{{ regime.group.end_year }}</a></li>
                 {% endfor %}
diff --git a/ietf/templates/nomcom/chair_help.html b/ietf/templates/nomcom/chair_help.html
index d4e8119f5..90cd7e727 100644
--- a/ietf/templates/nomcom/chair_help.html
+++ b/ietf/templates/nomcom/chair_help.html
@@ -5,15 +5,15 @@
 {% load django_bootstrap5 %}
 {% load ietf_filters %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#nav-instructions"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#nav-instructions"{% endblock %}
 
 {% block subtitle %} - Configuration Help {% endblock %}
 
 {% block nomcom_content %}
     {% origin %}
 
-    <div class="col-sm-2 col-sm-offset-10 hidden-xs hidden-print bs-docs-sidebar" id="nav-instructions">
-        <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+    <div class="col-sm-2 col-sm-offset-10 d-none d-sm-block d-print-none bs-docs-sidebar" id="nav-instructions">
+        <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
             <li><a href="#keys">Keypair</a></li>
             <li><a href="#configure">Configuration</a></li>
             <li><a href="#positions">Positions</a></li>
diff --git a/ietf/templates/nomcom/history.html b/ietf/templates/nomcom/history.html
index 04a9d78cb..909fa229a 100644
--- a/ietf/templates/nomcom/history.html
+++ b/ietf/templates/nomcom/history.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/datatables.css" %}">
 {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block title %}NomCom{% endblock %}
 
@@ -775,8 +775,8 @@
 
 
         </div>
-        <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-            <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+        <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+            <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
                 {% for regime in regimes %}
                     <li><a href="#{{ regime.year }}">{{ regime.label }}</a></li>
                 {% endfor %}
diff --git a/ietf/templates/nomcom/iesg_position_requirements.html b/ietf/templates/nomcom/iesg_position_requirements.html
index 4064fe2aa..9df17dabc 100644
--- a/ietf/templates/nomcom/iesg_position_requirements.html
+++ b/ietf/templates/nomcom/iesg_position_requirements.html
@@ -1,5 +1,5 @@
 <div class="panel ">
-    <div class="card-header"><a data-toggle="collapse" href="#generic_iesg_reqs_{{position.name|slugify}}" class="generic_iesg_reqs_header">General IESG Requirements</a></div>
+    <div class="card-header"><a data-bs-toggle="collapse" href="#generic_iesg_reqs_{{position.name|slugify}}" class="generic_iesg_reqs_header">General IESG Requirements</a></div>
     <div id="generic_iesg_reqs_{{position.name|slugify}}" class="card-body collapse in">
         {{generic_iesg_reqs|safe}}
     </div>
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index c7aa56e4d..028fa4d0c 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -39,7 +39,7 @@
             </li>
 
             <li class="dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Chair/Advisor Tasks <span class="caret"></span></a>
+                <a class="dropdown-toggle" data-bs-toggle="dropdown" href="#">Chair/Advisor Tasks <span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     {% if nomcom.group.state_id == 'active' %}
                         <li role = "presentation" class = "dropdown-header">Feedback Management</li>
@@ -101,7 +101,7 @@
         {% endif %}
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Volunteers<span class="caret"></span></a>
+                <a class="dropdown-toggle" data-bs-toggle="dropdown" href="#">Volunteers<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li class="nav-item">
                         <a class="nav-link {% if selected == "view_eligible" %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_eligible' year %}">View Eligible</a>
diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
index 2c2041cd6..c76b31628 100644
--- a/ietf/templates/nomcom/nomcom_public_base.html
+++ b/ietf/templates/nomcom/nomcom_public_base.html
@@ -27,7 +27,7 @@
             <a class="nav-link {% if selected == "questionnaires" %}active{% endif %}" href="{% url 'ietf.nomcom.views.questionnaires' year %}">Questionnaires</a></li>
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Volunteers<span class="caret"></span></a>
+                <a class="dropdown-toggle" data-bs-toggle="dropdown" href="#">Volunteers<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li class="nav-item">
                         <a class="nav-link {% if selected == "view_eligible" %}active{% endif %}" href="{% url 'ietf.nomcom.views.public_eligible' year %}">View Eligible</a></li>
diff --git a/ietf/templates/nomcom/questionnaires.html b/ietf/templates/nomcom/questionnaires.html
index 0d5bff201..913100736 100644
--- a/ietf/templates/nomcom/questionnaires.html
+++ b/ietf/templates/nomcom/questionnaires.html
@@ -11,7 +11,7 @@
     <ul class="nav nav-tabs">
         {% for position in positions %}
             <li class="nav-item">
-                <a class="nav-link {% if forloop.first %}active{% endif %}" data-toggle="tab" role="tab" href="#{{ position.name|slugify }}">{{ position.name }}</a>
+                <a class="nav-link {% if forloop.first %}active{% endif %}" data-bs-toggle="tab" role="tab" href="#{{ position.name|slugify }}">{{ position.name }}</a>
             </li>
         {% endfor %}
     </ul>
diff --git a/ietf/templates/nomcom/requirements.html b/ietf/templates/nomcom/requirements.html
index 4b0bc6735..1c3cab0d8 100644
--- a/ietf/templates/nomcom/requirements.html
+++ b/ietf/templates/nomcom/requirements.html
@@ -18,7 +18,7 @@
     <ul class="nav nav-tabs">
         {% for position in positions %}
             <li class="nav-item">
-                <a class="nav-link {% if forloop.first %}active{% endif %}" data-toggle="tab" role="tab" href="#pos-{{ position.name|slugify }}">{{ position.name }}</a>
+                <a class="nav-link {% if forloop.first %}active{% endif %}" data-bs-toggle="tab" role="tab" href="#pos-{{ position.name|slugify }}">{{ position.name }}</a>
             </li>
         {% endfor %}
     </ul>
diff --git a/ietf/templates/nomcom/view_feedback.html b/ietf/templates/nomcom/view_feedback.html
index ba85b32bc..8d86e1bbc 100644
--- a/ietf/templates/nomcom/view_feedback.html
+++ b/ietf/templates/nomcom/view_feedback.html
@@ -6,7 +6,7 @@
 
 {% block subtitle %} - View feedback {% endblock %}
 
-{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block bodyAttrs %}data-bs-spy="scroll" data-bs-target="#affix"{% endblock %}
 
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/datatables.css" %}">
@@ -52,7 +52,7 @@
                                         <a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">{{ fb_dict.nominee.person.last_name }}</a>
                                     </td>
                                     <td>
-                                        <span class="hidden-xs">&lt;<a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">{{ fb_dict.nominee.email.address }}</a>&gt;</span>
+                                        <span class="d-none d-sm-block">&lt;<a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">{{ fb_dict.nominee.email.address }}</a>&gt;</span>
                                     </td>
                                     {% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
                                         <td class="text-right">
@@ -126,8 +126,8 @@
         {% endif %}
 
     </div>
-    <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
-        <ul class="nav nav-pills nav-stacked small" data-spy="affix">
+    <div class="col-md-2 d-print-none bs-docs-sidebar" id="affix">
+        <ul class="nav nav-pills nav-stacked small" data-bs-spy="affix">
             <li><a href="#accepted">Accepted</a></li>
             <li><a href="#pending">Pending</a></li>
             <li><a href="#declined">Declined</a></li>
diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
index 316747036..59130676b 100644
--- a/ietf/templates/nomcom/view_feedback_nominee.html
+++ b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -13,7 +13,7 @@
     <ul class="nav nav-tabs">
         {% for ft in feedback_types %}
             <li class="nav-item">
-                <a class="nav-link {% if forloop.first %}active{% endif %}" href="#{{ ft.slug }}" role="tab" data-toggle="tab">{{ ft.name }}</a>
+                <a class="nav-link {% if forloop.first %}active{% endif %}" href="#{{ ft.slug }}" role="tab" data-bs-toggle="tab">{{ ft.name }}</a>
             </li>
         {% endfor %}
     </ul>
diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html
index 9012543df..38c733351 100644
--- a/ietf/templates/nomcom/view_feedback_pending.html
+++ b/ietf/templates/nomcom/view_feedback_pending.html
@@ -116,7 +116,7 @@
                                 <td>{{ form.instance.subject }}</td>
 
                                 <td>
-                                    <button type="button" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#modal{{ form.instance.id }}">View</button>
+                                    <button type="button" class="btn btn-primary btn-xs" data-bs-toggle="modal" data-bs-target="#modal{{ form.instance.id }}">View</button>
                                 </td>
                             </tr>
 
@@ -124,7 +124,7 @@
                                 <div class="modal-dialog modal-lg">
                                     <div class="modal-content">
                                         <div class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal">
+                                            <button type="button" class="close" data-bs-dismiss="modal">
                                                 <span aria-hidden="true">&times;</span>
                                                 <span class="sr-only">Close</span>
                                             </button>
@@ -136,7 +136,7 @@
                                             <pre>{% decrypt form.instance.comments request year 1 %}</pre>
                                         </div>
                                         <div class="modal-footer">
-                                            <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                                            <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                                         </div>
                                     </div>
                                 </div>
diff --git a/ietf/templates/nomcom/view_feedback_topic.html b/ietf/templates/nomcom/view_feedback_topic.html
index 0ae444af8..4138ce3ce 100644
--- a/ietf/templates/nomcom/view_feedback_topic.html
+++ b/ietf/templates/nomcom/view_feedback_topic.html
@@ -13,7 +13,7 @@
     <ul class="nav nav-tabs">
         {% for ft in feedback_types %}
             <li class="nav-item">
-                <a class="nav-link {% if forloop.first %}active{% endif %}" href="#{{ ft.slug }}" role="tab" data-toggle="tab">{{ ft.name }}</a></li>
+                <a class="nav-link {% if forloop.first %}active{% endif %}" href="#{{ ft.slug }}" role="tab" data-bs-toggle="tab">{{ ft.name }}</a></li>
         {% endfor %}
     </ul>
 
diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html
index 6b393398e..5d190eff7 100644
--- a/ietf/templates/nomcom/view_feedback_unrelated.html
+++ b/ietf/templates/nomcom/view_feedback_unrelated.html
@@ -13,7 +13,7 @@
     <ul class="nav nav-tabs">
         {% for ft in feedback_types %}
             <li class="nav-item">
-                <a class="nav-link {% if forloop.first %}active{% endif %}" href="#{{ ft.ft.slug }}" role="tab" data-toggle="tab">{{ ft.ft.name }}</a></li>
+                <a class="nav-link {% if forloop.first %}active{% endif %}" href="#{{ ft.ft.slug }}" role="tab" data-bs-toggle="tab">{{ ft.ft.name }}</a></li>
         {% endfor %}
     </ul>
 
diff --git a/ietf/templates/submit/edit_submission.html b/ietf/templates/submit/edit_submission.html
index e549e99a8..0779d447c 100644
--- a/ietf/templates/submit/edit_submission.html
+++ b/ietf/templates/submit/edit_submission.html
@@ -19,14 +19,14 @@
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
                     <h4 class="modal-title" id="twopageslabel">First two pages of {{ submission.name }}-{{ submission.rev }}</h4>
                 </div>
                 <div class="modal-body">
                     {{ submission|two_pages_decorated_with_errors:errors }}
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                 </div>
             </div>
         </div>
@@ -40,7 +40,7 @@
             <th>Document</th>
             <td>
                 {{ submission.name }}
-                <button class="btn btn-primary btn-xs float-end" data-toggle="modal" data-target="#twopages">View first two pages</button>
+                <button class="btn btn-primary btn-xs float-end" data-bs-toggle="modal" data-bs-target="#twopages">View first two pages</button>
                 {% show_submission_files submission %}
             </td>
         </tr>
diff --git a/ietf/templates/submit/manual_post.html b/ietf/templates/submit/manual_post.html
index 2061fe900..f5a3d6a5f 100644
--- a/ietf/templates/submit/manual_post.html
+++ b/ietf/templates/submit/manual_post.html
@@ -74,7 +74,7 @@
                                     {% csrf_token %}
                                     <input type="hidden" name="submission_id" value="{{ s.pk }}">
                                     <input type="hidden" name="access_token" value="{{ s.access_token }}">
-                                    <button class="btn btn-danger btn-xs" type="submit" data-toggle="tooltip" title="Cancels the submission permanently.">Cancel submission</button>
+                                    <button class="btn btn-danger btn-xs" type="submit" data-bs-toggle="tooltip" title="Cancels the submission permanently.">Cancel submission</button>
                                 </form>
                             </td>
                         {% endif %}
diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html
index 3e593a6ab..f3e9287c0 100644
--- a/ietf/templates/submit/submission_status.html
+++ b/ietf/templates/submit/submission_status.html
@@ -69,20 +69,20 @@
 
     {% for check in submission.latest_checks %}
         {% if check.passed != None %}
-            <button class="btn btn-{% if check.passed %}{% if check.warnings %}warning{% elif check.errors %}warning{% else %}success{% endif %}{% else %}danger{% endif %}" data-toggle="modal" data-target="#check-{{check.pk}}">View {{ check.checker }}</button>
+            <button class="btn btn-{% if check.passed %}{% if check.warnings %}warning{% elif check.errors %}warning{% else %}success{% endif %}{% else %}danger{% endif %}" data-bs-toggle="modal" data-bs-target="#check-{{check.pk}}">View {{ check.checker }}</button>
 
             <div class="modal fade" id="check-{{check.pk}}" tabindex="-1" role="dialog" aria-labelledby="check-{{check.pk}}" aria-hidden="true">
                 <div class="modal-dialog modal-lg">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                            <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
                             <h4 class="modal-title" id="{{check.checker|slugify}}-label">{{ check.checker|title }} for {{ submission.name }}-{{ submission.rev }}</h4>
                         </div>
                         <div class="modal-body" id="{{check.checker|slugify}}-message">
                             <pre>{{ check.message }}</pre>
                         </div>
                         <div class="modal-footer">
-                            <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                            <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                         </div>
                     </div>
                 </div>
@@ -94,14 +94,14 @@
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
                     <h4 class="modal-title" id="twopageslabel">First two pages of {{ submission.name }}-{{ submission.rev }}</h4>
                 </div>
                 <div class="modal-body">
                     {{ submission|two_pages_decorated_with_errors:errors }}
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                 </div>
             </div>
         </div>
@@ -146,7 +146,7 @@
                     {{ submission.name }}
                 {% endif %}
 
-                <button class="btn btn-primary btn-xs float-end" data-toggle="modal" data-target="#twopages">View first two pages</button>
+                <button class="btn btn-primary btn-xs float-end" data-bs-toggle="modal" data-bs-target="#twopages">View first two pages</button>
 
                 {% show_submission_files submission %}
 
@@ -162,7 +162,7 @@
                 {{ submission.rev }}
 
                 {% if errors.rev %}
-                    <button class="btn btn-primary btn-xs float-end" data-toggle="modal" data-target="#twopages">View errors in document</button>
+                    <button class="btn btn-primary btn-xs float-end" data-bs-toggle="modal" data-bs-target="#twopages">View errors in document</button>
                     <p class="text-danger bg-danger"><b>{{ errors.rev }}</b></p>
                 {% endif %}
             </td>
@@ -361,7 +361,7 @@
         <form id="cancel-submission" method="post">
             {% csrf_token %}
             <input type="hidden" name="action" value="cancel">
-            <button class="btn btn-danger" type="submit" data-toggle="tooltip" title="Deletes the uploaded file{{ submission.file_types|split:","|pluralize }} permanently.">Cancel submission</button>
+            <button class="btn btn-danger" type="submit" data-bs-toggle="tooltip" title="Deletes the uploaded file{{ submission.file_types|split:","|pluralize }} permanently.">Cancel submission</button>
         </form>
     {% endif %}
 
diff --git a/ietf/templates/submit/upload_submission.html b/ietf/templates/submit/upload_submission.html
index e76caf406..eae3c8131 100644
--- a/ietf/templates/submit/upload_submission.html
+++ b/ietf/templates/submit/upload_submission.html
@@ -57,7 +57,7 @@
 
                     <div class="form-group">
                         <div class="checkbox">
-                            <label data-toggle="collapse" data-target="#other-formats" aria-expanded="false" aria-controls="other-formats">
+                            <label data-bs-toggle="collapse" data-bs-target="#other-formats" aria-expanded="false" aria-controls="other-formats">
                                 <input id="checkbox" type="checkbox" /> Submit other formats
                             </label>
                         </div>