Skip to content

Commit aa955f0

Browse files
authored
fix: Replace deprecated bootstrap CSS classes with 5.3 ones (ietf-tools#6166)
* fix: Replace deprecated bootstrap CSS classes with 5.3 ones * Fix test * Remove debug print
1 parent 53be2c3 commit aa955f0

19 files changed

Lines changed: 28 additions & 27 deletions

ietf/doc/templatetags/ietf_filters.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,7 @@ def badgeify(blob):
856856
(r"has issues", "warning", "exclamation-lg"),
857857
(r"assigned", "info", "person-plus-fill"),
858858
(r"will not review|overtaken by events|withdrawn", "secondary", "dash-lg"),
859+
(r"no response", "warning", "question-lg"),
859860
]
860861
text = str(blob)
861862

@@ -868,7 +869,7 @@ def badgeify(blob):
868869

869870
return mark_safe(
870871
f"""
871-
<span class="badge rounded-pill text-bg-{color}">
872+
<span class="badge rounded-pill text-bg-{color} text-wrap">
872873
<i class="bi bi-{icon}"></i> {text.capitalize()}
873874
</span>
874875
"""

ietf/group/tests_review.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def test_reviewer_overview(self):
236236
r = self.client.get(url)
237237
self.assertEqual(r.status_code, 200)
238238
# We should see the new document with status of no response
239-
self.assertContains(r, "No Response")
239+
self.assertContains(r, "No response")
240240
self.assertContains(r, review_req1.doc.name)
241241
self.assertContains(r, review_req2.doc.name)
242242
# None of the reviews should be completed this time,

ietf/templates/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}">
3636
{% analytical_body_top %}
3737
<a class="visually-hidden visually-hidden-focusable" href="#content">Skip to main content</a>
38-
<nav class="navbar navbar-expand-lg fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle{% else %}bg-secondary{% endif %}">
38+
<nav class="navbar navbar-expand-lg fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle{% else %}bg-secondary-subtle{% endif %}">
3939
<div class="container-fluid">
4040
<a class="navbar-brand" href="/">
4141
{% include "logo.html" with org="ietf" classes="me-2" nor=True only %}

ietf/templates/doc/document_statement.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<td class="edit"></td>
2222
<td>
2323
<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>
24-
{% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
24+
{% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
2525
{% if replaced_by %}<div>Replaced by {{ replaced_by|urlize_related_source_list:False|join:", " }}</div>{% endif %}
2626
{% if replaces %}<div>Replaces {{ replaces|urlize_related_target_list:False|join:", " }}</div>{% endif %}
2727
</td>

ietf/templates/doc/drafts_in_iesg_process.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1>{{ title }}</h1>
2828
</thead>
2929
{% for state, docs in grouped_docs %}
3030
<tbody>
31-
<tr class="bg-info-subtle">
31+
<tr class="table-info">
3232
<th scope="col" colspan="5">{{ state.name }}</th>
3333
</tr>
3434
</tbody>

ietf/templates/doc/review_assignment_summary.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<a class="text-body-secondary"
2121
href="{% url 'ietf.doc.views_review.review_request' review_assignment.review_request.doc.name review_assignment.review_request.pk %}">
2222
{{ 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>
23-
<span class="badge rounded-pill ms-1 bg-secondary">
23+
<span class="badge rounded-pill text-bg-secondary ms-1">
2424
Incomplete
2525
</span>
2626
{% endif %}

ietf/templates/doc/review_request_summary.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
href="{% url 'ietf.doc.views_review.review_request' review_request.doc.name review_request.pk %}">
44
{{ review_request.team.acronym|upper }} {{ review_request.type.name }} Review due {{ review_request.deadline|date:"Y-m-d" }}
55
</a>
6-
<span class="badge rounded-pill ms-1 bg-secondary">
6+
<span class="badge rounded-pill text-bg-secondary ms-1">
77
Requested
88
</span>
9-
</div>
9+
</div>

ietf/templates/doc/search/search_results.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
{% regroup docs by search_heading as grouped_docs %}
4747
{% for doc_group in grouped_docs %}
4848
<tbody>
49-
<tr class="bg-info-subtle">
49+
<tr class="table-info">
5050
<td></td>
5151
<th scope="col" colspan="{{ meta.headers|length|add:"-1" }}">
5252
{{ doc_group.grouper|plural:doc_group.list }} ({{ doc_group.list|length }} {{"hit"|plural:doc_group.list }})

ietf/templates/doc/status_change/status_changes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h1>RFC status changes</h1>
2727
</thead>
2828
{% for state in state_groups %}
2929
<tbody>
30-
<tr class="bg-info-subtle">
30+
<tr class="table-info">
3131
<th scope="col" colspan="2">{{ state.grouper }}</th>
3232
</tr>
3333
</tbody>

ietf/templates/group/active_adm.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1>Active administrative groups</h1>
1919
{% for grouptype in grouped_groups %}
2020
<tbody>
2121
<tr>
22-
<th scope="col" colspan="2" class="bg-info">
22+
<th scope="col" colspan="2" class="table-info">
2323
Active {% firstof grouptype.grouper.verbose_name grouptype.grouper.name 'Top-level Administration' %}
2424
</th>
2525
</tr>

0 commit comments

Comments
 (0)