codeforlife-portal 5.33.5__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

portal/templates/portal/register.html

@@ -1,22 +1,23 @@
 {% extends 'portal/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
-
 {% block content %}
-<div id="signup_page"></div>
-
-<div class="container registration">
-
+    {% include "portal/partials/service_unavailable_popup.html" %}
+    <div id="signup_page"></div>
+    <div id="register-forms" class="container registration">
         <div class="form--register--text form--register form--register--teacher is-flex-item col-sm-6">
-            <div class="form-div form">
+            <div id="teacher-register-form" class="form-div form">
                 <h4>Teacher/Tutor</h4>
                 <div class="row form--row">
-                    <p class="semi-bold">Once you've registered your personal details and logged in, you'll be able to create your school or club, or join other teachers at your institution.</p>
+                    <p class="semi-bold">Register below to create your free account.</p>
+                    <small class="semi-bold">You will have access to teaching resources, progress tracking and lesson plans
+                    for Rapid Router.</small>
                 </div>
-                <form class="d-flex flex-column" method="post" id="form-reg-teacher" autocomplete="off">
-
+                <form class="d-flex flex-column" 
+                      method="post"
+                      id="form-reg-teacher"
+                      autocomplete="off">
                     {% csrf_token %}
-
                     {{ teacher_signup_form.non_field_errors }}
                     <div class="row form--row">
                         <label for="id_teacher_signup-teacher_first_name"></label>
@@ -25,26 +26,34 @@
                         {{ teacher_signup_form.teacher_first_name.errors }}
                     </div>
                     <div class="row form--row">
-
                         <label for="id_teacher_signup-teacher_last_name"></label>
                         {{ teacher_signup_form.teacher_last_name }}
                         <small>{{ teacher_signup_form.teacher_last_name.help_text }}</small>
                         {{ teacher_signup_form.teacher_last_name.errors }}
                     </div>
                     <div class="row form--row">
-
                         <label for="id_teacher_signup-teacher_email"></label>
                         {{ teacher_signup_form.teacher_email }}
                         <small>{{ teacher_signup_form.teacher_email.help_text }}</small>
                         {{ teacher_signup_form.teacher_email.errors }}
                     </div>
+                    <div class="row form--row">
+                        <div class="form__checkbox">
+                            <div class="form__checkbox-input">{{ teacher_signup_form.consent_ticked }}</div>
+                            <p class="semi-bold">
+                                I am over 18 years old have read and understood the
+                                <a href="{% url 'terms' %}" target="_blank">Terms of use</a> and the
+                                <a href="{% url 'privacy_notice' %}" target="_blank">Privacy notice</a>.
+                            </p>
+                        </div>
+                    </div>
                     <div class="row form--row">
                         {% include 'portal/partials/register_newsletter_tickbox.html' with newsletter_ticked=teacher_signup_form.newsletter_ticked %}
                     </div>
                     <div class="row form--row">
                         <label for="id_teacher_signup-teacher_password"></label>
                         <div class="input--icon">
-                            {{ teacher_signup_form.teacher_password }}<span class="iconify" data-icon="mdi:security"></span>
+                            {{ teacher_signup_form.teacher_password }}<span id="teacher-password-field-icon" class="iconify" data-icon="material-symbols:visibility-off"></span>
                         </div>
                         <small>{{ teacher_signup_form.teacher_password.help_text }}</small>
                         {{ teacher_signup_form.teacher_password.errors }}
@@ -52,115 +61,136 @@
                     <div class="row form--row">
                         <label for="id_teacher_signup-teacher_confirm_password"></label>
                         <div class="input--icon">
-                            {{ teacher_signup_form.teacher_confirm_password }}<span class="iconify" data-icon="mdi:security"></span>
+                            {{ teacher_signup_form.teacher_confirm_password }}<span id="teacher-confirm-password-field-icon" class="iconify" data-icon="material-symbols:visibility-off"></span>
                         </div>
                         <small>{{ teacher_signup_form.teacher_confirm_password.help_text }}</small>
                         {{ teacher_signup_form.teacher_confirm_password.errors }}
                     </div>
-
                     <div class="row--under">
                         <div class="password-strength-container">
                             <div id="teacher-password-sign" class="password-strength-sign"></div>
                             <div id="teacher-password-text" class="password-strength-text"></div>
                         </div>
                     </div>
-
-                    <div class="row">
-                        {{ teacher_signup_form.captcha }}
-                    </div>
-                    <div class="d-flex align-items-end justify-content-end form-div row">
-                        <button class="button button--home button--primary teacher--home--button button--icon" type="submit" name="teacher_signup"> Register<span class="iconify" data-icon="mdi:chevron-right"></span></button>
+                    <div class="row">{{ teacher_signup_form.captcha }}</div>
+                    <div class="d-flex justify-content-end row">
+                        <button class="button button--home button--primary teacher--home--button button--icon"
+                                type="submit"
+                                name="teacher_signup">
+                            Register<span class="iconify" data-icon="mdi:chevron-right"></span>
+                        </button>
                     </div>
                 </form>
-
             </div>
         </div>
-
-        <div class="form--register--text form--register form--register--indep-student col-sm-6">
-            <div class="form-div">
+        <div class="form--register--text form--register form--register--indep-student is-flex-item col-sm-6">
+            <div id="independent-student-register-form" class="form-div">
                 <h4>Independent learner</h4>
                 <div class="row form--row">
-                    <p class="semi-bold">
-                        Register below if you are not part of a school or club.
-                    </p>
-                    <small class="semi-bold">
-                        Are you part of a school or club? If so, please log in <a href="{% url 'student_login_access_code' %}">here</a> or speak to your teacher.
-                    </small>
+                    <p class="semi-bold">Register below if you are not part of a school or club and wish to set up a free home learning account.</p>
+                    <small class="semi-bold">You will have access to learning resources for Rapid Router.</small>
                 </div>
-                <form id="form-signup-independent-student" method="post" autocomplete="off" class="d-flex flex-column">
-
+                <form id="form-signup-independent-student"
+                      method="post"
+                      autocomplete="off"
+                      class="d-flex flex-column">
                     {% csrf_token %}
-
-                    {{ independent_student_signup_form.non_field_errors }}
-                    <div class="row form--row">
-
-                        <label for="id_{{ independent_student_signup_form.name.html_name }}"></label>
-                        {{ independent_student_signup_form.name }}
-                        <small>{{ independent_student_signup_form.name.help_text }}</small>
-                        {{ independent_student_signup_form.name.errors }}
-                    </div>
-                    <div class="row form--row">
-
-                        <label for="id_{{ independent_student_signup_form.username.html_name }}"></label>
-                        {{ independent_student_signup_form.username }}
-                        <small>{{ independent_student_signup_form.username.help_text }}</small>
-                        {{ independent_student_signup_form.username.errors }}
-                    </div>
-                    <div class="row form--row">
-
-                        <label for="id_{{ independent_student_signup_form.email.html_name }}"></label>
-                        {{ independent_student_signup_form.email }}
-                        <small>{{ independent_student_signup_form.email.help_text }}</small>
-                        {{ independent_student_signup_form.email.errors }}
-                    </div>
                     <div class="row form--row">
-                        {% include 'portal/partials/register_over_required_age_tickbox.html' with is_over_required_age=independent_student_signup_form.is_over_required_age %}
-                    </div>
-
-                    <div class="row form--row">
-                        {% include 'portal/partials/register_newsletter_tickbox.html' with newsletter_ticked=independent_student_signup_form.newsletter_ticked %}
+                        <small class="semi-bold mb-4">{{ independent_student_signup_form.date_of_birth.help_text }}</small>
+                        <div class="form__dob-input">
+                            {{ independent_student_signup_form.date_of_birth }}
+                        </div>
                     </div>
-
-                    <div class="row form--row">
-                        <label for="id_{{ independent_student_signup_form.password.html_name }}"></label>
-                        <div class="input--icon">
-                            {{ independent_student_signup_form.password }} <span class="iconify" data-icon="mdi:security"></span>
+                    {{ independent_student_signup_form.date_of_birth.errors }}
+                    <div id="form-fields">
+                        {{ independent_student_signup_form.non_field_errors }}
+                        <div class="row form--row">
+                            <label for="id_{{ independent_student_signup_form.name.html_name }}">
+                            </label>
+                            {{ independent_student_signup_form.name }}
+                            <small>{{ independent_student_signup_form.name.help_text }}</small>
+                            {{ independent_student_signup_form.name.errors }}
                         </div>
+                        <div class="row form--row">
+                            <label for="id_{{ independent_student_signup_form.email.html_name }}">
+                            </label>
+                            {{ independent_student_signup_form.email }}
+                            <small id="independent-email-help-text">{{ independent_student_signup_form.email.help_text }}</small>
+                            {{ independent_student_signup_form.email.errors }}
+                        </div>
+                        <div id="independent-consent" class="row form--row">
+                            <div class="form__checkbox">
+                                <div class="form__checkbox-input">
+                                    {{ independent_student_signup_form.consent_ticked }}
+                                </div>
+                                <p id="independent-adult-legal" class="semi-bold">
+                                    I have read and understood the
+                                    <a href="{% url 'terms' %}" target="_blank">Terms of use</a> and the
+                                    <a href="{% url 'privacy_notice' %}" target="_blank">Privacy notice</a>.
+                                </p>
+                                <p id="independent-child-legal" class="semi-bold">
+                                    I have read and understood the
+                                    <a href="{% url 'terms' %}#terms-children" target="_blank">Terms of use</a> and the
+                                    <a href="{% url 'privacy_notice' %}#privacy-children" target="_blank">Privacy notice</a>.
+                                </p>
+                            </div>
+                        </div>
+                        <div id="independent-newsletter" class="row form--row">
+                            {% include 'portal/partials/register_newsletter_tickbox.html' with newsletter_ticked=independent_student_signup_form.newsletter_ticked %}
+                        </div>
+                        <div id="independent-parent-notification" class="row form--row">
+                            <small><strong>We will send your parent/guardian an email to ask them to activate the account
+                            for you. Once they've done this you'll be able to log in using your name and password.</strong></small>
+                        </div>
+                        <div class="row form--row">
+                            <label for="id_{{ independent_student_signup_form.password.html_name }}">
+                            </label>
+                            <div class="input--icon">
+                                {{ independent_student_signup_form.password }} <span id="independent-student-password-field-icon" class="iconify" data-icon="material-symbols:visibility-off"></span>
+                            </div>
                             <small>{{ independent_student_signup_form.password.help_text }}</small>
-                        {{ independent_student_signup_form.password.errors }}
-                    </div>
-
-                    <div class="row form--row">
-                        <label for="id_{{ independent_student_signup_form.confirm_password.html_name }}"></label>
-                        <div class="input--icon">
-                            {{ independent_student_signup_form.confirm_password }}<span class="iconify" data-icon="mdi:security"></span>
+                            {{ independent_student_signup_form.password.errors }}
                         </div>
-                        <small>{{ independent_student_signup_form.confirm_password.help_text }}</small>
-                        {{ independent_student_signup_form.confirm_password.errors }}
-                    </div>
-
-                    <div class="row--under">
-                        <div class="password-strength-container">
-                            <div id="student-password-sign" class="password-strength-sign"></div>
-                            <div id="student-password-text" class="password-strength-text"></div>
+                        <div class="row form--row">
+                            <label for="id_{{ independent_student_signup_form.confirm_password.html_name }}">
+                            </label>
+                            <div class="input--icon">
+                                {{ independent_student_signup_form.confirm_password }}<span id="independent-student-confirm-password-field-icon" class="iconify" data-icon="material-symbols:visibility-off"></span>
+                            </div>
+                            <small>{{ independent_student_signup_form.confirm_password.help_text }}</small>
+                            {{ independent_student_signup_form.confirm_password.errors }}
+                        </div>
+                        <div class="row--under">
+                            <div class="password-strength-container">
+                                <div id="student-password-sign" class="password-strength-sign">
+                                </div>
+                                <div id="student-password-text" class="password-strength-text">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            {{ independent_student_signup_form.captcha }}
+                        </div>
+                        <div class="d-flex justify-content-end row">
+                            <button type="submit"
+                                    name="independent_student_signup"
+                                    class="button button--home button--icon"
+                                    value="Register">
+                                Register<span class="iconify" data-icon="mdi:chevron-right"></span>
+                            </button>
                         </div>
-                    </div>
-
-                    <div class="row">
-                        {{ independent_student_signup_form.captcha }}
-                    </div>
-                    <div class="d-flex align-items-end justify-content-end row">
-                        <button type="submit" name="independent_student_signup" class="button button--home button--icon" value="Register">Register<span class="iconify" data-icon="mdi:chevron-right"></span></button>
                     </div>
                 </form>
             </div>
         </div>
-</div>
-
-<script type="text/javascript" src="{% static 'portal/js/passwordStrength.js' %}"></script>
+    </div>
 <script>
     var TEACHER_PASSWORD_FIELD_ID = '{{ teacher_signup_form.teacher_password.auto_id }}';
     var INDEP_STUDENT_PASSWORD_FIELD_ID = '{{ independent_student_signup_form.password.auto_id }}';
 </script>
+<script type="text/javascript"
+        src="{% static 'portal/js/passwordStrength.js' %}"></script>
+<script type="text/javascript"
+        src="{% static 'portal/js/independentRegistration.js' %}"></script>
 
 {% endblock content %}

portal/templates/portal/reset_password.html

@@ -2,56 +2,36 @@
 {% load static %}
 
 {% block form_content %}
-    <!-- #TODO: Merge this if/else when we get rid of the indep username -->
-    {% if usertype == "TEACHER" %}
-        <div id="reset_password_teacher_page"></div>
-        <h4 class="center-block">Reset password</h4>
-        <h5>Please enter your email address</h5>
-        <p class="text-left">We will send an email with a link to reset your password.</p>
-        <form method="post" autocomplete="off">
-            {% csrf_token %}
 
-            {{ form.non_field_errors }}
+    <div id="reset_password_page"></div>
+    <h4 class="center-block">Reset password</h4>
+    <h5>Please enter your email address</h5>
+    <p class="text-left">We will send an email with a link to reset your password.</p>
+    <form method="post" autocomplete="off">
+        {% csrf_token %}
 
-            <div class="form--row">
-                {{ form.email }}
-                <small>{{ form.email.help_text }}</small>
-                {{ form.email.error }}
-            </div>
+        {{ form.non_field_errors }}
+
+        <div class="form--row">
+            {{ form.email }}
+            <small>{{ form.email.help_text }}</small>
+            {{ form.email.error }}
+        </div>
 
-            {% if should_use_recaptcha %}
-                {{ form.captcha }}
-            {% endif %}
+        {% if should_use_recaptcha %}
+            {{ form.captcha }}
+        {% endif %}
 
+        {% if usertype == "TEACHER" %}
             <div>
                 <a id="cancel_button" class="button button--secondary button--secondary--light" href="{% url 'teacher_login' %}">Cancel</a>
                 <button id="reset_button" type="submit" class="button button--primary">Reset password</button>
             </div>
-        </form>
-    {% else %}
-        <div id="reset_password_student_page"></div>
-        <h4 class="center-block">Reset password</h4>
-        <h5>Please enter your username</h5>
-        <p class="text-left">We will send an email with a link to reset your password.</p>
-        <form method="post" autocomplete="off">
-            {% csrf_token %}
-
-            {{ form.non_field_errors }}
-
-            <div class="form--row">
-                {{ form.username }}
-                <small>{{ form.username.help_text }}</small>
-                {{ form.username.error }}
-            </div>
-
-            {% if should_use_recaptcha %}
-                {{ form.captcha }}
-            {% endif %}
-
+        {% else %}
             <div>
                 <a id="cancel_button" class="button button--secondary button--secondary--light" href="{% url 'independent_student_login' %}">Cancel</a>
                 <button id="reset_button" type="submit" class="button button--home">Reset password</button>
             </div>
-        </form>
-    {% endif %}
+        {% endif %}
+    </form>
 {% endblock form_content %}

portal/templates/portal/reset_password_confirm.html

@@ -8,20 +8,24 @@
     {% if validlink %}
         <p class="text-left">Please enter a new password and confirm it in the boxes below to reset your account&rsquo;s password.</p>
 
-        <form method="post">
+        <form id="reset-password-form" method="post">
 
             {% csrf_token %}
 
             {{ form.non_field_errors }}
 
             <div class="form--row">
-                {{ form.new_password1 }}
+                <div class="input--icon">
+                    {{ form.new_password1 }} <span id="password-field-icon" class="iconify" data-icon="material-symbols:visibility-off"></span>
+                </div>
                 <small>{{ form.new_password1.help_text }}</small>
             </div>
             {{ form.new_password1.errors }}
 
             <div class="form--row">
-                {{ form.new_password2 }}
+                <div class="input--icon">
+                    {{ form.new_password2 }} <span id="confirm-password-field-icon" class="iconify" data-icon="material-symbols:visibility-off"></span>
+                </div>
                 <small>{{ form.new_password2.help_text }}</small>
             </div>
             {{ form.new_password2.errors }}
@@ -61,10 +65,11 @@
         </div>
     {% endif %}
 
-<script type="text/javascript" src="{% static 'portal/js/passwordStrength.js' %}"></script>
 <script>
     var TEACHER_PASSWORD_FIELD_ID = '{{ form.new_password1.auto_id }}';
     var INDEP_STUDENT_PASSWORD_FIELD_ID = '{{ form.new_password1.auto_id }}';
 </script>
+<script type="text/javascript" src="{% static 'portal/js/passwordStrength.js' %}"></script>
+<script type="text/javascript" src="{% static 'portal/js/resetPassword.js' %}"></script>
 
 {% endblock form_content %}

portal/templates/portal/reset_password_email_sent.html

@@ -2,16 +2,18 @@
 {% load static %}
 
 {% block form_content %}
-    <div id="reset_password_email_sent_page"></div>
-    <h4>Thank you</h4>
-    <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 {% if usertype == "TEACHER" %}email address{% else %}username{% endif %},
-        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>
-{% endblock 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' %}">
+<div>
+    <a target="_blank"
+        href="https://mail.google.com/mail/#search/from%3Ano-reply%40info.codeforlife.education+subject%3APassword+reset+request"
+        class="button button--home button-email">Open in Gmail</a>
+    <a target="_blank" href="https://outlook.live.com/mail/" class="button button--home button-email">Open in
+        Outlook</a>
+</div>
+<p class="text-left"><a id="home_button" href="{% url 'home' %}">&lt; back to homepage</a></p>
+{% endblock form_content %}

portal/templates/portal/teach/base_registering.html

@@ -1,5 +1,5 @@
 {% extends 'portal/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
 {% block subNav %}

portal/templates/portal/teach/class.html

@@ -1,16 +1,15 @@
 {% extends 'portal/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
 {% block css %}
     {{ block.super }}
-    <link href="{% static 'portal/css/jquery-ui.css' %}" rel="stylesheet">
+    <link href="https://code.jquery.com/ui/1.13.1/themes/base/jquery-ui.css" rel="stylesheet" type="text/css">
 {% endblock css %}
 
 {% block scripts %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'portal/js/teach_class.js' %}"></script>
-<script type="text/javascript" src="{% static 'portal/js/common.js' %}"></script>
 {% endblock scripts %}
 
 {% block subNav %}
@@ -119,9 +118,8 @@
 
 <div class="background container">
     <h4>Additional class details</h4>
-    <p>Here you may change the name of the class, transfer the class to another teacher in the school or club, create permissions for the class to
-        accept requests from external students, or delete classes for which there are no students. You can also create permissions for students in this class to see
-        their classmates' progress.</p>
+    <p>Here you can change settings and permissions for the class and the students accessing it.
+         You can also delete classes and change level access.</p>
     <div class="background button-group">
         <a id="class_settings_button" href="{% url 'teacher_edit_class' class.access_code %}" class="button button--primary button--icon">Edit details
             <span class="iconify" data-icon="mdi:pencil"></span>