And more fixes.

 - Legacy-Id: 19902

Author: larseggert

ietf/meeting/tests_views.py

@@ -5810,7 +5810,7 @@ def test_disapprove_proposed_slides(self):
         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 @@ def test_approve_proposed_slides(self):
         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 @@ <h2>Add new subscription</h2>
             <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>
     </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>
     </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>
     </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 @@ <h1>{{ title }}</h1>
             {% 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 %}