And more fixes.

- Legacy-Id: 19902

ietf/meeting/tests_views.py

@@ -5810,7 +5810,7 @@ class MaterialsTests(TestCase):
         self.assertEqual(SlideSubmission.objects.filter(status__slug = 'pending').count(), 0)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, "These slides have already been  rejected")
+        self.assertRegex(r.content.decode(), r"These\s+slides\s+have\s+already\s+been\s+rejected")
 
     def test_approve_proposed_slides(self):
         submission = SlideSubmissionFactory()
@@ -5834,7 +5834,7 @@ class MaterialsTests(TestCase):
         self.assertEqual(session.sessionpresentation_set.first().document.title,'different title')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, "These slides have already been  approved")
+        self.assertRegex(r.content.decode(), r"These\s+slides\s+have\s+already\s+been\s+approved")
 
     def test_approve_proposed_slides_multisession_apply_one(self):
         submission = SlideSubmissionFactory(session__meeting__type_id='ietf')

ietf/templates/401.html

@@ -7,7 +7,7 @@
     <img class="col-2 mb-5"
          src="{% static 'ietf/images/ietflogo.png' %}"
          alt="IETF">
-    <div class='alert alert-warning'>
+    <div class='alert alert-warning my-3'>
         <h2>Authentication Required</h2>
         <hr>
         <p>

ietf/templates/403.html

@@ -7,7 +7,7 @@
     <img class="col-2 mb-5"
          src="{% static 'ietf/images/ietflogo.png' %}"
          alt="IETF">
-    <div class='alert alert-warning'>
+    <div class='alert alert-warning my-3'>
         <h2>Restricted Access</h2>
         <hr>
         <p>

ietf/templates/404.html

@@ -7,7 +7,7 @@
     <img class="col-2 mb-5"
          src="{% static 'ietf/images/ietflogo.png' %}"
          alt="IETF">
-    <div class='alert alert-warning'>
+    <div class='alert alert-warning my-3'>
         <h2>The page you were looking for couldn't be found</h2>
         <hr>
         <p>

ietf/templates/500.html

@@ -7,7 +7,7 @@
     <img class="col-2 mb-5"
          src="{% static 'ietf/images/ietflogo.png' %}"
          alt="IETF">
-    <div class='alert alert-warning'>
+    <div class='alert alert-warning my-3'>
         <h2>Internal Server Error</h2>
         <hr>
         <p>

ietf/templates/community/subscription.html

@@ -46,10 +46,9 @@
             <button type="submit" name="action" value="subscribe" class="btn btn-primary">Subscribe</button>
         </form>
     {% else %}
-        <div class="alert alert-danger">
+        <div class="alert alert-danger my-3">
             You do not have any active email addresses registered with your account. Go to
-            <a href="{% url "ietf.ietfauth.views.profile" %}">your profile and add or activate one</a>
+            <a href="{% url "ietf.ietfauth.views.profile" %}">your profile and add or activate one</a>.
-            .
         </div>
         <a class="btn btn-secondary" href="{{ clist.get_absolute_url }}">Back to list</a>
     {% endif %}

ietf/templates/doc/ballot/clear_ballot.html

@@ -13,7 +13,7 @@
     </h1>
     <form method="post">
         {% csrf_token %}
-        <p class="alert alert-danger">
+        <p class="alert alert-danger my-3">
             <b>Clear the ballot for
                 <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc }}</a>?
             </b>

ietf/templates/doc/ballot/defer_ballot.html

@@ -13,7 +13,7 @@
     </h1>
     <form method="post">
         {% csrf_token %}
-        <p class="alert alert-danger">
+        <p class="alert alert-danger my-3">
             <b>Defer the ballot for
                 <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc }}</a>?
             </b>

ietf/templates/doc/ballot/undefer_ballot.html

@@ -13,7 +13,7 @@
     </h1>
     <form class="undefer mt-3" method="post">
         {% csrf_token %}
-        <p class="alert alert-danger">
+        <p class="alert alert-danger my-3">
             <b>Undefer the ballot for {{ doc }}?</b>
             <br>
             The ballot will then be put on the IESG agenda of <b>{{ telechat_date }}</b>.

ietf/templates/doc/charter/change_state.html

@@ -28,7 +28,7 @@
             {% endif %}
         {% endfor %}
         {% if initial_review %}
-            <p class="alert alert-warning">
+            <p class="alert alert-warning my-3">
                 <b>Warning:</b> Announced initial review time hasn't elapsed yet. It does so at {{ initial_review.expires }}.
             </p>
         {% endif %}

ietf/templates/doc/charter/submit.html

@@ -86,7 +86,7 @@
             </tbody>
         {% endif %}
     </table>
-    <p class="alert alert-info">
+    <p class="alert alert-info my-3">
         The text will be submitted as <b>{{ name }}-{{ next_rev }}</b>.
     </p>
     <form enctype="multipart/form-data" method="post" id="charter-form">

ietf/templates/doc/document_ballot_content.html

@@ -49,22 +49,22 @@
         {% endif %}
         {% if doc.type_id == "draft" or doc.type_id == "conflrev" or doc.type_id == "statchg" %}
             {% if deferred %}
-                <p class="alert alert-danger">
+                <p class="alert alert-danger my-3">
                     Ballot deferred by {{ deferred.by }} on {{ deferred.time|date:"Y-m-d" }}.
                 </p>
             {% endif %}
         {% endif %}
         {% if not ballot_open %}
-            <p class="alert alert-warning">
+            <p class="alert alert-warning my-3">
                 <b>Note:</b> This ballot was opened for revision {{ ballot.rev }} and is now closed.
             </p>
         {% else %}
-            <p class="alert alert-info">
+            <p class="alert alert-info my-3">
                 <b>Summary:</b> {{ summary }}
             </p>
         {% endif %}
         {% if ballot.ballot_type.question %}
-            <p class="alert alert-secondary">
+            <p class="alert alert-secondary my-3">
                 <b>Ballot question:</b> "{{ ballot.ballot_type.question }}"
             </p>
         {% endif %}

ietf/templates/doc/document_bofreq.html

@@ -12,7 +12,7 @@
     {% include "doc/revisions_list.html" %}
     <div id="timeline"></div>
     {% if doc.rev != latest_rev %}
-        <div class="alert alert-warning">The information below is for an older version of this BOF request.</div>
+        <div class="alert alert-warning my-3">The information below is for an older version of this BOF request.</div>
     {% endif %}
     <table class="table table-sm table-borderless">
         <tbody class="meta border-top">

ietf/templates/doc/document_charter.html

@@ -17,7 +17,7 @@
     {% include "doc/revisions_list.html" %}
     <div id="timeline"></div>
     {% if doc.rev|charter_major_rev != latest_rev|charter_major_rev %}
-        <div class="alert alert-warning">
+        <div class="alert alert-warning my-3">
             The information below is for an older
             {% if doc.rev|charter_minor_rev %}
                 proposed
@@ -29,17 +29,17 @@
     {% else %}
         {% if doc.rev != latest_rev %}
             {% if doc.rev|charter_minor_rev %}
-                <div class="alert alert-warning">
+                <div class="alert alert-warning my-3">
                     The information below is for an older version of the current proposed rechartering effort
                 </div>
             {% else %}
-                <div class="alert alert-info">
+                <div class="alert alert-warning my-3">
                     The information below is for the currently approved charter, but newer proposed charter text exists
                 </div>
             {% endif %}
         {% else %}
             {% if doc.rev|charter_minor_rev and doc.rev|charter_major_rev != '00' %}
-                <div class="alert alert-info">
+                <div class="alert alert-info my-3">
                     The information below is for a proposed recharter. The current approved charter is version {{ doc.rev|charter_major_rev }}
                 </div>
             {% endif %}

ietf/templates/doc/document_conflict_review.html

@@ -13,7 +13,7 @@
     {% include "doc/revisions_list.html" %}
     <div id="timeline"></div>
     {% if doc.rev != latest_rev %}
-        <div class="alert alert-warning">The information below is for an old version of the document</div>
+        <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% endif %}
     <table class="table table-sm table-borderless mb-3">
         <tbody class="meta border-top">

ietf/templates/doc/document_draft.html

@@ -28,10 +28,10 @@
     {% include "doc/revisions_list.html" %}
     <div id="timeline"></div>
     {% if doc.rev != latest_rev %}
-        <div class="alert alert-warning">The information below is for an old version of the document.</div>
+        <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% else %}
         {% if doc.get_state_slug == "rfc" and snapshot %}
-            <div class="alert alert-warning">
+            <div class="alert alert-warning my-3">
                 The information below is for an old version of the document that is already published as an RFC.
             </div>
         {% endif %}

ietf/templates/doc/document_material.html

@@ -11,7 +11,7 @@
     {% include "doc/revisions_list.html" %}
     <div id="timeline"></div>
     {% if doc.rev != latest_rev %}
-        <div class="alert alert-warning">The information below is for an old version of the document</div>
+        <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% endif %}
     <table class="table table-sm table-borderless">
         <tbody class="meta border-top">

ietf/templates/doc/document_referenced_by.html

@@ -9,16 +9,16 @@
 {% block content %}
     {% origin %}
     <h1>References to {{ alias_name }}</h1>
-    <p class="mt-3 alert alert-info">
+    <p class="my-3 alert alert-info my-3">
         These dependencies are extracted using heuristics looking for strings with particular prefixes. Notably, this means that references to I-Ds by title only are not reflected here. If it's really important, please inspect the documents' references sections directly.
     </p>
     <p>
         Showing RFCs and active Internet-Drafts, sorted by
-        <a href="{% url 'ietf.doc.views_help.relationship_help' subset='reference' %}">reference type</a>
+        <a href="{% url 'ietf.doc.views_help.relationship_help' subset='reference' %}">reference type</a>,
-        , then document name.
+        then document name.
     </p>
     {% if numdocs %}
-        <div class="alert alert-warning">
+        <div class="alert alert-warning my-3">
             <p>
                 Showing only the first 250 of {{ numdocs }} documents.
             </p>

ietf/templates/doc/document_references.html

@@ -9,7 +9,7 @@
 {% block content %}
     {% origin %}
     <h1>References from {{ doc.canonical_name }}</h1>
-    <p class="mb-3 alert alert-info">
+    <p class="my-3 alert alert-info">
         These dependencies are extracted using heuristics looking for strings with particular prefixes. Notably, this means that references to I-Ds by title only are not reflected here. If it's really important, please inspect the documents' references sections directly.
     </p>
     <p>

ietf/templates/doc/document_review.html

@@ -12,7 +12,7 @@
     {% include "doc/revisions_list.html" %}
     {% include "doc/review/request_info.html" %}
     {% if doc.rev != latest_rev %}
-        <div class="alert alert-warning">The information below is for an old version of the document.</div>
+        <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% endif %}
     <table class="table table-sm table-borderless">
         <tbody class="meta border-top">

ietf/templates/doc/document_status_change.html

@@ -13,7 +13,7 @@
     {% include "doc/revisions_list.html" %}
     <div id="timeline"></div>
     {% if doc.rev != latest_rev %}
-        <div class="alert alert-warning">The information below is for an old version of the document</div>
+        <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% endif %}
     <table class="table table-sm table-borderless">
         <tbody class="meta border-top">

ietf/templates/doc/draft/adopt_draft.html

@@ -14,7 +14,7 @@
     <p class="my-3 alert alert-info">
         You can begin managing the group state of this draft.
     </p>
-    <p class="alert alert-info">
+    <p class="alert alert-info my-3">
         For a WG, the draft enters the IETF stream.
         For an RG, the draft enters the IRTF stream.
     </p>

ietf/templates/doc/draft/request_publication.html

@@ -19,12 +19,12 @@
         .
     </p>
     {% if not doc.intended_std_level %}
-        <p class="alert alert-warning">
+        <p class="alert alert-warning my-3">
             <b>Note:</b> Intended RFC status is not set for the document.
         </p>
     {% endif %}
     {% if doc.stream_id != "ise" and not consensus_filled_in %}
-        <p class="alert alert-warning">
+        <p class="alert alert-warning my-3">
             <b>Note:</b> Consensus status is not set for the document.
         </p>
     {% endif %}

ietf/templates/doc/draft/rfceditor_note_duplicate_error.html

@@ -6,14 +6,13 @@
 {% block content %}
     {% origin %}
     <h1>Duplicate RFC Editor Note</h1>
-    <p class="mt-3 alert alert-danger">
+    <p class="my-3 alert alert-danger">
         Sorry, there appears to be an RFC Editor Note in the ballot writeup and
         another one in the RFC Editor Note.  Please put all of the information for
         the RFC Editor in the RFC Editor Note.
     </p>
     <p>
         The document writeup can be edited
-        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}writeup/">here</a>
+        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}writeup/">here</a>.
-        .
     </p>
 {% endblock %}

ietf/templates/doc/edit_field.html

@@ -11,7 +11,7 @@
         <br>
         <small class="text-muted">{{ doc.canonical_name }}</small>
     </h1>
-    <p class="alert alert-info">
+    <p class="alert alert-info my-3">
         {{ info|safe }}
     </p>
     <form enctype="multipart/form-data" method="post">

ietf/templates/doc/edit_telechat_date.html

@@ -11,11 +11,11 @@
         <br>
         <small class="text-muted">{{ doc.name }} ({{ doc.pages }} page{{ doc.pages|pluralize }})</small>
     </h1>
-    {% for warning in warnings %}<div class="alert alert-warning">{{ warning }}</div>{% endfor %}
+    {% for warning in warnings %}<div class="alert alert-warning my-3">{{ warning }}</div>{% endfor %}
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-        <div id="large_page_count_warning" class="alert alert-warning">
+        <div id="large_page_count_warning" class="alert alert-warning my-3">
             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>
         <button type="submit" class="btn btn-primary">Save</button>

ietf/templates/doc/remove_sessionpresentation.html

@@ -12,7 +12,7 @@
         <small class="text-muted">{{ sp.document.name }}</small>
     </h1>
     {% if sp.session.is_material_submission_cutoff %}
-        <p class="alert alert-warning">
+        <p class="alert alert-warning my-3">
             The deadline for submission corrections has passed. This may affect published proceedings.
         </p>
     {% endif %}

ietf/templates/doc/review/close_request.html

@@ -11,7 +11,7 @@
         <small class="text-muted">{{ review_req.doc.name }}</small>
     </h1>
     {% include "doc/review/request_info.html" %}
-    <p class="alert alert-info">
+    <p class="alert alert-info my-3">
         Do you want to close the review request?
     </p>
     <form method="post">

ietf/templates/doc/review/complete_review.html

@@ -51,7 +51,7 @@
             </tbody>
         </table>
     {% else %}
-        <p class="alert alert-info">
+        <p class="alert alert-info my-3">
             You are submitting an <strong>unsolicited</strong> review for this document for the {{ team }}.
             <strong>This process should only be used for unsolicited reviews.</strong>
             A review request and assignment will be created automatically upon submitting this review.

ietf/templates/doc/review/reject_reviewer_assignment.html

@@ -12,7 +12,7 @@
     </h1>
     {% include "doc/review/request_info.html" %}
     {% if not review_request_past_deadline %}
-        <p class="alert alert-info">
+        <p class="alert alert-danger my-3">
             Do you want to reject this assignment?
         </p>
         <form method="post">
@@ -25,7 +25,7 @@
             <button type="submit" class="btn btn-warning" name="action" value="reject">Reject assignment</button>
         </form>
     {% else %}
-        <p class="alert alert-info">
+        <p class="alert alert-info my-3">
             This review assignment can not be rejected, as the deadline of the review request has already passed.
         </p>
     {% endif %}

ietf/templates/doc/review/withdraw_reviewer_assignment.html

@@ -10,7 +10,7 @@
         <br>
         <small class="text-muted">{{ assignment.review_request.doc.name }}</small>
     </h1>
-    <p class="my-3 alert alert-info">
+    <p class="my-3 alert alert-warning">
         Withdraw review assignment for {% person_link assignment.reviewer.person %}.
     </p>
     <form method="post">

ietf/templates/doc/search/search_results.html

@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
 {% if not docs %}
-    {% if not skip_no_matches_warning %}<div class="alert alert-info">No documents match your query.</div>{% endif %}
+    {% if not skip_no_matches_warning %}<div class="alert alert-info my-3">No documents match your query.</div>{% endif %}
 {% endif %}
 {% if meta.max %}
     <div class="alert alert-warning my-3">

ietf/templates/doc/status_change/edit_relations.html

@@ -15,7 +15,7 @@
     <form class="mt-3" method="post">
         {% csrf_token %}
         {% include "doc/status_change/edit_related_rows.html" %}
-        {% if form.non_field_errors %}<div class="alert alert-danger">{{ form.non_field_errors }}</div>{% endif %}
+        {% if form.non_field_errors %}<div class="alert alert-danger my-3">{{ form.non_field_errors }}</div>{% endif %}
         <button type="submit" class="btn btn-primary">Save</button>
         <a class="btn btn-secondary float-end"
            href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>

ietf/templates/doc/submit_to_iesg.html

@@ -76,7 +76,7 @@
         </tbody>
     </table>
     {% if warn %}
-        <p class="alert alert-warning">
+        <p class="alert alert-warning my-3">
             <i class="bi bi-exclamation-circle"></i>
             indicates the document might not be ready for submission. Please check each instance carefully to see if changes need to be made to the document's state before submitting.
         </p>

ietf/templates/email_failed.html

@@ -6,13 +6,12 @@
 {% block content %}
     {% origin %}
     <h1>E-mail sending failed</h1>
-    <p class="alert alert-warning">
+    <p class="alert alert-warning my-3">
         Sorry, the site needed to send an E-Mail message to complete this
         action, and that attempt failed.  Please reload this page later
         to try again, or, if this condition persists, please send an
         e-mail to
-        <a href="mailto:webmaster@ietf.org">webmaster@ietf.org</a>
+        <a href="mailto:webmaster@ietf.org">webmaster@ietf.org</a>.
-        .
     </p>
     {% if debug %}
         <hr>

ietf/templates/group/change_reviewer_settings.html

@@ -73,7 +73,7 @@
             {% endfor %}
         </table>
     {% else %}
-        <p class="alert alert-info">
+        <p class="alert alert-info my-3">
             No periods found.
         </p>
     {% endif %}

ietf/templates/group/conclude.html

@@ -7,7 +7,7 @@
 {% block content %}
     {% origin %}
     <h1>Request closing of {{ group.acronym }} {{ group.type.name }}</h1>
-    <p class="alert alert-info">
+    <p class="alert alert-info my-3">
         Please provide instructions regarding the disposition of each
         active Internet-Draft (such as to withdraw the draft, move it to
         another group, convert it to an individual submission, and so on),

ietf/templates/group/concluded_groups.html

@@ -9,14 +9,14 @@
 {% block content %}
     {% origin %}
     <h1>Concluded groups</h1>
-    <p class="alert alert-info">
+    <p class="alert alert-info my-3">
         Note that the information on historical groups may be inaccurate.
     </p>
     {% for label, groups in sections.items %}
         <h2 class="mt-5" id="{{ label }}">{{ label }}</h2>
         {% if label == "WGs" %}
         {% elif label == "RGs" %}
-            <p class="alert alert-info">
+            <p class="alert alert-info my-3">
                 The information below is incomplete and misses a few older RGs.
                 Please check the
                 <a href="https://irtf.org/groups">IRTF site</a>

ietf/templates/group/edit.html

@@ -27,12 +27,11 @@
         {% endif %}
     </h1>
     {% if not request.user.is_authenticated %}
-        <p class="alert alert-info">
+        <p class="alert alert-info my-3">
             Note that persons with authorization to manage information, e.g.,
             chairs and delegates, need a datatracker account to actually do
             so. New accounts can be
-            <a href="{% url "ietf.ietfauth.views.create_account" %}">created here</a>
+            <a href="{% url "ietf.ietfauth.views.create_account" %}">created here</a>.
-            .
         </p>
     {% endif %}
     <form class="my-3 form-horizontal" method="post">

ietf/templates/group/edit_milestones.html

@@ -54,7 +54,7 @@
         </p>
     {% endif %}
     {% if form_errors %}
-        <p class="alert alert-danger">
+        <p class="alert alert-danger my-3">
             There were errors, see below.
         </p>
     {% endif %}

ietf/templates/group/group_about_rendertest.html

@@ -12,7 +12,7 @@
     </div>
     <div class="row border-bottom text-center">
         <div class="col-md-6 border-end">&nbsp;</div>
-        <div class="col-md-6 "><input type="checkbox" name="widthconstraint"> Constrain width</input></div>
+        <div class="col-md-6 "><input type="checkbox" class="form-check-input" name="widthconstraint"> Constrain width</input></div>
     </div>
     <div class="row">
         <div class="col-md-6 border-end">{{charter|linebreaks}}</div>
@@ -28,7 +28,7 @@
             <div class="col-md-6 rightpanel">
                 <div class="h2 text-center bg-info">Markdown rendering</div>
                 <div class="border-bottom text-center">
-                    <input type="checkbox" name="widthconstraint">
+                    <input type="checkbox" class="form-check-input" name="widthconstraint">
                     Constrain width
                 </input>
             </div>

ietf/templates/group/manage_review_requests.html

@@ -16,7 +16,7 @@
         <small class="text-muted">{{ group.acronym }}</small>
     </h1>
     {% if newly_closed > 0 or newly_opened > 0 or newly_assigned > 0 %}
-        <p class="my-3 alert alert-danger">
+        <p class="my-3 alert alert-danger my-3">
             Changes since last refresh:
             {% if newly_closed %}{{ newly_closed }} request{{ newly_closed|pluralize }} closed.{% endif %}
             {% if newly_opened %}{{ newly_opened }} request{{ newly_opened|pluralize }} opened.{% endif %}
@@ -153,7 +153,7 @@
                                 {{ r.doc.abstract|linkify|urlize_ietf_docs }}
                             </div>
                             {% if r.form.non_field_errors %}
-                                <div class="alert alert-danger">
+                                <div class="alert alert-danger my-3">
                                     {% for e in r.form.non_field_errors %}{{ e }}{% endfor %}
                                 </div>
                             {% endif %}
@@ -192,7 +192,7 @@
                                     Cancel
                                 </button>
                                 {% if r.form.reviewer.errors or r.form.add_skip.errors %}
-                                    <div class="alert alert-danger">
+                                    <div class="alert alert-danger my-3">
                                         {% for e in r.form.reviewer.errors %}{{ e }}{% endfor %}
                                         {% for e in r.form.add_skip.errors %}{{ e }}{% endfor %}
                                     </div>

ietf/templates/group/reviewer_overview.html

@@ -24,13 +24,13 @@
         rotation with the next reviewer in the rotation at the top. Rows with darker backgrounds have the following meaning:
     </p>
     <div class="reviewer-overview">
-        <p class="alert alert-secondary">
+        <p class="alert alert-secondary my-3">
             Has already been assigned a document within the given interval.
         </p>
-        <p class="alert alert-warning">
+        <p class="alert alert-warning my-3">
             Will be skipped the next time at the top of rotation.
         </p>
-        <p class="alert alert-danger">
+        <p class="alert alert-danger my-3">
             Is not available to do reviews at this time.
         </p>
     </div>

ietf/templates/iesg/agenda.html

@@ -24,21 +24,21 @@
         {% if num == "1.4" %}<pre>{{ section.text }}</pre>{% endif %}
         {% if num >= "2" and num < "5" %}
             {% if num == "2" %}
-                <p class="alert alert-info">
+                <p class="alert alert-info my-3">
                     Reviews should focus on these questions: "Is this document a
                     reasonable basis on which to build the salient part of the Internet
                     infrastructure? If not, what changes would make it so?"
                 </p>
             {% endif %}
             {% if num == "3.1" or num == "3.2" %}
-                <p class="alert alert-info">
+                <p class="alert alert-info my-3">
                     Reviews should focus on these questions: "Is this document a
                     reasonable contribution to the area of Internet engineering
                     which it covers? If not, what changes would make it so?"
                 </p>
             {% endif %}
             {% if num == "3.3" %}
-                <p class="alert alert-info">
+                <p class="alert alert-info my-3">
                     Reviews should focus on these questions: "Are the proposed
                     changes to document status appropriate? Have all requirements
                     for such a change been met? If not, what changes to the proposal
@@ -46,7 +46,7 @@
                 </p>
             {% endif %}
             {% if num == "3.4" %}
-                <p class="alert alert-info">
+                <p class="alert alert-info my-3">
                     The IESG will use RFC 5742 responses:
                 </p>
                 <ol>

ietf/templates/ipr/details_edit.html

@@ -77,7 +77,7 @@
     <form class="ipr-form form-horizontal show-required" method="post">
         {% csrf_token %}
         {% if form.errors %}
-            <div class="alert alert-danger">
+            <div class="alert alert-danger my-3">
                 <p>
                     There were errors in the submitted form -- see below.  Please correct these and resubmit.
                 </p>
@@ -137,7 +137,7 @@
                     <div class="col-md-6">
                         {{ draft_form.id }}
                         {{ draft_form.document }}
-                        {% if draft_form.document.errors %}<div class="alert alert-danger">{{ draft_form.document.errors }}</div>{% endif %}
+                        {% if draft_form.document.errors %}<div class="alert alert-danger my-3">{{ draft_form.document.errors }}</div>{% endif %}
                     </div>
                     <div class="col-md-2">
                         {% bootstrap_field draft_form.revisions class="form-control" placeholder="Revisions, e.g., 04-07" show_help=False show_label=False %}
@@ -222,7 +222,7 @@
             {% if form.submitter_claims_all_terms_disclosed %}
                 {% bootstrap_field form.submitter_claims_all_terms_disclosed layout='horizontal' %}
                 {% if form.instance|to_class_name == "GenericIprDisclosure" %}
-                    <p class="alert alert-info">
+                    <p class="alert alert-info my-3">
                         <strong>Note</strong>: According to
                         <a href="https://www.ietf.org/rfc/rfc8179.txt?">
                             RFC 8179

ietf/templates/ipr/details_view.html

@@ -53,14 +53,14 @@
     </div>
     {% if not ipr.compliant %}
         {% if in_force_ipr_rfc == 'RFC 8179' %}
-            <p class="alert alert-danger">
+            <p class="alert alert-danger my-3">
                 This IPR disclosure does not comply with the formal requirements of Section 5,
                 "IPR Disclosures," of
                 <a href="https://www.rfc-editor.org/rfc/rfc8179.txt">RFC 8179</a>
                 , "Intellectual Property Rights in IETF Technology."
             </p>
         {% else %}
-            <p class="alert alert-danger">
+            <p class="alert alert-danger my-3">
                 This IPR disclosure does not comply with the formal requirements of Section 6,
                 "IPR Disclosures," of
                 <a href="https://www.rfc-editor.org/rfc/rfc3979.txt">RFC 3979</a>
@@ -143,7 +143,7 @@
         {% endif %}
     {% endif %}
     {% if user|has_role:"Secretariat" and ipr.update_notified_date %}
-        <div class="alert alert-info">
+        <div class="alert alert-info my-3">
             This update was notified to the submitter of the IPR that is being updated on: {{ ipr.update_notified_date|date:"Y-m-d" }}
         </div>
     {% endif %}

ietf/templates/ipr/removed.html

@@ -6,7 +6,7 @@
 {% block content %}
     {% origin %}
     <h1>{{ ipr.title }}</h1>
-    <p class="alert alert-info">
+    <p class="alert alert-info my-3">
         This IPR disclosure was removed at the submitter's request.
     </p>
 {% endblock %}

ietf/templates/ipr/search_doctitle_result.html

@@ -10,7 +10,7 @@
 {% block search_header %}Search result on "{{ q }}"{% endblock %}
 {% block search_result %}
     {% if not docs %}
-        <p class="alert alert-info my-3">
+        <p class="alert alert-success my-3">
             No IPR disclosures related to a document with the words "{{ q }}"" in the title have been submitted.
         </p>
     {% else %}

ietf/templates/ipr/search_error.html

@@ -6,7 +6,7 @@
 {% block content %}
     {% origin %}
     <h1>IPR search result error</h1>
-    <div class="alert alert-danger">
+    <div class="alert alert-danger my-3">
         <p>
             Your request was not processed due to the following error(s):
         </p>

ietf/templates/ipr/search_form.html

@@ -83,7 +83,7 @@
         </div>
     </div>
 </form>
-<p class="alert alert-info">
+<p class="alert alert-info my-3">
     The material posted as IPR disclosures should be viewed as originating
     from the source of that information, and any issue or question related
     to the material should be directed to the source rather than the

ietf/templates/ipr/search_result.html

@@ -17,11 +17,11 @@
     </h2>
     {% block search_result %}
         {% if not iprs %}
-            <p class="alert alert-info">
+            <p class="alert alert-success my-3">
                 {% block search_failed %}No IPR disclosures have been submitted by "{{ q }}".{% endblock %}
             </p>
         {% else %}
-            <p class="alert alert-info">
+            <p class="alert alert-info my-3">
                 Total number of IPR disclosures found: <b>{{ iprs|length }}</b>.
             </p>
             <table class="table table-sm table-striped tablesorter">

ietf/templates/liaisons/edit.html

@@ -26,10 +26,8 @@
         {% endif %}
     </h1>
     {% if form.errors %}
-        <div class="alert alert-danger">
+        <div class="alert alert-danger my-3">
-            <p>
                 There were errors in the submitted form -- see below. Please correct these and resubmit.
-            </p>
         </div>
     {% endif %}
     {% bootstrap_form_errors form %}

ietf/templates/liaisons/liaison_base.html

@@ -33,7 +33,7 @@
     {% endif %}
     {% block group_content %}
         {% if search_conducted and not liaisons %}
-            <div class="alert alert-info">No statements match your query.</div>
+            <div class="alert alert-info my-3">No statements match your query.</div>
         {% else %}
             {% include "liaisons/liaison_table.html" %}
         {% endif %}

ietf/templates/meeting/agenda.html

@@ -35,12 +35,12 @@
         {% endif %}
     </h2>
     {% if is_current_meeting %}
-        <p class="alert alert-info">
+        <p class="alert alert-info my-3">
             <b>Note:</b> IETF agendas are subject to change, up to and during a meeting.
         </p>
     {% endif %}
     {% if schedule.meeting.agenda_info_note %}
-        <p class="alert alert-info">
+        <p class="alert alert-info my-3">
             {{ schedule.meeting.agenda_info_note|removetags:"h1"|safe }}
         </p>
     {% endif %}

ietf/templates/nomcom/edit_template.html

@@ -56,7 +56,7 @@
     </dl>
     <form id="templateform" method="post" class="my-3">
         {% if form.errors %}
-            <p class="alert alert-danger">
+            <p class="alert alert-danger my-3">
                 There were errors, see below.
             </p>
         {% endif %}

ietf/templates/nomcom/feedback.html

@@ -7,7 +7,7 @@
 {% block subtitle %}- Feedback{% endblock %}
 {% block nomcom_content %}
     {% origin %}
-    <p id="instructions" class="alert alert-info">
+    <p id="instructions" class="alert alert-info my-3">
         {% if nomcom.group.state_id == 'conclude' %}
             Feedback to this NomCom is closed.
         {% else %}

ietf/templates/nomcom/view_feedback_pending.html

@@ -178,7 +178,7 @@
         {% endif %}
     </form>
 {% else %}
-    <p class="alert alert-info my-3">
+    <p class="alert alert-success my-3">
         There is no pending feedback.
     </p>
 {% endif %}

ietf/templates/nomcom/volunteers_not_accepted.html

@@ -5,7 +5,7 @@
 {% block title %}Not Accepting Volunteers{% endblock %}
 {% block content %}
     {% origin %}
-    <p class="alert alert-info my-3">
+    <p class="alert alert-warning my-3">
         NomCom is not accepting volunteers at this time.
     </p>
 {% endblock %}

ietf/templates/oidc_provider/error.html

@@ -7,7 +7,7 @@
     <img class="col-2 mb-5"
          src="{% static 'ietf/images/ietflogo.png' %}"
          alt="IETF">
-    <div class='alert alert-warning'>
+    <div class='alert alert-warning my-3'>
         <h2>{{ error }}</h2>
         <hr>
         <p class="mb-0">

ietf/templates/registration/change_password.html

@@ -13,7 +13,7 @@
 {% block content %}
     {% origin %}
     {% if success %}
-        <p class="alert alert-info my-3">
+        <p class="alert alert-success my-3">
             Your password was successfully changed.
         </p>
         {% if not user.is_authenticated %}

ietf/templates/registration/create.html

@@ -8,7 +8,7 @@
     {% origin %}
     {% if to_email %}
         <h1>Account request received.</h1>
-        <div class="alert alert-info my-3">
+        <div class="alert alert-success my-3">
             Your account creation request has been successfully received.
             <hr>
             We have sent an email to {{ to_email|linkify }} with instructions on how to complete the process.
@@ -17,7 +17,7 @@
         <h1>Account creation</h1>
         <div class="row">
             <div class="col-md-6">
-                <div class="alert alert-info">
+                <div class="alert alert-info my-3">
                     <b>If you already have an account and want to use a new email address</b>, please go to your account profile page and
                     <br>
                     <a class="btn btn-primary mt-3"
@@ -25,7 +25,7 @@
                 </div>
             </div>
             <div class="col-md-6">
-                <div class="alert alert-info">
+                <div class="alert alert-info my-3">
                     <b>If you already have an account but forgot your password</b>, please simply
                     <br>
                     <a class="btn btn-warning mt-3"

ietf/templates/registration/edit_profile.html

@@ -69,7 +69,7 @@
                 {% endif %}
             </div>
         </div>
-        <div class="offset-sm-2 alert alert-info ">
+        <div class="offset-sm-2 alert alert-info my-3">
             {% if volunteer_status == 'volunteered' %}
                 <p class="mb-0">
                     <b id="volunteered">You have volunteered for the {{ nomcom.group.name }}.</b> To modify your volunteer status, contact the NomCom chair.

ietf/templates/release/about.html

@@ -116,19 +116,19 @@
     <h2>
         Version 5.0.0: Shim Removal
     </h2>
-    <div class="alert alert-info">
+    <div class="alert alert-info my-3">
         To be written.
     </div>
     <h2>
         Version 4.00: New Database Schema
     </h2>
-    <div class="alert alert-info">
+    <div class="alert alert-info my-3">
         To be written.
     </div>
     <h2>
         Version 3.00: Django Port of the IESG Datatracker Pages
     </h2>
-    <div class="alert alert-info">
+    <div class="alert alert-info my-3">
         To be written.
     </div>
     <h2>

ietf/templates/stats/document_stats.html

@@ -70,7 +70,7 @@
             {% endfor %}
         </div>
     </div>
-    <div class="alert alert-info my-5">
+    <div class="alert alert-info my-3">
         <b>Please Note:</b> The author information in the datatracker about RFCs
         with numbers lower than about 1300 and drafts from before 2001 is
         unreliable and in many cases absent.  For this reason, statistics on these

ietf/templates/stats/document_stats_author_country.html

@@ -89,7 +89,7 @@
         <a href="{{ hide_aliases_url }}" class="btn btn-primary">Hide generated aliases</a>
     </p>
     {% if request.user.is_staff %}
-        <p class="alert alert-info">
+        <p class="alert alert-info my-3">
             Note: since you're an admin, some extra links are visible. You
             can either correct a document author entry directly in case the
             information is obviously missing or add an alias if an unknown
@@ -129,4 +129,4 @@
     <p>
         <a href="{{ show_aliases_url }}" class="btn btn-primary">Show generated aliases</a>
     </p>
-{% endif %}
+{% endif %}

ietf/templates/submit/confirm_submission.html

@@ -8,7 +8,7 @@
     <h2>Confirm submission of {{ submission.name }}</h2>
     {% if submission.state_id != "auth" and submission.state_id != "aut-appr" %}
         {% if submission.state_id == "posted" %}
-            <p class="alert alert-info my-3">
+            <p class="alert alert-warning my-3">
                 The submission has already been posted. See the
                 <a href="{% url "ietf.doc.views_doc.document_main" name=submission.name %}">draft here</a>.
             </p>

ietf/templates/utf8_4byte_failed.html

@@ -6,13 +6,12 @@
 {% block content %}
     {% origin %}
     <h1>Unicode outside the Basic Multilingual Plane</h1>
-    <p class="alert alert-warning">
+    <p class="alert alert-warning my-3">
         You submitted data containing unicode characters outside the Basic
         Multilingual Plane.  Such character cannot be stored in the database at
         this time.  If this causes inconvenience, please send an e-mail with
         details to
-        <a href="mailto:webmaster@ietf.org">webmaster@ietf.org</a>
+        <a href="mailto:webmaster@ietf.org">webmaster@ietf.org</a>,
-        , in
+        in order for us to understand the issue.
-        order for us to understand the issue.
     </p>
 {% endblock %}

ietf/utils/bootstrap.py

@@ -9,5 +9,5 @@ class SeparateErrorsFromHelpTextFieldRenderer(django_bootstrap5.renderers.FieldR
         if self.field_help:
             html += '<div class="form-text">{}</div>'.format(self.field_help)
         for e in self.field_errors:
-            html += '<div class="alert alert-danger">{}</div>'.format(e)
+            html += '<div class="alert alert-danger my-3">{}</div>'.format(e)
         return html