Merge branch 'master' into change-website-logos-to-trademarked

cfl_common/setup.py

@@ -17,7 +17,7 @@
     version=version,
     include_package_data=True,
     install_requires=[
-        "django==3.2.24",
+        "django==3.2.25",
         "djangorestframework==3.13.1",
         "django-two-factor-auth==1.13.2",
         "django-countries==7.3.1",

portal/__init__.py

@@ -1 +1 @@
-__version__ = "6.41.2"
+__version__ = "6.41.4"

portal/templates/portal/email_verification_needed.html

@@ -5,10 +5,10 @@
 {% block form_content %}
     <div id="emailVerificationNeeded_page"></div>
     <h4>We need to verify your email address</h4>
+    <h5>An email has been sent to you. Make sure to check your
+        <strong>spam</strong>.</h5>
     <img class="background" title="Paper Plane" alt="Verification email sent" src="{% static 'portal/img/paper_plane.png' %}">
-    <p class="text-left">An email has been sent to the address you provided.</p>
     <p class="text-left">Please follow the link within the email to verify your details. This will expire in one hour.</p>
-    <p class="text-left">If you don't receive the email within the next few minutes, please check your spam folder.</p>
     <div>
         <a target="_blank" href="https://mail.google.com/mail/#search/from%3Ano-reply%40codeforlife.education+subject%3AEmail+Verification"
            class="button button--home button-email">Open in Gmail</a>

portal/templates/portal/reset_password_email_sent.html

@@ -4,14 +4,8 @@
 {% block form_content %}
     <div id="reset_password_email_sent_page"></div>
     <h4>Thank you</h4>
+    <h5>If you have entered a valid email address, you will receive a link to
+        reset your password. Make sure to check your <strong>spam</strong>.</h5>
     <img class="background" title="Paper Plane" alt="Verification email sent" src="{% static 'portal/img/paper_plane.png' %}">
-    <p class="text-left">If you have entered a valid email address, you will receive 
-        a link enabling you to reset your password.</p>
-    <div>
-        {% if usertype == "TEACHER" %}
-            <a href="{% url 'home' %}" class="button button--primary button--login">Back to homepage</a>
-        {% else %}
-            <a href="{% url 'home' %}" class="button button--home">Back to homepage</a>
-        {% endif %}
-    </div>
+    <p class="text-left"><a id="home_button" href="{% url 'home' %}">&lt; back to homepage</a></p>
 {% endblock form_content %}

setup.py

@@ -20,7 +20,7 @@
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        "django==3.2.24",
+        "django==3.2.25",
         "django-countries==7.3.1",
         "djangorestframework==3.13.1",
         "django-pipeline==2.0.8",