diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html index cd1e90466..5323d3f87 100644 --- a/app/templates/views/add-service.html +++ b/app/templates/views/add-service.html @@ -31,9 +31,7 @@ GOV.UK Notify | Set up service
{{ textbox(form.name) }} - {{ page_footer( - 'Continue' - ) }} + {{ page_footer('Continue') }}
diff --git a/app/templates/views/check-email.html b/app/templates/views/check-email.html index 487f5de73..07452d490 100644 --- a/app/templates/views/check-email.html +++ b/app/templates/views/check-email.html @@ -6,13 +6,13 @@ GOV.UK Notify | Send email {% block maincolumn_content %} -

Send email

+

Send email

-

This page will be where we check the email messages we're about to send

+

This page will be where we check the email messages we're about to send

-

- Send email messages -

+

+ Send email messages +

{% endblock %} diff --git a/app/templates/views/check-sms.html b/app/templates/views/check-sms.html index 89726050e..c6ae85aee 100644 --- a/app/templates/views/check-sms.html +++ b/app/templates/views/check-sms.html @@ -5,60 +5,60 @@ {% from "components/page-footer.html" import page_footer %} {% block page_title %} - GOV.UK Notify | Send text messages + GOV.UK Notify | Send text messages {% endblock %} {% block maincolumn_content %} -

Send text messages

+

Send text messages

- {% if upload_result.rejects %} -

The following numbers are invalid

- {% for rejected in upload_result.rejects %} -

Line {{rejected.line_number}}: {{rejected.phone }} - {% endfor %} -

Go back and resolve errors

+ {% if upload_result.rejects %} +

The following numbers are invalid

+ {% for rejected in upload_result.rejects %} +

Line {{rejected.line_number}}: {{rejected.phone }} + {% endfor %} +

Go back and resolve errors

- {% else %} + {% else %} -

Check and confirm

-
+

Check and confirm

+ - {{ page_footer( - button_text = "Send {} text messages".format(upload_result.valid|count), - back_link = url_for(".send_sms", service_id=service_id) - )}} + {{ page_footer( + button_text = "Send {} text messages".format(upload_result.valid|count), + back_link = url_for(".send_sms", service_id=service_id) + )}} - {% if upload_result.valid | count > 6 %} -

First three message in file

- {% for recipient in upload_result.valid[:3] %} - {{ sms_message(message_template|replace_placeholders( - recipient), - '{}'.format(recipient['phone']) - )}} - {% endfor %} -

Last three messages in file

- {% for recipient in upload_result.valid[-3:] %} - {{ sms_message(message_template|replace_placeholders( - recipient), - '{}'.format(recipient['phone']) - )}} - {% endfor %} - {% else %} -

All messages in file

- {% for recipient in upload_result.valid %} - {{ sms_message(message_template|replace_placeholders( - recipient), - '{}'.format(recipient['phone']) - )}} - {% endfor %} - {% endif %} + {% if upload_result.valid | count > 6 %} +

First three message in file

+ {% for recipient in upload_result.valid[:3] %} + {{ sms_message(message_template|replace_placeholders( + recipient), + '{}'.format(recipient['phone']) + )}} + {% endfor %} +

Last three messages in file

+ {% for recipient in upload_result.valid[-3:] %} + {{ sms_message(message_template|replace_placeholders( + recipient), + '{}'.format(recipient['phone']) + )}} + {% endfor %} + {% else %} +

All messages in file

+ {% for recipient in upload_result.valid %} + {{ sms_message(message_template|replace_placeholders( + recipient), + '{}'.format(recipient['phone']) + )}} + {% endfor %} + {% endif %} - {{ page_footer( - button_text = "Send {} text messages".format(upload_result.valid|count), - back_link = url_for(".send_sms", service_id=service_id) - )}} + {{ page_footer( + button_text = "Send {} text messages".format(upload_result.valid|count), + back_link = url_for(".send_sms", service_id=service_id) + )}} -
- {% endif %} + + {% endif %} {% endblock %} diff --git a/app/templates/views/edit-template.html b/app/templates/views/edit-template.html index 0b0521f71..daeab9d4a 100644 --- a/app/templates/views/edit-template.html +++ b/app/templates/views/edit-template.html @@ -8,28 +8,28 @@ GOV.UK Notify | Edit template {% block maincolumn_content %} -

{{ h1 }}

+

{{ h1 }}

-
- {{ textbox(form.name) }} -
- - Template type - - -
- {{ textbox(form.template_content, highlight_tags=True) }} - {{ page_footer( - 'Save', - delete_link=url_for('.delete_service_template', service_id=service_id, template_id=template_id) if template_id or None, - delete_link_text='delete this template', - back_link=url_for('.manage_service_templates', service_id=service_id), - back_link_text='Back to templates' - ) }} -
+
+ {{ textbox(form.name) }} +
+ + Template type + + +
+ {{ textbox(form.template_content, highlight_tags=True) }} + {{ page_footer( + 'Save', + delete_link=url_for('.delete_service_template', service_id=service_id, template_id=template_id) if template_id or None, + delete_link_text='delete this template', + back_link=url_for('.manage_service_templates', service_id=service_id), + back_link_text='Back to templates' + ) }} +
{% endblock %} diff --git a/app/templates/views/email-not-received.html b/app/templates/views/email-not-received.html index 0ebb1e64d..935791da2 100644 --- a/app/templates/views/email-not-received.html +++ b/app/templates/views/email-not-received.html @@ -13,13 +13,11 @@ GOV.UK Notify

Check your email address

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

-

-

-
- {{ textbox(form.email_address) }} - Your email address must end in .gov.uk - {{ page_footer('Resend confirmation code') }} -
+ +
+ {{ textbox(form.email_address, hint='Your email address must end in .gov.uk') }} + {{ page_footer('Resend confirmation code') }} +
diff --git a/app/templates/views/forgot-password.html b/app/templates/views/forgot-password.html index e0dfc0ce6..b8ec775b5 100644 --- a/app/templates/views/forgot-password.html +++ b/app/templates/views/forgot-password.html @@ -15,7 +15,7 @@ GOV.UK Notify

If you have forgotten your password, we can send you an email to create a new password.

- {{ textbox(form.email_address) }} + {{ textbox(form.email_address) }} {{ page_footer("Send email") }}
diff --git a/app/templates/views/job.html b/app/templates/views/job.html index 60851b08b..15435f040 100644 --- a/app/templates/views/job.html +++ b/app/templates/views/job.html @@ -10,32 +10,32 @@ GOV.UK Notify | Notifications activity {% block maincolumn_content %}

- {{ uploaded_file_name }} -

+ {{ uploaded_file_name }} + -

+

{{ banner(flash_message, with_tick=True) }} -

+

- +

Sent with template {{ template_used }} on {{ uploaded_file_time | format_datetime}} @@ -61,8 +61,8 @@ GOV.UK Notify | Notifications activity align='right', status='error' if item.status == 'Failed' else 'default' ) %} - {{ item.status }} {{ item.time }} - {% endcall %} + {{ item.status }} {{ item.time }} + {% endcall %} {% endcall %} {% endblock %} diff --git a/app/templates/views/jobs.html b/app/templates/views/jobs.html index 8e16742f2..373cb2fbb 100644 --- a/app/templates/views/jobs.html +++ b/app/templates/views/jobs.html @@ -7,28 +7,28 @@ GOV.UK Notify | Notifications activity {% block maincolumn_content %} -

Notifications activity

+

Notifications activity

- {% call(item) list_table( - jobs, - caption="Recent activity", - caption_visible=False, - empty_message='You haven’t sent any notifications yet', - field_headings=['Job', 'File', 'Time', 'Status'] - ) %} - {% call field() %} - {{ item.id }} - {% endcall %} - {% call field() %} - {{ item.original_file_name }} - {% endcall %} - {% call field() %} - {{ item.created_at | format_datetime}} - {% endcall %} - {% call field() %} - {{ item.status }} - {% endcall %} - {% endcall %} + {% call(item) list_table( + jobs, + caption="Recent activity", + caption_visible=False, + empty_message='You haven’t sent any notifications yet', + field_headings=['Job', 'File', 'Time', 'Status'] + ) %} + {% call field() %} + {{ item.id }} + {% endcall %} + {% call field() %} + {{ item.original_file_name }} + {% endcall %} + {% call field() %} + {{ item.created_at | format_datetime}} + {% endcall %} + {% call field() %} + {{ item.status }} + {% endcall %} + {% endcall %} {% endblock %} diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index 90259ee01..13c7f73aa 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -7,13 +7,13 @@ GOV.UK Notify | Manage users {% block maincolumn_content %} -

Manage users

+

Manage users

-

Here's where you can add or remove users of a service.

+

Here's where you can add or remove users of a service.

- {{ page_footer( - back_link = url_for('.service_dashboard', service_id=service_id), - back_link_text = 'Back to dashboard' - ) }} + {{ page_footer( + back_link = url_for('.service_dashboard', service_id=service_id), + back_link_text = 'Back to dashboard' + ) }} {% endblock %} diff --git a/app/templates/views/new-password.html b/app/templates/views/new-password.html index e33632a49..fdd3d968a 100644 --- a/app/templates/views/new-password.html +++ b/app/templates/views/new-password.html @@ -9,20 +9,24 @@ GOV.UK Notify {% block maincolumn_content %}
-
- {% if user %} -

Create a new password

- -

You can now create a new password for your account.

- -
- {{ textbox(form.new_password, hint="Your password must have at least 10 characters") }} - {{ page_footer("Continue") }} -
- {% else %} - Message about email address does not exist. Some one needs to figure out the words here. - {% endif %} -
+
+ {% if user %} +

+ Create a new password +

+

+ You can now create a new password for your account. +

+
+ {{ textbox(form.new_password, hint="Your password must have at least 10 characters") }} + {{ page_footer("Continue") }} +
+ {% else %} +

+ Message about email address does not exist. Some one needs to figure out the words here. +

+ {% endif %} +
{% endblock %} diff --git a/app/templates/views/notification.html b/app/templates/views/notification.html index b10b80940..78da91d3d 100644 --- a/app/templates/views/notification.html +++ b/app/templates/views/notification.html @@ -10,24 +10,24 @@ GOV.UK Notify | Notifications activity {% block maincolumn_content %} -

- Text message -

+

+ Text message +

-
-
- {{ sms_message(message.message, message.phone) }} -
-
- {{ banner( - "{} {}".format(message.status, delivered_at) - ) }} -
-
+
+
+ {{ sms_message(message.message, message.phone) }} +
+
+ {{ banner( + "{} {}".format(message.status, delivered_at) + ) }} +
+
- {{ page_footer( - back_link = url_for('.view_job', service_id=service_id, job_id=job_id), - back_link_text = 'View other messages in this job' - ) }} + {{ page_footer( + back_link = url_for('.view_job', service_id=service_id, job_id=job_id), + back_link_text = 'View other messages in this job' + ) }} {% endblock %} diff --git a/app/templates/views/password-reset-sent.html b/app/templates/views/password-reset-sent.html index a636ab2f6..b00a1f7de 100644 --- a/app/templates/views/password-reset-sent.html +++ b/app/templates/views/password-reset-sent.html @@ -7,12 +7,12 @@ GOV.UK Notify | {% block maincolumn_content %}
-
-

GOV.UK Notify

+
+

GOV.UK Notify

-

You have been sent an email containing a link to reset your password.

+

You have been sent an email containing a link to reset your password.

-
+
{% endblock %} diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html index 4fa547344..694f957e3 100644 --- a/app/templates/views/register-from-invite.html +++ b/app/templates/views/register-from-invite.html @@ -7,29 +7,29 @@ GOV.UK Notify | Create a user account {% block maincolumn_content %}
-
-

Create an account

+
+

Create an account

-

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

+

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

-

- - -

-

- - -

-

- -
- Your password must have at least 10 characters -

+

+ + +

+

+ + +

+

+ +
+ Your password must have at least 10 characters +

-

- Continue -

-
+

+ Continue +

+
{% endblock %} diff --git a/app/templates/views/register.html b/app/templates/views/register.html index 6febe768c..76917acc8 100644 --- a/app/templates/views/register.html +++ b/app/templates/views/register.html @@ -9,21 +9,19 @@ GOV.UK Notify | Create an account {% block maincolumn_content %}
-
-

Create an account

+
+

Create an account

-

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

+

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

-
- {{ form.hidden_tag() }} - - {{ textbox(form.name) }} - {{ textbox(form.email_address, hint="Your email address must end in .gov.uk") }} - {{ textbox(form.mobile_number) }} - {{ textbox(form.password, hint="Your password must have at least 10 characters") }} - {{ page_footer("Continue") }} -
-
+
+ {{ textbox(form.name) }} + {{ textbox(form.email_address, hint="Your email address must end in .gov.uk") }} + {{ textbox(form.mobile_number) }} + {{ textbox(form.password, hint="Your password must have at least 10 characters") }} + {{ page_footer("Continue") }} +
+
{% endblock %} diff --git a/app/templates/views/send-email.html b/app/templates/views/send-email.html index 94edfab93..fd4f81830 100644 --- a/app/templates/views/send-email.html +++ b/app/templates/views/send-email.html @@ -6,12 +6,12 @@ GOV.UK Notify | Send email {% block maincolumn_content %} -

Send email

+

Send email

-

This page will be where we construct email messages

+

This page will be where we construct email messages

-

- Continue -

+

+ Continue +

{% endblock %} diff --git a/app/templates/views/service_dashboard.html b/app/templates/views/service_dashboard.html index 9ed330140..638e6d322 100644 --- a/app/templates/views/service_dashboard.html +++ b/app/templates/views/service_dashboard.html @@ -3,44 +3,44 @@ {% from "components/big-number.html" import big_number %} {% block page_title %} - GOV.UK Notify | Dashboard + GOV.UK Notify | Dashboard {% endblock %} {% block maincolumn_content %} - + {% call(item) list_table( [], caption="Recent text messages", - empty_message='You haven’t sent any text messages yet', + empty_message='You haven’t sent any text messages yet', field_headings=['Job', 'File', 'Time', 'Status'] ) %} - {% call field() %} - {{ item.file }} - {% endcall %} - {% call field() %} - {{ item.job }} - {% endcall %} - {% call field() %} - {{ item.time }} - {% endcall %} - {% call field() %} - {{ item.status }} - {% endcall %} + {% call field() %} + {{ item.file }} + {% endcall %} + {% call field() %} + {{ item.job }} + {% endcall %} + {% call field() %} + {{ item.time }} + {% endcall %} + {% call field() %} + {{ item.status }} + {% endcall %} {% endcall %} {% endblock %} diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 4dc931217..36f0563f4 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -7,26 +7,26 @@ GOV.UK Notify | Get started {% block maincolumn_content %}
-
-

GOV.UK Notify

+
+

GOV.UK Notify

-

- Use GOV.UK Notify to send notifications by text message, email and letter. -

-

- We're making it easy to keep your users informed. -

-

- If you work for a UK government department or agency you can set up a test account now. -

-

- Set up an account -

-

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

+

+ Use GOV.UK Notify to send notifications by text message, email and letter. +

+

+ We're making it easy to keep your users informed. +

+

+ If you work for a UK government department or agency you can set up a test account now. +

+

+ Set up an account +

+

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

-
+
{% endblock %} diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index 9dff86402..a0638583a 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -9,17 +9,17 @@ Sign in {% block maincolumn_content %}
-
-

Sign in

+
+

Sign in

-

If you do not have an account, you can register for one now.

+

If you do not have an account, you can register for one now.

-
- {{ textbox(form.email_address) }} - {{ textbox(form.password) }} - {{ page_footer("Continue", back_link=url_for('.forgot_password'), back_link_text="Forgotten password?") }} -
-
+
+ {{ textbox(form.email_address) }} + {{ textbox(form.password) }} + {{ page_footer("Continue", back_link=url_for('.forgot_password'), back_link_text="Forgotten password?") }} +
+
{% endblock %} diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html index b047a01f3..6aa08b29f 100644 --- a/app/templates/views/two-factor.html +++ b/app/templates/views/two-factor.html @@ -9,18 +9,20 @@ GOV.UK Notify | Text verification {% block maincolumn_content %}
-
-

Text verification

+
+

Text verification

-

We've sent you a text message with a verification code.

+

We've sent you a text message with a verification code.

- -
- {{ textbox(form.sms_code) }} - I haven't received a text - {{ page_footer("Continue") }} -
-
+
+ {{ textbox(form.sms_code) }} + {{ page_footer( + "Continue", + back_link=url_for('.verification_code_not_received'), + back_link_text='I haven’t received a text' + ) }} +
+
{% endblock %} diff --git a/app/templates/views/verify-mobile.html b/app/templates/views/verify-mobile.html index 0538c0a5f..dfcae50a7 100644 --- a/app/templates/views/verify-mobile.html +++ b/app/templates/views/verify-mobile.html @@ -7,21 +7,21 @@ GOV.UK Notify | Confirm mobile number {% block maincolumn_content %}
-
-

Confirm your mobile number

+
+

Confirm your mobile number

-

We've sent you a confirmation code by text message.

+

We've sent you a confirmation code by text message.

-

-

+

+

-

- Continue -

-
+

+ Continue +

+
{% endblock %} diff --git a/app/templates/views/verify.html b/app/templates/views/verify.html index b6fba7936..b7a589a4e 100644 --- a/app/templates/views/verify.html +++ b/app/templates/views/verify.html @@ -9,19 +9,23 @@ GOV.UK Notify | Confirm email address and mobile number {% block maincolumn_content %}
-
-

Activate your account

+
+

Activate your account

-

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

+

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

-
- {{ textbox(form.email_code) }} - I haven't received an email - {{ textbox(form.sms_code) }} - I haven't received a text - {{ page_footer("Continue") }} -
-
+
+ {{ textbox(form.email_code) }} +

+ I haven't received an email +

+ {{ textbox(form.sms_code) }} +

+ I haven't received a text +

+ {{ page_footer("Continue") }} +
+
{% endblock %} diff --git a/tests/app/main/views/test_new_password.py b/tests/app/main/views/test_new_password.py index 22c934cbc..a3a17061a 100644 --- a/tests/app/main/views/test_new_password.py +++ b/tests/app/main/views/test_new_password.py @@ -16,9 +16,8 @@ def test_should_render_new_password_template(app_, with app_.test_client() as client: token = generate_token(api_user_active.email_address) response = client.get(url_for('.new_password', token=token)) - print(response.location) assert response.status_code == 200 - assert ' You can now create a new password for your account.' in response.get_data(as_text=True) + assert 'You can now create a new password for your account.' in response.get_data(as_text=True) @pytest.mark.skipif(True, reason='Password reset no implemented')