From f6967a8f2368dc38fd97be809cd44489116e04b5 Mon Sep 17 00:00:00 2001 From: Lorena Sutherland Date: Wed, 2 Dec 2015 11:56:59 +0000 Subject: [PATCH 1/7] Amend line of text --- app/templates/register.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/register.html b/app/templates/register.html index 7a8f41f8b..e15bc137e 100644 --- a/app/templates/register.html +++ b/app/templates/register.html @@ -12,7 +12,7 @@ GOV.UK Notify | Create an account

If you've used GOV.UK Notify before, sign in to your account.

-

You need to have access to your email account and a mobile phone to register.

+

You need access to your email account and a mobile phone to register.

{{ form.hidden_tag() }} From 058d7c5f9642ebff89b9e0c2e8eee64b48d70be5 Mon Sep 17 00:00:00 2001 From: Lorena Sutherland Date: Wed, 2 Dec 2015 13:57:03 +0000 Subject: [PATCH 2/7] Change password label --- app/main/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/forms.py b/app/main/forms.py index bc013fccc..44ee24c1a 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -9,7 +9,7 @@ class LoginForm(Form): DataRequired(message='Email cannot be empty'), Email(message='Please enter a valid email address') ]) - password = PasswordField('Password', validators=[ + password = PasswordField('Create a password', validators=[ DataRequired(message='Please enter your password') ]) From 571f09881e518b0d77679fbfe1949879fc0eeefa Mon Sep 17 00:00:00 2001 From: Lorena Sutherland Date: Wed, 2 Dec 2015 15:23:03 +0000 Subject: [PATCH 3/7] Amend name & password labels --- app/main/forms.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 44ee24c1a..61f2f4e45 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -9,7 +9,7 @@ class LoginForm(Form): DataRequired(message='Email cannot be empty'), Email(message='Please enter a valid email address') ]) - password = PasswordField('Create a password', validators=[ + password = PasswordField('Password', validators=[ DataRequired(message='Please enter your password') ]) @@ -19,7 +19,7 @@ mobile_number = "^\\+44[\\d]{10}$" class RegisterUserForm(Form): - name = StringField('Name', + name = StringField('Full name', validators=[DataRequired(message='Name can not be empty')]) email_address = StringField('Email address', validators=[ Length(min=5, max=255), @@ -30,6 +30,6 @@ class RegisterUserForm(Form): mobile_number = StringField('Mobile phone number', validators=[DataRequired(message='Please enter your mobile number'), Regexp(regex=mobile_number, message='Please enter a +44 mobile number')]) - password = PasswordField('Password', + password = PasswordField('Create a password', validators=[DataRequired(message='Please enter your password'), Length(10, 255, message='Password must be at least 10 characters')]) From f4140ea49b8abceed761b956dfc0fc2e03f072d5 Mon Sep 17 00:00:00 2001 From: Lorena Sutherland Date: Wed, 2 Dec 2015 15:32:21 +0000 Subject: [PATCH 4/7] Amend line of text --- app/templates/email-not-received.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/email-not-received.html b/app/templates/email-not-received.html index 462fbb961..758589199 100644 --- a/app/templates/email-not-received.html +++ b/app/templates/email-not-received.html @@ -10,7 +10,7 @@ GOV.UK Notify

Check your email address

-

Check your email address is correct and resend a confirmation code.

+

Check your email address is correct and then resend the confirmation code.

@@ -25,4 +25,4 @@ GOV.UK Notify

-{% endblock %} \ No newline at end of file +{% endblock %} From 71f9be2b7e4fb68524b22a290c7a453ca7a9af65 Mon Sep 17 00:00:00 2001 From: Lorena Sutherland Date: Wed, 2 Dec 2015 15:33:24 +0000 Subject: [PATCH 5/7] Amend line of text --- app/templates/text-not-received.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/text-not-received.html b/app/templates/text-not-received.html index ce8fff18c..4b332c894 100644 --- a/app/templates/text-not-received.html +++ b/app/templates/text-not-received.html @@ -10,7 +10,7 @@ GOV.UK Notify

Check your mobile number

-

Check your mobile phone number is correct and resend a confirmation code.

+

Check your mobile phone number is correct and then resend the confirmation code.

@@ -24,4 +24,4 @@ GOV.UK Notify

-{% endblock %} \ No newline at end of file +{% endblock %} From 47a7b79b21469086db06dba559ef6e1dc3614b6a Mon Sep 17 00:00:00 2001 From: Lorena Sutherland Date: Wed, 2 Dec 2015 15:44:07 +0000 Subject: [PATCH 6/7] Amend heading text New heading corresponds to design pattern for confirming accounts --- app/templates/verify.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/verify.html b/app/templates/verify.html index 729f099c2..2aeec8418 100644 --- a/app/templates/verify.html +++ b/app/templates/verify.html @@ -8,10 +8,10 @@ GOV.UK Notify | Confirm email address and mobile number
-

Confirm your email address and mobile number

+

Activate your account

You need to prove the contact details you gave us are yours.

-

We've sent you an email and a text message containing confirmation codes.

+

We've sent you confirmation codes in an email and a text message.

Activate your account

You need to prove the contact details you gave us are yours.

-

We've sent you confirmation codes in an email and a text message.

+

We've sent you confirmation codes by email and text message. You need to enter both codes here.