codeforlife-portal 1.0.0.post.dev367__tar.gz → 1.0.0.post.dev373__tar.gz

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post.dev367
+Version: 1.0.0.post.dev373
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/codeforlife_portal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post0.dev367
+Version: 1.0.0.post0.dev373
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/codeforlife_portal.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ portal/forms/auth_forms.py
 portal/forms/home.py
 portal/forms/organisation.py
 portal/forms/play.py
+portal/forms/play_new.py
 portal/forms/registration.py
 portal/forms/teach.py
 portal/forms/teach_new.py
@@ -564,6 +565,7 @@ portal/tests/test_class_new.py
 portal/tests/test_emails.py
 portal/tests/test_independent_student.py
 portal/tests/test_independent_student_joins_a_class.py
+portal/tests/test_independent_student_new.py
 portal/tests/test_location.py
 portal/tests/test_navigation.py
 portal/tests/test_organisation.py

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/_version.py

@@ -11,8 +11,8 @@ version_json = '''
 {
  "dirty": false,
  "error": null,
- "full-revisionid": "cd26bac67c4aabda0b06ddf7a1aec4d8ac0dfdaa",
- "version": "1.0.0.post.dev367"
+ "full-revisionid": "5e1af72fbe38cce9f86d4d65bf05688ebcecc2d2",
+ "version": "1.0.0.post.dev373"
 }
 '''  # END VERSION_JSON
 

codeforlife-portal-1.0.0.post.dev373/portal/forms/play_new.py

@@ -0,0 +1,137 @@
+# -*- coding: utf-8 -*-
+# Code for Life
+#
+# Copyright (C) 2016, Ocado Innovation Limited
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ADDITIONAL TERMS – Section 7 GNU General Public Licence
+#
+# This licence does not grant any right, title or interest in any “Ocado” logos,
+# trade names or the trademark “Ocado” or any other trademarks or domain names
+# owned by Ocado Innovation Limited or the Ocado group of companies or any other
+# distinctive brand features of “Ocado” as may be secured from time to time. You
+# must not distribute any modification of this program using the trademark
+# “Ocado” or claim any affiliation or association with Ocado or its employees.
+#
+# You are not authorised to use the name Ocado (or any of its trade names) or
+# the names of any author or contributor in advertising or for publicity purposes
+# pertaining to the distribution of this program, without the prior written
+# authorisation of Ocado.
+#
+# Any propagation, distribution or conveyance of this program must include this
+# copyright notice and these terms. You must not misrepresent the origins of this
+# program; modified versions of the program must be marked as such and not
+# identified as the original program.
+from datetime import timedelta
+
+from django import forms
+from django.contrib.auth import authenticate
+from django.contrib.auth.models import User
+from django.utils import timezone
+
+from portal.models import Student, Class, stripStudentName
+from portal.helpers.password import password_strength_test
+
+
+class StudentLoginForm(forms.Form):
+    name = forms.CharField(
+        label='Name',
+        widget=forms.TextInput(attrs={'placeholder': "Jane"}))
+    access_code = forms.CharField(
+        label='Class Access Code',
+        widget=forms.TextInput(attrs={'placeholder': "AB123"}))
+    password = forms.CharField(
+        label='Password',
+        widget=forms.PasswordInput)
+
+    def clean(self):
+        if self.has_error('recaptcha'):
+            raise forms.ValidationError("Invalid name, class access code, password or captcha")
+
+        name = self.cleaned_data.get('name', None)
+        access_code = self.cleaned_data.get('access_code', None)
+        password = self.cleaned_data.get('password', None)
+
+        if name and access_code and password:
+
+            student, user = self.check_for_errors(name, access_code, password)
+
+            self.student = student
+            self.user = user
+
+        return self.cleaned_data
+
+    def check_for_errors(self, name, access_code, password):
+        classes = Class.objects.filter(access_code__iexact=access_code)
+        if len(classes) != 1:
+            raise forms.ValidationError("Invalid name, class access code or password")
+
+        name = stripStudentName(name)
+
+        students = Student.objects.filter(new_user__first_name__iexact=name, class_field=classes[0])
+        if len(students) != 1:
+            raise forms.ValidationError("Invalid name, class access code or password")
+
+        student = students[0]
+        user = authenticate(username=student.new_user.username, password=password)
+
+        if user is None:
+            raise forms.ValidationError("Invalid name, class access code or password")
+        if not user.is_active:
+            raise forms.ValidationError("This user account has been deactivated")
+
+        return student, user
+
+
+class StudentSignupForm(forms.Form):
+    name = forms.CharField(
+        label='Name', max_length=100,
+        widget=forms.TextInput(attrs={'placeholder': "Rosalind Franklin"}))
+    username = forms.CharField(
+        label='Username', max_length=100,
+        widget=forms.TextInput(attrs={'placeholder': "rosie_f"}))
+    email = forms.EmailField(
+        label='Email address',
+        widget=forms.EmailInput(attrs={'placeholder': "rosalind.franklin@cambridge.ac.uk"}))
+    password = forms.CharField(
+        label='Password',
+        widget=forms.PasswordInput)
+    confirm_password = forms.CharField(
+        label='Confirm Password',
+        widget=forms.PasswordInput)
+
+    def clean_username(self):
+        username = self.cleaned_data.get('username', None)
+        if User.objects.filter(username=username).exists():
+            raise forms.ValidationError("That username is already in use")
+
+        return username
+
+    def clean_password(self):
+        password = self.cleaned_data.get('password', None)
+
+        if password and not password_strength_test(password, length=6, upper=False, lower=False, numbers=False):
+            raise forms.ValidationError("Password not strong enough, consider using at least 6 characters")
+
+        return password
+
+    def clean(self):
+        password = self.cleaned_data.get('password', None)
+        confirm_password = self.cleaned_data.get('confirm_password', None)
+
+        if password and confirm_password and password != confirm_password:
+            raise forms.ValidationError("Your passwords do not match")
+
+        return self.cleaned_data

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/forms/teach.py

@@ -191,10 +191,10 @@ class TeacherEditAccountForm(forms.Form):
 
 
 class TeacherLoginForm(forms.Form):
-    email = forms.EmailField(
+    teacher_email = forms.EmailField(
         label='Email address',
         widget=forms.EmailInput(attrs={'placeholder': "my.email@address.com"}))
-    password = forms.CharField(
+    teacher_password = forms.CharField(
         label='Password',
         widget=forms.PasswordInput)
 
@@ -202,11 +202,11 @@ class TeacherLoginForm(forms.Form):
         if self.has_error('recaptcha'):
             raise forms.ValidationError('Incorrect email address, password or captcha')
 
-        email = self.cleaned_data.get('email', None)
-        password = self.cleaned_data.get('password', None)
+        teacher_email = self.cleaned_data.get('teacher_email', None)
+        teacher_password = self.cleaned_data.get('teacher_password', None)
 
-        if email and password:
-            users = User.objects.filter(email=email)
+        if teacher_email and teacher_password:
+            users = User.objects.filter(email=teacher_email)
 
             # Check it's a teacher and not a student using the same email address
             user = None
@@ -218,7 +218,7 @@ class TeacherLoginForm(forms.Form):
             if user is None:
                 raise forms.ValidationError('Incorrect email address or password')
 
-            user = authenticate(username=user.username, password=password)
+            user = authenticate(username=user.username, password=teacher_password)
 
             if user is None:
                 raise forms.ValidationError('Incorrect email address or password')

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/forms/teach_new.py

@@ -50,7 +50,7 @@ choices = [('Miss', 'Miss'), ('Mrs', 'Mrs'), ('Ms', 'Ms'), ('Mr', 'Mr'),
 
 class TeacherSignupForm(forms.Form):
 
-    title = forms.ChoiceField(
+    teacher_title = forms.ChoiceField(
         label='Title',
         choices=choices,
         widget=forms.Select(
@@ -59,7 +59,7 @@ class TeacherSignupForm(forms.Form):
             }
         )
     )
-    first_name = forms.CharField(
+    teacher_first_name = forms.CharField(
         label='First name',
         max_length=100,
         widget=forms.TextInput(
@@ -68,7 +68,7 @@ class TeacherSignupForm(forms.Form):
             }
         )
     )
-    last_name = forms.CharField(
+    teacher_last_name = forms.CharField(
         label='Last name',
         max_length=100,
         widget=forms.TextInput(
@@ -77,7 +77,7 @@ class TeacherSignupForm(forms.Form):
             }
         )
     )
-    email = forms.EmailField(
+    teacher_email = forms.EmailField(
         label='Email address',
         widget=forms.EmailInput(
             attrs={
@@ -85,17 +85,17 @@ class TeacherSignupForm(forms.Form):
             }
         )
     )
-    password = forms.CharField(
+    teacher_password = forms.CharField(
         label='Password',
         widget=forms.PasswordInput()
     )
-    confirm_password = forms.CharField(
+    teacher_confirm_password = forms.CharField(
         label='Confirm Password',
         widget=forms.PasswordInput()
     )
 
     def clean_email(self):
-        email = self.cleaned_data.get('email', None)
+        email = self.cleaned_data.get('teacher_email', None)
 
         if email and Teacher.objects.filter(new_user__email=email).exists():
             raise forms.ValidationError("That email address is already in use")
@@ -103,7 +103,7 @@ class TeacherSignupForm(forms.Form):
         return email
 
     def clean_password(self):
-        password = self.cleaned_data.get('password', None)
+        password = self.cleaned_data.get('teacher_password', None)
 
         if password and not password_strength_test(password):
             raise forms.ValidationError(
@@ -115,8 +115,8 @@ class TeacherSignupForm(forms.Form):
         if any(self.errors):
             return
 
-        password = self.cleaned_data.get('password', None)
-        confirm_password = self.cleaned_data.get('confirm_password', None)
+        password = self.cleaned_data.get('teacher_password', None)
+        confirm_password = self.cleaned_data.get('teacher_confirm_password', None)
 
         if password and confirm_password and password != confirm_password:
             raise forms.ValidationError('Your passwords do not match')
@@ -156,8 +156,7 @@ class TeacherEditAccountForm(forms.Form):
         email = self.cleaned_data.get('email', None)
         if email:
             teachers = Teacher.objects.filter(new_user__email=email)
-            if ((len(teachers) == 1 and teachers[0].new_user != self.user) or
-                    len(teachers) > 1):
+            if (len(teachers) == 1 and teachers[0].new_user != self.user) or len(teachers) > 1:
                 raise forms.ValidationError("That email address is already in use")
 
         return email

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/static/portal/js/passwordStrength_new.js

@@ -35,64 +35,67 @@ copyright notice and these terms. You must not misrepresent the origins of this
 program; modified versions of the program must be marked as such and not
 identified as the original program.
 */
-var PASSWORD_TYPE = '';
-var PASSWORD_FIELD_ID = '';
-var password_field = '';
+var TEACHER_PASSWORD_FIELD_ID = '';
+var INDEP_STUDENT_PASSWORD_FIELD_ID = '';
+var teacher_password_field = '';
+var indep_student_password_field = '';
+
+var password_strengths = [
+    { name: 'No password!', colour: '#FF0000' },
+    { name: 'Password too weak', colour: '#DBA901' },
+    { name: 'Strong password', colour: '#088A08' }
+];
 
 $(function() {
-    var updateFunction = (PASSWORD_TYPE == 'INDEPENDENT_STUDENT') ? updateIndependentStudentPasswordStrength : updateTeacherPasswordStrength;
 
-    password_field = $('#' + PASSWORD_FIELD_ID);
-    password_field.on('keyup', updateFunction);
-    password_field.on('paste', updateFunction);
-    password_field.on('cut', updateFunction);
-    updateFunction();
+    teacher_password_field = $('#' + TEACHER_PASSWORD_FIELD_ID);
+    indep_student_password_field = $('#' + INDEP_STUDENT_PASSWORD_FIELD_ID);
+
+    setUpDynamicUpdates(teacher_password_field, updateTeacherPasswordStrength);
+    setUpDynamicUpdates(indep_student_password_field, updateIndependentStudentPasswordStrength);
+
+    updateTeacherPasswordStrength();
+    updateIndependentStudentPasswordStrength();
 });
 
+function setUpDynamicUpdates(password_field, update_function) {
+    password_field.on('keyup', update_function);
+    password_field.on('paste', update_function);
+    password_field.on('cut', update_function);
+}
+
 function updateTeacherPasswordStrength() {
     // The reason for the timeout is that if we just got $('#...').val() we'd get the
     // old value before the keypress / change. Apparently even jQuery itself implements
     // things this way, so maybe there is no better workaround.
 
     setTimeout(function() {
-        var teacher_password_strengths = [
-            { name: 'No password!', colour: '#FF0000' },
-            { name: 'Password too weak', colour: '#DBA901' },
-            { name: 'Strong password', colour: '#088A08' }
-        ];
 
-        var password = $('#' + PASSWORD_FIELD_ID).val();
+        var password = $('#' + TEACHER_PASSWORD_FIELD_ID).val();
 
         var strength = 0;
         if (password.length > 0) { strength++; }
         if (password.length > 8 && !(password.search(/[A-Z]/) === -1 || password.search(/[a-z]/) === -1 || password.search(/[0-9]/) === -1)) { strength++; }
 
-        $('.password-strength-sign').css('background-color', teacher_password_strengths[strength].colour);
-        $('.password-strength-text').html(teacher_password_strengths[strength].name);
+        updatePasswordCSS('#teacher-password-sign', '#teacher-password-text', strength);
     });
 }
 
 function updateIndependentStudentPasswordStrength() {
 
     setTimeout(function() {
-        var independent_student_password_strengths = [
-            { name: 'Password quality', colour: '' },
-            { name: 'Not long enough', colour: '#DBA901' },
-            { name: 'Good password', colour: '#088A08' }
-        ];
 
-        var password = $('#' + PASSWORD_FIELD_ID).val();
+        var password = $('#' + INDEP_STUDENT_PASSWORD_FIELD_ID).val();
 
         var strength = 0;
-        if (password == '') { strength = 0; }
-        else if (password.length < 6) { strength = 1; }
-        else if (password.length >= 6) { strength = 2; }
-
-        if (password == '') { $('.password-strength-bar-container').hide(); $('.password-strength-text').hide(); }
-        else { $('.password-strength-bar-container').show(); $('.password-strength-text').show(); }
+        if (password.length > 0) { strength++; }
+        if (password.length > 5) { strength++; }
 
-        $('.password-strength-bar').css('width', strength / 2 * 100 + '%');
-        $('.password-strength-bar').css('background-color', independent_student_password_strengths[strength].colour);
-        $('.password-strength-text').html(independent_student_password_strengths[strength].name);
+        updatePasswordCSS('#student-password-sign', '#student-password-text', strength);
     });
+}
+
+function updatePasswordCSS(passwordStrengthSign, passwordStrengthText, strength) {
+    $(passwordStrengthSign).css('background-color', password_strengths[strength].colour);
+    $(passwordStrengthText).html(password_strengths[strength].name);
 }

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/static/portal/sass/styles.scss

@@ -48,6 +48,7 @@ $color-background-secondary: #fff;
 $color-background-tertiary: $color-text-grey;
 $color-background-teach: $color-teacher-blue;
 $color-background-play: $color-student-orange;
+$color-background-play-indep: #ff637d;
 $color-background-warning: #fab300;
 $color-background-positive: #7ed321;
 $color-background-danger: #f00;
@@ -771,6 +772,10 @@ form {
   background-color: $color-background-play;
 }
 
+.form--register--indep-student {
+  background-color: $color-background-play-indep;
+}
+
 .form__choice {
   @include _margin(40px, 0px, 0px, 37px);
   background-color: $color-background-secondary;

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/templates/portal/teach/materials/home.html

@@ -138,8 +138,8 @@
             </tr>
             <tr>
                 <th>Session 6</th>
-                <td><a href="{% url 'materials_viewer' pdf_name='KS1_S5_1' %}">KS1-S6-1</a></td>
-                <td><a href="{% url 'materials_viewer' pdf_name='KS1_S5_2' %}">KS1-S6-2</a></td>
+                <td><a href="{% url 'materials_viewer' pdf_name='KS1_S6_1' %}">KS1-S6-1</a></td>
+                <td><a href="{% url 'materials_viewer' pdf_name='KS1_S6_2' %}">KS1-S6-2</a></td>
             </tr>
             <tr>
                 <th>Session 7</th>
@@ -269,7 +269,7 @@
                 <td><a href="{% url 'materials_viewer' pdf_name='LKS2_S4_2' %}">LKS2-S4-2</a></td>
                 <td><a href="{% url 'materials_viewer' pdf_name='LKS2_S4_3' %}">LKS2-S4-3</a></td>
                 <td><a href="{% url 'materials_viewer' pdf_name='LKS2_S4_4' %}">LKS2-S4-4</a></td>
-            </tr
+            </tr>
             <tr>
                 <th>Session 5</th>
                 <td><a href="{% url 'materials_viewer' pdf_name='LKS2_S5_1' %}">LKS2-S5-1</a></td>

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/templates/portal/teach.html

@@ -57,13 +57,13 @@
 
                     {{ login_form.non_field_errors }}
 
-                    {{ login_form.email.errors }}
-                    <label for="id_{{ login_form.email.html_name }}">{{ login_form.email.label }}</label>
-                    {{ login_form.email }}
+                    {{ login_form.teacher_email.errors }}
+                    <label for="id_{{ login_form.teacher_email.html_name }}">{{ login_form.teacher_email.label }}</label>
+                    {{ login_form.teacher_email }}
 
-                    {{ login_form.password.errors }}
-                    <label for="id_{{ login_form.password.html_name }}">{{ login_form.password.label }}</label>
-                    {{ login_form.password }}
+                    {{ login_form.teacher_password.errors }}
+                    <label for="id_{{ login_form.teacher_password.html_name }}">{{ login_form.teacher_password.label }}</label>
+                    {{ login_form.teacher_password }}
 
                     {% if login_form.recaptcha %}
                         {{ login_form.recaptcha.errors }}

codeforlife-portal-1.0.0.post.dev373/portal/templates/redesign/register.html

@@ -0,0 +1,116 @@
+{% extends 'redesign/base_new.html' %}
+{% load staticfiles %}
+{% load app_tags %}
+
+{% block css %}
+{{ block.super }}
+{% endblock css %}
+
+{% block scripts %}
+{{ block.super }}
+{% endblock scripts %}
+
+{% block pageID %}id='homeWrapper'{% endblock %}
+
+{% block content %}
+{{ block.super }}
+
+<div id="signup_page"></div>
+
+<div class="row popup is-flex">
+    <div class="form--register form--register--teacher col-sm-6">
+        <div class="form col-sm-8 col-sm-offset-2">
+            <h1>Register as a teacher</h1>
+            <p class="body-text">Once you&rsquo;ve registered your personal details and logged in, you&rsquo;ll be able to create your school or club, or join other teachers at your institution.<br/></p>
+            <form method='post' id="form-reg-teacher">
+
+                {% csrf_token %}
+
+                {{ teacher_signup_form.non_field_errors }}
+
+                <label for="id_teacher_signup-teacher_title">{{ teacher_signup_form.teacher_title.label }}</label>
+                {{ teacher_signup_form.teacher_title }}
+                {{ teacher_signup_form.teacher_title.errors }}
+
+                <label for="id_teacher_signup-teacher_first_name">{{ teacher_signup_form.teacher_first_name.label }}</label>
+                {{ teacher_signup_form.teacher_first_name }}
+                {{ teacher_signup_form.teacher_first_name.errors }}
+
+                <label for="id_teacher_signup-teacher_last_name">{{ teacher_signup_form.teacher_last_name.label }}</label>
+                {{ teacher_signup_form.teacher_last_name }}
+                {{ teacher_signup_form.teacher_last_name.errors }}
+
+                <label for="id_teacher_signup-teacher_email">{{ teacher_signup_form.teacher_email.label }}</label>
+                {{ teacher_signup_form.teacher_email }}
+                {{ teacher_signup_form.teacher_email.errors }}
+
+                <label for="id_teacher_signup-teacher_password">{{ teacher_signup_form.teacher_password.label }}</label>
+                {{ teacher_signup_form.teacher_password }}
+                {{ teacher_signup_form.teacher_password.errors }}
+
+                <label for="id_teacher_signup-teacher_confirm_password">{{ teacher_signup_form.teacher_confirm_password.label }}</label>
+                {{ teacher_signup_form.teacher_confirm_password }}
+                {{ teacher_signup_form.teacher_confirm_password.errors }}
+
+                <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>
+
+                <button class="button--big button--primary--general-educate" type="submit" name="teacher_signup">Register</button>
+            </form>
+
+        </div>
+    </div>
+    <div class="form--register form--register--indep-student col-sm-6">
+        <div class="form col-sm-8 col-sm-offset-2">
+            <h1>Register as an independent student</h1>
+            <p class="body-text">Are you part of a school or club? If so, please <a href="{% url 'login_new' %}">log-in</a> or speak to your teacher. If you want to register as an <strong>independent student</strong>, please register below:</p>
+            <form id="form-signup-independent-student" method='post'>
+
+                {% csrf_token %}
+
+                {{ student_signup_form.non_field_errors }}
+
+                <label for="id_{{ student_signup_form.name.html_name }}">{{ student_signup_form.name.label }}</label>
+                {{ student_signup_form.name }}
+                {{ student_signup_form.name.errors }}
+
+                <label for="id_{{ student_signup_form.username.html_name }}">{{ student_signup_form.username.label }}</label>
+                {{ student_signup_form.username }}
+                {{ student_signup_form.username.errors }}
+
+                <label for="id_{{ student_signup_form.email.html_name }}">{{ student_signup_form.email.label }}</label>
+                {{ student_signup_form.email }}
+                {{ student_signup_form.email.errors }}
+
+                <label for="id_{{ student_signup_form.password.html_name }}">{{ student_signup_form.password.label }}</label>
+                {{ student_signup_form.password }}
+                {{ student_signup_form.password.errors }}
+
+                <label for="id_{{ student_signup_form.confirm_password.html_name }}">{{ student_signup_form.confirm_password.label }}</label>
+                {{ student_signup_form.confirm_password }}
+                {{ student_signup_form.confirm_password.errors }}
+
+                <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>
+
+                <button type='submit' name='student_signup' class="button--big button--primary--general-play" value='Register'>Register</button>
+            </form>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript" src="{% static 'portal/js/passwordStrength_new.js' %}"></script>
+<script>
+    var TEACHER_PASSWORD_FIELD_ID = '{{ teacher_signup_form.teacher_password.auto_id }}';
+    var INDEP_STUDENT_PASSWORD_FIELD_ID = '{{ student_signup_form.password.auto_id }}';
+</script>
+
+{% endblock content %}

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/tests/pageObjects/portal/home_page_new.py

@@ -35,6 +35,7 @@
 # program; modified versions of the program must be marked as such and not
 # identified as the original program.
 import login_page
+import signup_page
 from base_page import BasePage
 
 
@@ -46,3 +47,7 @@ class HomePage(BasePage):
     def go_to_login_page(self):
         self.browser.find_element_by_id('login_button').click()
         return login_page.LoginPage(self.browser)
+
+    def go_to_signup_page(self):
+        self.browser.find_element_by_id('signup_button').click()
+        return signup_page.SignupPage(self.browser)

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/tests/pageObjects/portal/signup_page.py

@@ -49,12 +49,34 @@ class SignupPage(BasePage):
         assert self.on_correct_page('signup_page')
 
     def signup(self, title, first_name, last_name, email, password, confirm_password):
-        Select(self.browser.find_element_by_id('id_signup-title')).select_by_value(title)
-        self.browser.find_element_by_id('id_signup-first_name').send_keys(first_name)
-        self.browser.find_element_by_id('id_signup-last_name').send_keys(last_name)
-        self.browser.find_element_by_id('id_signup-email').send_keys(email)
-        self.browser.find_element_by_id('id_signup-password').send_keys(password)
-        self.browser.find_element_by_id('id_signup-confirm_password').send_keys(confirm_password)
-
-        self.browser.find_element_by_name('signup').click()
+        Select(self.browser.find_element_by_id('id_teacher_signup-teacher_title')).select_by_value(title)
+        self.browser.find_element_by_id('id_teacher_signup-teacher_first_name').send_keys(first_name)
+        self.browser.find_element_by_id('id_teacher_signup-teacher_last_name').send_keys(last_name)
+        self.browser.find_element_by_id('id_teacher_signup-teacher_email').send_keys(email)
+        self.browser.find_element_by_id('id_teacher_signup-teacher_password').send_keys(password)
+        self.browser.find_element_by_id('id_teacher_signup-teacher_confirm_password').send_keys(confirm_password)
+
+        self.browser.find_element_by_name('teacher_signup').click()
         return email_verification_needed_page_new.EmailVerificationNeededPage(self.browser)
+
+    def independent_student_signup(self, name, username, email_address, password, confirm_password, success=True):
+        self.browser.find_element_by_id('id_student_signup-name').send_keys(name)
+        self.browser.find_element_by_id('id_student_signup-username').send_keys(username)
+        self.browser.find_element_by_id('id_student_signup-email').send_keys(email_address)
+        self.browser.find_element_by_id('id_student_signup-password').send_keys(password)
+        self.browser.find_element_by_id('id_student_signup-confirm_password').send_keys(confirm_password)
+
+        self.browser.find_element_by_name('student_signup').click()
+        if success:
+            from email_verification_needed_page_new import EmailVerificationNeededPage
+            return EmailVerificationNeededPage(self.browser)
+        else:
+            return self
+
+    def has_independent_student_signup_failed(self):
+        if not self.element_exists_by_css('.errorlist'):
+            return False
+
+        errors = self.browser.find_element_by_id('form-signup-independent-student').find_element_by_class_name('errorlist').text
+        error = 'Password not strong enough, consider using at least 6 characters'
+        return error in errors

{codeforlife-portal-1.0.0.post.dev367 → codeforlife-portal-1.0.0.post.dev373}/portal/tests/pageObjects/portal/teach/dashboard_page_new.py

@@ -37,8 +37,6 @@
 from teach_base_page_new import TeachBasePage
 from selenium.webdriver.support.ui import Select
 
-import time
-
 
 class TeachDashboardPage(TeachBasePage):
     def __init__(self, browser):