From 01e71a3400262d825eb7fcdaa59426664c6b75eb Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Fri, 18 Aug 2023 09:54:10 +0300
Subject: [PATCH 1/3] fix: Replace deprecated bootstrap CSS classes with 5.3
 ones

---
 ietf/doc/templatetags/ietf_filters.py                |  3 ++-
 ietf/templates/base.html                             |  2 +-
 ietf/templates/doc/document_statement.html           |  2 +-
 ietf/templates/doc/drafts_in_iesg_process.html       |  2 +-
 ietf/templates/doc/review_assignment_summary.html    |  2 +-
 ietf/templates/doc/review_request_summary.html       |  4 ++--
 ietf/templates/doc/search/search_results.html        |  2 +-
 ietf/templates/doc/status_change/status_changes.html |  2 +-
 ietf/templates/group/active_adm.html                 |  2 +-
 ietf/templates/group/active_iabgroups.html           |  2 +-
 ietf/templates/group/active_rfced.html               |  2 +-
 ietf/templates/group/review_requests.html            |  8 ++++----
 ietf/templates/group/reviewer_overview.html          |  2 +-
 ietf/templates/ipr/search_doc_result.html            |  2 +-
 ietf/templates/ipr/search_doctitle_result.html       |  2 +-
 ietf/templates/ipr/search_result.html                |  2 +-
 ietf/templates/ipr/search_wg_result.html             |  2 +-
 ietf/templates/submit/tool_instructions.html         | 10 +++++-----
 18 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index 46cab63c96..9b4700bfb1 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -856,6 +856,7 @@ def badgeify(blob):
         (r"has issues", "warning", "exclamation-lg"),
         (r"assigned", "info", "person-plus-fill"),
         (r"will not review|overtaken by events|withdrawn", "secondary", "dash-lg"),
+        (r"no response", "warning", "question-lg"),
     ]
     text = str(blob)
 
@@ -868,7 +869,7 @@ def badgeify(blob):
 
             return mark_safe(
                 f"""
-                <span class="badge rounded-pill text-bg-{color}">
+                <span class="badge rounded-pill text-bg-{color} text-wrap">
                     <i class="bi bi-{icon}"></i> {text.capitalize()}
                 </span>
                 """
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index 9e07bad00d..1ccaf482dc 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -35,7 +35,7 @@
           data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}">
         {% analytical_body_top %}
         <a class="visually-hidden visually-hidden-focusable" href="#content">Skip to main content</a>
-        <nav class="navbar navbar-expand-lg fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle{% else %}bg-secondary{% endif %}">
+        <nav class="navbar navbar-expand-lg fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle{% else %}bg-secondary-subtle{% endif %}">
             <div class="container-fluid">
                 <a class="navbar-brand" href="/">
                     {% include "logo.html" with org="ietf" classes="me-2" nor=True only %}
diff --git a/ietf/templates/doc/document_statement.html b/ietf/templates/doc/document_statement.html
index 7e6d5b9478..1d743b0673 100644
--- a/ietf/templates/doc/document_statement.html
+++ b/ietf/templates/doc/document_statement.html
@@ -21,7 +21,7 @@
                 <td class="edit"></td>
                 <td>
                     <span id="statement-type">{% if doc.get_state.slug != "active" %}{{doc.get_state.name}} {% endif %}{% if doc.group %}{{doc.group.acronym|upper}} {%endif%}Statement</span>
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                     {% if replaced_by %}<div>Replaced by {{ replaced_by|urlize_related_source_list:False|join:", " }}</div>{% endif %}
                     {% if replaces %}<div>Replaces {{ replaces|urlize_related_target_list:False|join:", " }}</div>{% endif %}
                 </td>
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
index 7c9707dcb6..f128e528a5 100644
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ b/ietf/templates/doc/drafts_in_iesg_process.html
@@ -28,7 +28,7 @@ <h1>{{ title }}</h1>
         </thead>
         {% for state, docs in grouped_docs %}
             <tbody>
-                <tr class="bg-info-subtle">
+                <tr class="table-info">
                     <th scope="col" colspan="5">{{ state.name }}</th>
                 </tr>
             </tbody>
diff --git a/ietf/templates/doc/review_assignment_summary.html b/ietf/templates/doc/review_assignment_summary.html
index af748a4e91..6bb42ea074 100644
--- a/ietf/templates/doc/review_assignment_summary.html
+++ b/ietf/templates/doc/review_assignment_summary.html
@@ -20,7 +20,7 @@
         <a class="text-body-secondary"
            href="{% url 'ietf.doc.views_review.review_request' review_assignment.review_request.doc.name review_assignment.review_request.pk %}">
             {{ review_assignment.review_request.team.acronym|upper }} {{ review_assignment.review_request.type.name }} Review due {{ review_assignment.review_request.deadline|date:"Y-m-d" }}</a>
-        <span class="badge rounded-pill ms-1 bg-secondary">
+        <span class="badge rounded-pill text-bg-secondary ms-1">
             Incomplete
         </span>
     {% endif %}
diff --git a/ietf/templates/doc/review_request_summary.html b/ietf/templates/doc/review_request_summary.html
index efeb4a030e..af4f2d5f7b 100644
--- a/ietf/templates/doc/review_request_summary.html
+++ b/ietf/templates/doc/review_request_summary.html
@@ -3,7 +3,7 @@
       href="{% url 'ietf.doc.views_review.review_request' review_request.doc.name review_request.pk %}">
       {{ review_request.team.acronym|upper }} {{ review_request.type.name }} Review due {{ review_request.deadline|date:"Y-m-d" }}
       </a>
-   <span class="badge rounded-pill ms-1 bg-secondary">
+   <span class="badge rounded-pill text-bg-secondary ms-1">
       Requested
    </span>
-</div>
+</div>
\ No newline at end of file
diff --git a/ietf/templates/doc/search/search_results.html b/ietf/templates/doc/search/search_results.html
index 55cc9b142e..7a1e149a58 100644
--- a/ietf/templates/doc/search/search_results.html
+++ b/ietf/templates/doc/search/search_results.html
@@ -46,7 +46,7 @@
 {% regroup docs by search_heading as grouped_docs %}
 {% for doc_group in grouped_docs %}
     <tbody>
-        <tr class="bg-info-subtle">
+        <tr class="table-info">
             <td></td>
             <th scope="col" colspan="{{ meta.headers|length|add:"-1" }}">
             {{ doc_group.grouper|plural:doc_group.list }} ({{ doc_group.list|length }} {{"hit"|plural:doc_group.list }})
diff --git a/ietf/templates/doc/status_change/status_changes.html b/ietf/templates/doc/status_change/status_changes.html
index 41dda8c53e..bdb6c7a50b 100644
--- a/ietf/templates/doc/status_change/status_changes.html
+++ b/ietf/templates/doc/status_change/status_changes.html
@@ -27,7 +27,7 @@ <h1>RFC status changes</h1>
         </thead>
         {% for state in state_groups %}
             <tbody>
-                <tr class="bg-info-subtle">
+                <tr class="table-info">
                     <th scope="col" colspan="2">{{ state.grouper }}</th>
                 </tr>
             </tbody>
diff --git a/ietf/templates/group/active_adm.html b/ietf/templates/group/active_adm.html
index 5fe2363267..e600059785 100644
--- a/ietf/templates/group/active_adm.html
+++ b/ietf/templates/group/active_adm.html
@@ -19,7 +19,7 @@ <h1>Active administrative groups</h1>
         {% for grouptype in grouped_groups %}
             <tbody>
                 <tr>
-                    <th scope="col" colspan="2" class="bg-info">
+                    <th scope="col" colspan="2" class="table-info">
                         Active {% firstof grouptype.grouper.verbose_name grouptype.grouper.name 'Top-level Administration' %}
                     </th>
                 </tr>
diff --git a/ietf/templates/group/active_iabgroups.html b/ietf/templates/group/active_iabgroups.html
index 0ad667b6bf..cd8e3cfd64 100644
--- a/ietf/templates/group/active_iabgroups.html
+++ b/ietf/templates/group/active_iabgroups.html
@@ -20,7 +20,7 @@ <h1>Active IAB groups</h1>
     {% regroup iabgroups by type as grouped_groups %}
     {% for grouptype in grouped_groups %}
         <tbody>
-        <tr class="bg-info-subtle"><th scope="col" colspan="3">
+        <tr class="table-info"><th scope="col" colspan="3">
             {% firstof grouptype.grouper.verbose_name grouptype.grouper.name %}{{ grouptype.list|pluralize }}
         </th></tr>
         </tbody>
diff --git a/ietf/templates/group/active_rfced.html b/ietf/templates/group/active_rfced.html
index f7fd4d2aee..78dacfa4c6 100644
--- a/ietf/templates/group/active_rfced.html
+++ b/ietf/templates/group/active_rfced.html
@@ -19,7 +19,7 @@ <h1>Active RFC Editor Groups</h1>
         {% for grouptype in grouped_groups %}
             <tbody>
                 <tr>
-                    <th scope="col" colspan="2" class="bg-info">
+                    <th scope="col" colspan="2" class="table-info">
                         Active {% firstof grouptype.grouper.verbose_name grouptype.grouper.name 'Top-level Organization' %} Groups
                     </th>
                 </tr>
diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html
index 5aea5b3902..61b93de2b6 100644
--- a/ietf/templates/group/review_requests.html
+++ b/ietf/templates/group/review_requests.html
@@ -29,7 +29,7 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
             </tr>
         </thead>
             <tbody>
-                <tr class="bg-info-subtle" id="unassigned-review-requests">
+                <tr class="table-info" id="unassigned-review-requests">
                     <th scope="col" colspan="6">Unassigned review requests</th>
                 </tr>
             </tbody>
@@ -79,7 +79,7 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
                     </tr>
                 </thead>
                 <tbody>
-                    <tr class="bg-info-subtle" id="open_review_assignments">
+                    <tr class="table-info" id="open_review_assignments">
                         <th scope="col" colspan="7">Open review requests</th>
                     </tr>
                 </tbody>
@@ -147,7 +147,7 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
                 </tr>
             </thead>
                 <tbody>
-                    <tr class="bg-info-subtle">
+                    <tr class="table-info">
                         <th scope="col" colspan="6">
                             Closed review requests
                         </th>
@@ -211,7 +211,7 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
                     </tr>
                 </thead>
                 <tbody>
-                    <tr class="bg-info-subtle">
+                    <tr class="table-info">
                         <th scope="col" colspan="8">
                             Closed review assignments
                         </th>
diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html
index b4b1b6e3d7..75bd15f1d3 100644
--- a/ietf/templates/group/reviewer_overview.html
+++ b/ietf/templates/group/reviewer_overview.html
@@ -98,7 +98,7 @@ <h2 class="mt-3">Reviewers</h2>
                                             <a href="{% url 'ietf.doc.views_review.review_request' name=doc_name request_id=req_pk %}">{{ deadline|date|split:"-"|join:"-<wbr>" }}</a>
                                         </div>
                                         <div class="col-md-2 me-1">
-                                            <span class="badge rounded-pill bg-{% if state.slug == 'completed' or state.slug == 'part-completed' %}success{% elif state.slug == 'no-response' %}danger{% elif state.slug == 'overtaken' %}warning{% elif state.slug == 'requested' or state.slug == 'accepted' %}primary{% else %}secondary{% endif %} text-wrap">{{ state.name }}</span>
+                                            {{ state.name|badgeify }}
                                         </div>
                                         <div class="col-md-1 me-1 text-end d-none d-lg-block">
                                             {% if assignment_to_closure_days != None %}
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index ff16524739..3745995995 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -57,7 +57,7 @@
         {% for doc in docs %}
             <tbody>
                 <tr>
-                    <th scope="col" class="bg-info" colspan="3">
+                    <th scope="col" class="table-info" colspan="3">
                         Results for {{ doc.name|prettystdname|urlize_ietf_docs }} ("{{ doc.document.title }}"){% if not forloop.first %}{% if doc.related %}, which was {{ doc.relation|lower }} {{ doc.related.source|prettystdname|urlize_ietf_docs  }} ("{{ doc.related.source.title }}"){% endif %}{% endif %}
                     </th>
                 </tr>
diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html
index 7adbc9e9d5..b7a8a8b31e 100644
--- a/ietf/templates/ipr/search_doctitle_result.html
+++ b/ietf/templates/ipr/search_doctitle_result.html
@@ -27,7 +27,7 @@
             {% for alias in docs %}
                 <tbody>
                     <tr>
-                        <th scope="col" class="bg-info" colspan="3">
+                        <th scope="col" class="table-info" colspan="3">
                             IPR that is related to {{ alias.name|prettystdname:""|urlize_ietf_docs }} ("{{ alias.document.title }}")
                             {% if alias.related %}
                                 that was {{ alias.relation|lower }} {{ alias.related.source.name|prettystdname:""|urlize_ietf_docs  }} ("{{ alias.related.source.title }}")
diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html
index 450ede9513..fc93ec92a4 100644
--- a/ietf/templates/ipr/search_result.html
+++ b/ietf/templates/ipr/search_result.html
@@ -43,7 +43,7 @@ <h2 class="mt-5">
                             {% endifchanged %}
                         {% endif %}
                         <tbody>
-                            <tr class="bg-info-subtle">
+                            <tr class="table-info">
                                 <th scope="col" colspan="3">
                                     {% block intro_prefix %}IPR that was submitted by "{{ q }}" and{% endblock %}
                                     {% block related %}
diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html
index 6912e88138..ae477a2699 100644
--- a/ietf/templates/ipr/search_wg_result.html
+++ b/ietf/templates/ipr/search_wg_result.html
@@ -22,7 +22,7 @@
             </thead>
             {% for alias in docs %}
                 <tbody>
-                    <tr class="bg-info-subtle">
+                    <tr class="table-info">
                         <th scope="col" colspan="3">
                             IPR related to {{ alias.name|prettystdname|urlize_ietf_docs }} ("{{ alias.document.title }}")
                             {% if alias.related %}
diff --git a/ietf/templates/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html
index 166a667d35..08265f5297 100644
--- a/ietf/templates/submit/tool_instructions.html
+++ b/ietf/templates/submit/tool_instructions.html
@@ -51,7 +51,7 @@ <h3 class="mt-4">Upload screen</h3>
     </p>
     <table class="table table-sm table-striped">
         <tbody>
-            <tr class="bg-info-subtle">
+            <tr class="table-info">
                 <th scope="colgroup" colspan="2">Form buttons and resulting actions:</th>
             </tr>
         </tbody>
@@ -85,7 +85,7 @@ <h3 class="mt-4">Validation screen</h3>
     </p>
     <table class="table table-sm table-striped">
         <tbody>
-            <tr class="bg-info-subtle">
+            <tr class="table-info">
                 <th scope="colgroup" colspan="2">Form buttons and resulting actions:</th>
             </tr>
         </tbody>
@@ -104,7 +104,7 @@ <h3 class="mt-4">Validation screen</h3>
             </tr>
         </tbody>
         <tbody>
-            <tr class="bg-info-subtle">
+            <tr class="table-info">
                 <th scope="colgroup" colspan="2">
                     When no metadata error is detected:
                 </th>
@@ -145,7 +145,7 @@ <h3 class="mt-4">
     </p>
     <table class="table table-sm table-striped">
         <tbody>
-            <tr class="bg-info-subtle">
+            <tr class="table-info">
                 <th scope="colgroup" colspan="2">
                     Form buttons and resulting actions:
                 </th>
@@ -186,7 +186,7 @@ <h3 class="mt-4">
     </p>
     <table class="table table-sm table-striped">
         <tbody>
-            <tr class="bg-info-subtle">
+            <tr class="table-info">
                 <th scope="colgroup" colspan="2">
                     Form buttons and resulting actions:
                 </th>

From bf742bd803560fe107af1e71f4d37ef491bd195b Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Fri, 18 Aug 2023 13:22:52 +0300
Subject: [PATCH 2/3] Fix test

---
 ietf/group/tests_review.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index af374f6765..e3a0a2c7ce 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -236,7 +236,8 @@ def test_reviewer_overview(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # We should see the new document with status of no response
-        self.assertContains(r, "No Response")
+        print(r.content)
+        self.assertContains(r, "No response")
         self.assertContains(r, review_req1.doc.name)
         self.assertContains(r, review_req2.doc.name)
         # None of the reviews should be completed this time,

From 0cb44e9e2713ee954e6c196e6600ce689be08d34 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Fri, 18 Aug 2023 16:04:14 +0300
Subject: [PATCH 3/3] Remove debug print

---
 ietf/group/tests_review.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index e3a0a2c7ce..60c11689bc 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -236,7 +236,6 @@ def test_reviewer_overview(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # We should see the new document with status of no response
-        print(r.content)
         self.assertContains(r, "No response")
         self.assertContains(r, review_req1.doc.name)
         self.assertContains(r, review_req2.doc.name)