From cd36182ea67e64a3f300adfef74b5de4c4121353 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 6 Dec 2019 07:53:46 +0000 Subject: [PATCH] Update all links to use GOVUK Frontend style Includes: - turning off :visited styles to match existing design - swapping heading classes used to make links bold for the GOVUK Frontend bold override class - adding visually hidden text to some links to make them work when isolated from their context We may need to revisit whether some links, such as those for documentation and features, may benefit from having some indication that their target has been visited. --- app/templates/components/big-number.html | 4 ++-- app/templates/components/browse-list.html | 2 +- app/templates/components/file-upload.html | 2 +- app/templates/components/folder-path.html | 12 +++++----- app/templates/components/page-footer.html | 4 ++-- app/templates/components/pill.html | 2 +- .../components/previous-next-navigation.html | 4 ++-- app/templates/components/show-more.html | 2 +- app/templates/components/status-box.html | 2 +- app/templates/components/sub-navigation.html | 2 +- app/templates/components/table.html | 6 ++--- app/templates/components/task-list.html | 2 +- app/templates/components/textbox.html | 2 +- app/templates/error/401.html | 2 +- app/templates/error/404.html | 2 +- app/templates/error/410.html | 2 +- app/templates/error/413.html | 2 +- app/templates/error/500.html | 4 ++-- app/templates/main_nav.html | 22 +++++++++---------- app/templates/org_nav.html | 8 +++---- app/templates/org_template.html | 4 ++-- .../check/not-allowed-to-send-to.html | 2 +- .../partials/check/too-many-messages.html | 2 +- .../trying-to-send-letters-in-trial-mode.html | 2 +- .../partials/jobs/notifications.html | 6 ++--- .../partials/notifications/status.html | 2 +- .../templates/guidance-character-count.html | 2 +- .../partials/templates/guidance-postage.html | 2 +- .../templates/guidance-send-a-document.html | 2 +- app/templates/partials/tour.html | 2 +- .../views/activity/notifications.html | 2 +- .../views/agreement/agreement-public.html | 2 +- .../agreement/service-agreement-choose.html | 2 +- .../agreement/service-agreement-signed.html | 2 +- .../views/agreement/service-agreement.html | 2 +- .../callbacks/delivery-status-callback.html | 2 +- .../received-text-messages-callback.html | 2 +- app/templates/views/api/index.html | 10 ++++----- app/templates/views/api/keys.html | 2 +- app/templates/views/api/whitelist.html | 6 ++--- app/templates/views/check/column-errors.html | 6 ++--- app/templates/views/check/ok.html | 4 ++-- app/templates/views/check/row-errors.html | 4 ++-- app/templates/views/choose-account.html | 6 ++--- .../views/conversations/conversation.html | 2 +- .../views/dashboard/_inbox_messages.html | 4 ++-- app/templates/views/dashboard/_jobs.html | 4 ++-- app/templates/views/dashboard/_upcoming.html | 2 +- .../dashboard/all-template-statistics.html | 2 +- .../views/dashboard/template-statistics.html | 2 +- .../views/dashboard/write-first-messages.html | 2 +- app/templates/views/documentation.html | 4 ++-- .../views/edit-user-permissions.html | 10 +++++++-- .../views/email-branding/select-branding.html | 2 +- app/templates/views/email-link-invalid.html | 2 +- app/templates/views/features.html | 18 +++++++-------- app/templates/views/features/emails.html | 10 ++++----- app/templates/views/features/letters.html | 8 +++---- .../views/features/text-messages.html | 8 +++---- .../find-services/find-services-by-name.html | 2 +- .../views/find-users/find-users-by-email.html | 2 +- .../views/find-users/user-information.html | 6 ++--- app/templates/views/get-started.html | 20 ++++++++--------- app/templates/views/inbound-sms-admin.html | 2 +- app/templates/views/integration-testing.html | 2 +- app/templates/views/jobs/job.html | 2 +- .../select-letter-branding.html | 2 +- app/templates/views/manage-users.html | 4 ++-- app/templates/views/message-status.html | 4 ++-- app/templates/views/notifications.html | 2 +- app/templates/views/notifications/check.html | 2 +- .../views/notifications/notification.html | 10 ++++----- .../views/organisations/add-organisation.html | 4 ++-- app/templates/views/organisations/index.html | 4 ++-- .../organisations/organisation/index.html | 2 +- .../organisation/trial-mode-services.html | 2 +- .../organisation/users/index.html | 2 +- .../views/platform-admin/_base_template.html | 2 +- .../views/platform-admin/reports.html | 8 +++---- .../views/platform-admin/services.html | 2 +- app/templates/views/pricing/how-to-pay.html | 4 ++-- app/templates/views/pricing/index.html | 6 ++--- app/templates/views/privacy.html | 10 ++++----- app/templates/views/providers/providers.html | 2 +- app/templates/views/roadmap.html | 2 +- app/templates/views/security.html | 12 +++++----- app/templates/views/send-test.html | 4 ++-- app/templates/views/send.html | 2 +- app/templates/views/service-settings.html | 12 +++++----- .../email-reply-to/_verify-updates.html | 2 +- .../service-settings/email_reply_to.html | 2 +- .../letter-contact-details.html | 4 ++-- .../preview-letter-branding.html | 2 +- .../service-settings/request-to-go-live.html | 2 +- .../views/service-settings/set-auth-type.html | 4 ++-- .../service-settings/set-inbound-sms.html | 6 ++--- .../set-international-sms.html | 2 +- .../views/service-settings/set-letter.html | 2 +- .../views/service-settings/set-sms.html | 2 +- .../views/service-settings/sms-senders.html | 2 +- app/templates/views/signedout.html | 12 +++++----- app/templates/views/signin.html | 2 +- app/templates/views/styleguide.html | 8 +++---- app/templates/views/support/bat-phone.html | 6 ++--- app/templates/views/support/index.html | 2 +- .../views/support/report-problem.html | 2 +- app/templates/views/templates/_template.html | 16 +++++++------- .../views/templates/_template_list.html | 6 ++--- .../views/templates/action_blocked.html | 2 +- .../views/templates/choose-reply.html | 6 ++--- app/templates/views/templates/choose.html | 2 +- .../views/templates/choose_history.html | 2 +- app/templates/views/templates/copy.html | 10 ++++----- .../views/templates/set-template-sender.html | 2 +- app/templates/views/templates/template.html | 6 ++--- app/templates/views/terms-of-use.html | 10 ++++----- app/templates/views/trial-mode.html | 2 +- app/templates/views/uploads/choose-file.html | 2 +- app/templates/views/uploads/preview.html | 2 +- app/templates/views/usage.html | 2 +- app/templates/views/using-notify.html | 14 ++++++------ app/templates/withnav_template.html | 4 ++-- app/templates/withoutnav_template.html | 2 +- 123 files changed, 272 insertions(+), 266 deletions(-) diff --git a/app/templates/components/big-number.html b/app/templates/components/big-number.html index 8ca33b3fb..8b5176a04 100644 --- a/app/templates/components/big-number.html +++ b/app/templates/components/big-number.html @@ -1,6 +1,6 @@ {% macro big_number(number, label, link=None, currency='', smaller=False, smallest=False) %} {% if link %} - + {% endif %}
@@ -42,7 +42,7 @@
{% if failures %} {% if failure_link %} - + {{ "{:,}".format(failures) }} failed – {{ failure_percentage }}% diff --git a/app/templates/components/browse-list.html b/app/templates/components/browse-list.html index d59e9ae37..43ce53729 100644 --- a/app/templates/components/browse-list.html +++ b/app/templates/components/browse-list.html @@ -5,7 +5,7 @@ {% for item in items %} {% if item.title and item.link %}
  • - {{ item.title }} + {{ item.title }} {% if item.hint %}
    {{ item.hint }} diff --git a/app/templates/components/file-upload.html b/app/templates/components/file-upload.html index 647629248..1908f1e48 100644 --- a/app/templates/components/file-upload.html +++ b/app/templates/components/file-upload.html @@ -32,7 +32,7 @@ {% if alternate_link and alternate_link_text %} - or {{ alternate_link_text }} + or {{ alternate_link_text }} {% endif %} diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html index 5400e91c2..0d1900745 100644 --- a/app/templates/components/folder-path.html +++ b/app/templates/components/folder-path.html @@ -17,12 +17,12 @@ {% else %} {% if folder.id %} {% if current_user.has_template_folder_permission(folder) %} - {{ folder.name }} + {{ folder.name }} {% else %} {{ folder.name }} {% endif %} {% else %} - Templates + Templates {% endif %} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} {% endif %} @@ -40,7 +40,7 @@ {% if folder_path %}

    {% if folder_path|length == 1 %} - Services + Services {{ folder_path_separator() }} {% endif %} {% for folder in folder_path %} @@ -51,15 +51,15 @@ {% else %} {% if folder.id %} {% if current_user.has_template_folder_permission(folder) %} - {{ folder.name }} + {{ folder.name }} {% else %} {{ folder.name }} {% endif %} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} {% elif folder.parent_id == None %} - {{ from_service.name }} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} + {{ from_service.name }} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} {% else %} - {{ from_service.name }} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} + {{ from_service.name }} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} {% endif %} {% endif %} {% endfor %} diff --git a/app/templates/components/page-footer.html b/app/templates/components/page-footer.html index fb9f478be..deae3e7cf 100644 --- a/app/templates/components/page-footer.html +++ b/app/templates/components/page-footer.html @@ -26,11 +26,11 @@ {% endif %} {% if delete_link %} - {{ delete_link_text }} + {{ delete_link_text }} {% endif %} {% if secondary_link and secondary_link_text %} - {{ secondary_link_text }} + {{ secondary_link_text }} {% endif %}

    {% endmacro %} diff --git a/app/templates/components/pill.html b/app/templates/components/pill.html index bcbb5408b..d6a416522 100644 --- a/app/templates/components/pill.html +++ b/app/templates/components/pill.html @@ -13,7 +13,7 @@
    {% else %}
  • - + {% endif %} {% if show_count %} {{ big_number(count, **big_number_args) }} diff --git a/app/templates/components/previous-next-navigation.html b/app/templates/components/previous-next-navigation.html index b73846c6a..483dc3f18 100644 --- a/app/templates/components/previous-next-navigation.html +++ b/app/templates/components/previous-next-navigation.html @@ -4,7 +4,7 @@
    • diff --git a/app/templates/error/401.html b/app/templates/error/401.html index 74747f50e..be999a765 100644 --- a/app/templates/error/401.html +++ b/app/templates/error/401.html @@ -4,6 +4,6 @@

    You’re not authorised to see this page

    -

    Sign in to GOV.UK Notify and try again.

    +

    Sign in to GOV.UK Notify and try again.

    {% endblock %} diff --git a/app/templates/error/404.html b/app/templates/error/404.html index acb43af52..170b4acc0 100644 --- a/app/templates/error/404.html +++ b/app/templates/error/404.html @@ -13,7 +13,7 @@ If you pasted the web address, check you copied the entire address.

    - If the web address is correct or you selected a link or button, contact us. + If the web address is correct or you selected a link or button, contact us.

    diff --git a/app/templates/error/410.html b/app/templates/error/410.html index acb43af52..170b4acc0 100644 --- a/app/templates/error/410.html +++ b/app/templates/error/410.html @@ -13,7 +13,7 @@ If you pasted the web address, check you copied the entire address.

    - If the web address is correct or you selected a link or button, contact us. + If the web address is correct or you selected a link or button, contact us.

    diff --git a/app/templates/error/413.html b/app/templates/error/413.html index 4dfddc603..28304e083 100644 --- a/app/templates/error/413.html +++ b/app/templates/error/413.html @@ -12,7 +12,7 @@ Files must be smaller than 5 MB.

    - Go back and try again. + Go back and try again.

    diff --git a/app/templates/error/500.html b/app/templates/error/500.html index 0d3109996..0d352163b 100644 --- a/app/templates/error/500.html +++ b/app/templates/error/500.html @@ -10,10 +10,10 @@ Try again later.

    - You can check our system status page to see if there are any known issues. + You can check our system status page to see if there are any known issues.

    - To report a problem, email notify-support@digital.cabinet-office.gov.uk + To report a problem, email notify-support@digital.cabinet-office.gov.uk

    diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index 92c05dd6c..50e17b29d 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -5,32 +5,32 @@ diff --git a/app/templates/org_nav.html b/app/templates/org_nav.html index a9f518e11..dcf8cba8f 100644 --- a/app/templates/org_nav.html +++ b/app/templates/org_nav.html @@ -1,10 +1,10 @@ diff --git a/app/templates/org_template.html b/app/templates/org_template.html index 32bbdab14..8de05e493 100644 --- a/app/templates/org_template.html +++ b/app/templates/org_template.html @@ -8,12 +8,12 @@
    {% if current_user.platform_admin %} - All organisations + All organisations {% endif %}
    {{ current_org.name }}
    - Switch service + Switch service
    diff --git a/app/templates/partials/check/not-allowed-to-send-to.html b/app/templates/partials/check/not-allowed-to-send-to.html index 7ab180295..d3ee32933 100644 --- a/app/templates/partials/check/not-allowed-to-send-to.html +++ b/app/templates/partials/check/not-allowed-to-send-to.html @@ -7,6 +7,6 @@ {%- endif %}

    - In trial mode you can only + In trial mode you can only send to yourself and members of your team

    diff --git a/app/templates/partials/check/too-many-messages.html b/app/templates/partials/check/too-many-messages.html index a26fb9a13..341622ba5 100644 --- a/app/templates/partials/check/too-many-messages.html +++ b/app/templates/partials/check/too-many-messages.html @@ -8,7 +8,7 @@

    You can only send {{ current_service.message_limit }} messages per day {%- if current_service.trial_mode %} - in trial mode + in trial mode {%- endif -%} .

    diff --git a/app/templates/partials/check/trying-to-send-letters-in-trial-mode.html b/app/templates/partials/check/trying-to-send-letters-in-trial-mode.html index 43f225e75..55c8f784d 100644 --- a/app/templates/partials/check/trying-to-send-letters-in-trial-mode.html +++ b/app/templates/partials/check/trying-to-send-letters-in-trial-mode.html @@ -3,6 +3,6 @@ {{ 'this letter' if count_of_recipients == 1 else 'these letters' }}

    - In trial mode you + In trial mode you can only preview how your letters will look

    diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html index 869573da2..842a9d805 100644 --- a/app/templates/partials/jobs/notifications.html +++ b/app/templates/partials/jobs/notifications.html @@ -7,7 +7,7 @@

    Sending - {{ job.template.name }} + {{ job.template.name }} {{ job.scheduled_for|format_datetime_relative }}

    @@ -34,7 +34,7 @@

    {% elif notifications %}

    - Download this report + Download this report   {{ time_left }}

    @@ -55,7 +55,7 @@ field_headings_visible=False ) %} {% call row_heading() %} - {{ item.to }} + {{ item.to }}

    {{ item.preview_of_content }}

    diff --git a/app/templates/partials/notifications/status.html b/app/templates/partials/notifications/status.html index d90e82462..85dd87b01 100644 --- a/app/templates/partials/notifications/status.html +++ b/app/templates/partials/notifications/status.html @@ -1,7 +1,7 @@

    {% if notification.status|format_notification_status_as_url(notification.notification_type) %} - + {% endif %} {{ notification.status|format_notification_status( notification.template.template_type diff --git a/app/templates/partials/templates/guidance-character-count.html b/app/templates/partials/templates/guidance-character-count.html index 9dea399f4..1f39028e8 100644 --- a/app/templates/partials/templates/guidance-character-count.html +++ b/app/templates/partials/templates/guidance-character-count.html @@ -4,5 +4,5 @@ cost more.

    - See pricing for details. + See pricing for details.

    diff --git a/app/templates/partials/templates/guidance-postage.html b/app/templates/partials/templates/guidance-postage.html index a428b0a82..c0b78a00e 100644 --- a/app/templates/partials/templates/guidance-postage.html +++ b/app/templates/partials/templates/guidance-postage.html @@ -11,5 +11,5 @@ Royal Mail delivers from Monday to Saturday, excluding bank holidays.

    - See a list of postage prices. + See a list of postage prices.

    diff --git a/app/templates/partials/templates/guidance-send-a-document.html b/app/templates/partials/templates/guidance-send-a-document.html index 6a5f74dd1..d033ab1d8 100644 --- a/app/templates/partials/templates/guidance-send-a-document.html +++ b/app/templates/partials/templates/guidance-send-a-document.html @@ -9,4 +9,4 @@ Download your document at: ((link_to_document))

    - Next, use the API to upload your document. Follow the instructions to send a document by email in the API documentation. + Next, use the API to upload your document. Follow the instructions to send a document by email in the API documentation. diff --git a/app/templates/partials/tour.html b/app/templates/partials/tour.html index 9fba8b93e..c117862fa 100644 --- a/app/templates/partials/tour.html +++ b/app/templates/partials/tour.html @@ -31,7 +31,7 @@ Notify delivers the message

    {% if help == '3' %} - + Now go to your dashboard {% endif %} diff --git a/app/templates/views/activity/notifications.html b/app/templates/views/activity/notifications.html index 97e24a301..ed98307eb 100644 --- a/app/templates/views/activity/notifications.html +++ b/app/templates/views/activity/notifications.html @@ -19,7 +19,7 @@ {% if item.status in ('pending-virus-check', 'virus-scan-failed') %} Checking {% else %} - {{ item.to.splitlines()[0].lstrip().rstrip(' ,') if item.to else '' }} + {{ item.to.splitlines()[0].lstrip().rstrip(' ,') if item.to else '' }} {% endif %}

    {{ item.preview_of_content }} diff --git a/app/templates/views/agreement/agreement-public.html b/app/templates/views/agreement/agreement-public.html index 0145cf89e..6da38cea5 100644 --- a/app/templates/views/agreement/agreement-public.html +++ b/app/templates/views/agreement/agreement-public.html @@ -15,7 +15,7 @@

    - Download the agreement{% if owner %} for {{ owner }}{% endif %}. + Download the agreement{% if owner %} for {{ owner }}{% endif %}.

    The agreement contains commercially sensitive information. Do not share it outside your organisation. diff --git a/app/templates/views/agreement/service-agreement-choose.html b/app/templates/views/agreement/service-agreement-choose.html index 70f502b96..1922f13af 100644 --- a/app/templates/views/agreement/service-agreement-choose.html +++ b/app/templates/views/agreement/service-agreement-choose.html @@ -28,7 +28,7 @@ There are different agreements for crown and non-crown organisations.

    - Contact us to tell us + Contact us to tell us whether or not you work for a crown organisation. If you’re not sure we’ll help you work it out.

    diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index 1d0512168..9669ac714 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -19,7 +19,7 @@ {{ current_service.organisation.name }} has already accepted the GOV.UK Notify data sharing and financial agreement.

    -

    For more information, you can download a copy of the agreement. +

    For more information, you can download a copy of the agreement.

    The agreement is confidential and should not be shared outside your organisation. diff --git a/app/templates/views/agreement/service-agreement.html b/app/templates/views/agreement/service-agreement.html index 1e6cb6e06..8dd4dad78 100644 --- a/app/templates/views/agreement/service-agreement.html +++ b/app/templates/views/agreement/service-agreement.html @@ -26,7 +26,7 @@ Once accepted, the agreement covers all Notify services from {{ current_service.organisation.name }}.

    - Download a copy of the data sharing and financial agreement. + Download a copy of the data sharing and financial agreement.

    The agreement is confidential and should not be shared outside your organisation. diff --git a/app/templates/views/api/callbacks/delivery-status-callback.html b/app/templates/views/api/callbacks/delivery-status-callback.html index 9e08dd9ab..575c8df1f 100644 --- a/app/templates/views/api/callbacks/delivery-status-callback.html +++ b/app/templates/views/api/callbacks/delivery-status-callback.html @@ -19,7 +19,7 @@

    When you send an email or text message, we can tell you if Notify was able to deliver it. - Read the Callbacks section of our API documentation for more information. + Read the Callbacks section of our API documentation for more information.

    {% call form_wrapper() %} diff --git a/app/templates/views/api/callbacks/received-text-messages-callback.html b/app/templates/views/api/callbacks/received-text-messages-callback.html index 66c3f8867..0c62a0b73 100644 --- a/app/templates/views/api/callbacks/received-text-messages-callback.html +++ b/app/templates/views/api/callbacks/received-text-messages-callback.html @@ -17,7 +17,7 @@

    When you receive a text message in Notify, we can forward it to your system. - Check the callback documentation for more information. + Check the callback documentation for more information.

    {% call form_wrapper() %} diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index cebb5442d..f9f1d3250 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -16,13 +16,13 @@ @@ -33,7 +33,7 @@
    - Refresh + Refresh
    @@ -77,7 +77,7 @@ {% endif %} {% endfor %} {% if notification.status not in ('pending-virus-check', 'virus-scan-failed') %} - View {{ message_count_label(1, notification.template.template_type, suffix='') }} + View {{ message_count_label(1, notification.template.template_type, suffix='') }} {% endif %}
    diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html index affe25b99..b9d0ba773 100644 --- a/app/templates/views/api/keys.html +++ b/app/templates/views/api/keys.html @@ -46,7 +46,7 @@ {% endcall %} {% else %} {% call field(align='right', status='error') %} - Revoke + Revoke {% endcall %} {% endif %} {% endcall %} diff --git a/app/templates/views/api/whitelist.html b/app/templates/views/api/whitelist.html index 18bc8a624..264397842 100644 --- a/app/templates/views/api/whitelist.html +++ b/app/templates/views/api/whitelist.html @@ -22,12 +22,12 @@ @@ -41,7 +41,7 @@

    You and members of - your team + your team are included in the whitelist automatically.

    diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html index 976c7a17d..b9e641594 100644 --- a/app/templates/views/check/column-errors.html +++ b/app/templates/views/check/column-errors.html @@ -9,7 +9,7 @@ {% set file_contents_header_id = 'file-preview' %} {% macro skip_to_file_contents() %}

    - Skip to file contents + Skip to file contents

    {% endmacro %} @@ -150,7 +150,7 @@ ) }} {% endif %}
    - Back to top + Back to top
    {% if not request.args.from_test %} @@ -176,7 +176,7 @@ (not errors or recipients.more_rows_than_can_send) and displayed_index != preview_row ) %} - {{ displayed_index }} + {{ displayed_index }} {% else %} {{ displayed_index }} {% endif %} diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html index a50744189..3ec9d2ac9 100644 --- a/app/templates/views/check/ok.html +++ b/app/templates/views/check/ok.html @@ -9,7 +9,7 @@ {% set file_contents_header_id = 'file-preview' %} {% macro skip_to_file_contents() %}

    - Skip to file contents + Skip to file contents

    {% endmacro %} @@ -76,7 +76,7 @@ {% if (item.index + 2) == preview_row %} {{ item.index + 2 }} {% else %} - {{ item.index + 2 }} + {{ item.index + 2 }} {% endif %} {% endcall %} diff --git a/app/templates/views/check/row-errors.html b/app/templates/views/check/row-errors.html index 6df7563fc..69b6bc373 100644 --- a/app/templates/views/check/row-errors.html +++ b/app/templates/views/check/row-errors.html @@ -9,7 +9,7 @@ {% set file_contents_header_id = 'file-preview' %} {% macro skip_to_file_contents() %}

    - Skip to file contents + Skip to file contents

    {% endmacro %} @@ -55,7 +55,7 @@ button_text='Upload your file again' ) }}
    - Back to top + Back to top
    diff --git a/app/templates/views/choose-account.html b/app/templates/views/choose-account.html index bfde30431..2eeb04202 100644 --- a/app/templates/views/choose-account.html +++ b/app/templates/views/choose-account.html @@ -21,7 +21,7 @@ {% endif %} {% for org in organisations %}
  • - {{ org.name }} + {{ org.name }}

    {{ org.count_of_live_services }} live service{% if org.count_of_live_services != 1 %}s{% endif %} @@ -30,7 +30,7 @@ {% endfor %} {% for service in services %}

  • - {{ service.name }} + {{ service.name }}
    • {% endfor %} {% if show_heading %} @@ -64,7 +64,7 @@

    A developer should be able to set up the API client and start sending test messages in around 30 minutes. A full integration can take a few days, depending on the other systems you’re using.

    Integrate directly with the API

    If you cannot use the client libraries, you can integrate directly with the API instead.

    -

    Read the REST API documentation (this link opens in a new tab).

    +

    Read the REST API documentation (this link opens in a new tab).

    {% endblock %} diff --git a/app/templates/views/edit-user-permissions.html b/app/templates/views/edit-user-permissions.html index 9847bf65b..e7d8fd378 100644 --- a/app/templates/views/edit-user-permissions.html +++ b/app/templates/views/edit-user-permissions.html @@ -25,11 +25,17 @@ ) }}

    - {{ user.email_address }} Change + {{ user.email_address }}  + + Change email address +

    {% if mobile_number %}

    - {{ mobile_number }} Change + {{ mobile_number }}  + + Change mobile number +

    {% endif %}
    diff --git a/app/templates/views/email-branding/select-branding.html b/app/templates/views/email-branding/select-branding.html index 9ffdcc341..267e04143 100644 --- a/app/templates/views/email-branding/select-branding.html +++ b/app/templates/views/email-branding/select-branding.html @@ -15,7 +15,7 @@ {% for brand in email_brandings %} diff --git a/app/templates/views/features.html b/app/templates/views/features.html index a0cdf2be3..fd9adcf40 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -12,13 +12,13 @@

    If you work for central government, a local authority or the NHS, you can use GOV.UK Notify to keep your users updated.

    Notify makes it easy to create, customise and send:

    You do not need any technical knowledge to use Notify.

    {% if not current_user.is_authenticated %} -

    Create an account for free and try it yourself.

    +

    Create an account for free and try it yourself.

    {% endif %}

    Reusable message templates

    @@ -34,11 +34,11 @@

    API integration

    You can integrate the Notify API with your web application or back-office system to send messages automatically.

    -

    Read our API documentation for more information.

    +

    Read our API documentation for more information.

    Reporting

    Notify’s real-time dashboard lets you see the number of messages sent. You can also check the current status of any message to see when it was delivered.

    -

    Read more about the delivery status of your messages.

    +

    Read more about the delivery status of your messages.

    Permissions

    Control which members of your team can see, create, edit and send messages.

    @@ -58,7 +58,7 @@

    We send messages through several different providers. If one provider fails, Notify switches to another so that your messages are not affected.

    -

    Visit GOV.UK Performance to see how Notify is performing.

    +

    Visit GOV.UK Performance to see how Notify is performing.

    Security

    Notify protects and manages data to meet the needs of government services.

    @@ -68,10 +68,10 @@

    Two-factor authentication

    Notify uses two-factor authentication (2FA) to keep your account secure. When you sign in, we’ll send a unique one-time code to your phone and ask you to enter it before we let you use your account.

    -

    Read more about security. +

    Read more about security.

    Support

    Notify provides 24-hour online support. If you have an emergency outside office hours, we’ll reply within 30 minutes.

    -

    Find out more about support.

    +

    Find out more about support.

    {% endblock %} diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index f9ddc5693..b66a87763 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -10,7 +10,7 @@

    Emails

    Send an unlimited number of emails for free with GOV.UK Notify.

    {% if not current_user.is_authenticated %} -

    Create an account and try Notify for yourself.

    +

    Create an account and try Notify for yourself.

    {% endif %}

    Features

    @@ -20,7 +20,7 @@
  • personalise the content of your emails
  • send and schedule bulk messages
    • -

    You can also integrate with our API to send emails automatically.

    +

    You can also integrate with our API to send emails automatically.

    Email branding

    Add your organisation’s logo and brand colour to email templates.

    @@ -35,8 +35,8 @@
  • email attachments are often marked as spam
    • -

    Contact us if you want to send files by email.

    -

    Read our API documentation for more information.

    +

    Contact us if you want to send files by email.

    +

    Read our API documentation for more information.

    Add a reply-to address

    Notify lets you choose the email address that users reply to.

    @@ -45,6 +45,6 @@

    Pricing

    It’s free to send emails through Notify.

    -

    See pricing for more details.

    +

    See pricing for more details.

    {% endblock %} diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index c779951b3..19ccbf6a6 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -10,7 +10,7 @@

    Letters

    GOV.UK Notify will print, pack and post your letters for you.

    {% if not current_user.is_authenticated %} -

    Create an account and try Notify for yourself.

    +

    Create an account and try Notify for yourself.

    {% endif %}

    Features

    @@ -20,7 +20,7 @@
  • personalise the content of your letter
  • send bulk mail
    • -

    You can also integrate with our API to send letters automatically.

    +

    You can also integrate with our API to send letters automatically.

    Choose your postage

    Notify can send letters by first or second class post.

    @@ -33,7 +33,7 @@

    Upload your own letters

    You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.

    -

    Read our documentation.

    +

    Read our documentation.

    Pricing

    It costs between 30p and 76p (plus VAT) to send a letter. Prices include:

    @@ -44,6 +44,6 @@
  • first or second class postage

    • Letters can be up to 10 pages long (5 double-sided sheets of paper).

    -

    See pricing for more details.

    +

    See pricing for more details.

    {% endblock %} diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index 270e192f5..80d6f644b 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -10,7 +10,7 @@

    Text messages

    Send thousands of free text messages to UK and international numbers with GOV.UK Notify.

    {% if not current_user.is_authenticated %} -

    Create an account and try Notify for yourself.

    +

    Create an account and try Notify for yourself.

    {% endif %}

    Features

    @@ -19,12 +19,12 @@
  • create reusable text message templates
  • personalise the content of your texts
  • send and schedule bulk messages
    • -

    You can also integrate with our API to send text messages automatically.

    +

    You can also integrate with our API to send text messages automatically.

    Receive text messages

    Let people send messages to your service or reply to your texts.

    You can see and reply to the messages you receive when you sign in to Notify. If you’re using our API, you can set up your own automated processes to manage replies.

    -

    Contact us to request a unique number for text message replies.

    +

    Contact us to request a unique number for text message replies.

    Show people who your texts are from

    When you send a text message with Notify, the sender name tells people who it's from.

    @@ -36,6 +36,6 @@ -

    See pricing for more details.

    +

    See pricing for more details.

    {% endblock %} diff --git a/app/templates/views/find-services/find-services-by-name.html b/app/templates/views/find-services/find-services-by-name.html index 04ef957bf..a1fa28fda 100644 --- a/app/templates/views/find-services/find-services-by-name.html +++ b/app/templates/views/find-services/find-services-by-name.html @@ -43,7 +43,7 @@
    {% if skip_link %}
    - {{ skip_link[0] }} + {{ skip_link[0] }}
    {% endif %} {% if link_to_upload %}

    - + Upload a list of {{ recipient_count_label(999, template.template_type) }}

    diff --git a/app/templates/views/send.html b/app/templates/views/send.html index 64772b9e6..f9bc93275 100644 --- a/app/templates/views/send.html +++ b/app/templates/views/send.html @@ -46,7 +46,7 @@ {% endcall %}

    - Download this example + Download this example

    Your file will populate this template ({{ template.name }})

    diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index a073efb1d..2e819dd6a 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -263,7 +263,7 @@

    {% if current_user.has_permissions('manage_service') %} To remove these restrictions, you can send us a - request to go live. + request to go live. {% else %} Your service manager can ask to have these restrictions removed. {% endif %} @@ -279,7 +279,7 @@

    Problems or comments? - Give feedback. + Give feedback.

    {% endif %} @@ -318,7 +318,7 @@ {{ text_field('Organisation')}} {% call field() %} {% if current_service.organisation_id %} - + {{ current_service.organisation.name }} {% else %} @@ -375,13 +375,13 @@ {% if current_service.active and (current_service.trial_mode or current_user.platform_admin) %}

    - + Delete this service {% if current_user.platform_admin %} - + Suspend service @@ -394,7 +394,7 @@ Service suspended - + Resume service diff --git a/app/templates/views/service-settings/email-reply-to/_verify-updates.html b/app/templates/views/service-settings/email-reply-to/_verify-updates.html index ccd22dfd5..a6cc0d476 100644 --- a/app/templates/views/service-settings/email-reply-to/_verify-updates.html +++ b/app/templates/views/service-settings/email-reply-to/_verify-updates.html @@ -15,7 +15,7 @@

    - Refresh + Refresh

    {% elif verification_status == "success" %} {{ banner("‘{}’ is ready to use".format(reply_to_email_address), type='default', with_tick=True) }} diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html index 3c687ddd9..c163fdaec 100644 --- a/app/templates/views/service-settings/email_reply_to.html +++ b/app/templates/views/service-settings/email_reply_to.html @@ -31,7 +31,7 @@ {% if current_user.has_permissions('manage_service') %} - Change + Change {% endif %} {% if current_service.count_email_reply_to_addresses > 1 %} {{ api_key(item.id, thing="ID") }} diff --git a/app/templates/views/service-settings/letter-contact-details.html b/app/templates/views/service-settings/letter-contact-details.html index 57527ec58..f57c5b2f0 100644 --- a/app/templates/views/service-settings/letter-contact-details.html +++ b/app/templates/views/service-settings/letter-contact-details.html @@ -22,7 +22,7 @@ Blank {% if current_service.default_letter_contact_block %} {% if current_user.has_permissions('manage_service') %} - Make default + Make default {% endif %} {% else %} (default) @@ -40,7 +40,7 @@ {% endif %}

    {% if current_user.has_permissions('manage_service') %} - Change + Change {% endif %} {% if letter_contact_details|length > 1 %} {{ api_key(item.id, thing="ID") }} diff --git a/app/templates/views/service-settings/preview-letter-branding.html b/app/templates/views/service-settings/preview-letter-branding.html index 9a5395e48..82e54509d 100644 --- a/app/templates/views/service-settings/preview-letter-branding.html +++ b/app/templates/views/service-settings/preview-letter-branding.html @@ -17,7 +17,7 @@ {{ form.hidden_tag() }}
    {{ govukButton({ "text": "Save", "classes": "govuk-!-margin-right-2" }) }} - Back to service settings + Back to service settings
    {% endcall %} diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html index 15ea7e6a1..46991cd0c 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -69,7 +69,7 @@ When we receive your request we’ll get back to you within one working day.

    - By requesting to go live you’re agreeing to our terms of use. + By requesting to go live you’re agreeing to our terms of use.

    {% call form_wrapper() %} {{ page_footer('Request to go live') }} diff --git a/app/templates/views/service-settings/set-auth-type.html b/app/templates/views/service-settings/set-auth-type.html index 722f24bbe..aaa2c2744 100644 --- a/app/templates/views/service-settings/set-auth-type.html +++ b/app/templates/views/service-settings/set-auth-type.html @@ -24,7 +24,7 @@ or an email link.

    - You can set the sign-in method for individual team members. + You can set the sign-in method for individual team members.

    {% else %}

    @@ -34,7 +34,7 @@ Your team members sign in with a text message code.

    - Contact us if signing in with a text message is a problem for your team. + Contact us if signing in with a text message is a problem for your team.

    {% endif %} diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index 72a2cb743..bd9fda22f 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -23,17 +23,17 @@ You can still send text messages from a sender name if you need to, but users will not be able to reply to those messages.

    - Contact us if you want to switch this feature off. + Contact us if you want to switch this feature off.

    {% if current_user.has_permissions('manage_api_keys') %}

    You can set up callbacks for received text messages on the - API integration page. + API integration page.

    {% endif %} {% else %}

    - Contact us if you want to be able to receive text messages from your users. + Contact us if you want to be able to receive text messages from your users.

    We’ll create a unique phone number for your service that they can reply to. diff --git a/app/templates/views/service-settings/set-international-sms.html b/app/templates/views/service-settings/set-international-sms.html index 8327c8b4d..400d47cc5 100644 --- a/app/templates/views/service-settings/set-international-sms.html +++ b/app/templates/views/service-settings/set-international-sms.html @@ -20,7 +20,7 @@ Messages to international mobile numbers are charged at 1, 2, or 3 times the cost of messages to UK mobile numbers.

    - See pricing for the list + See pricing for the list of rates.

    {% call form_wrapper() %} diff --git a/app/templates/views/service-settings/set-letter.html b/app/templates/views/service-settings/set-letter.html index 7d2f85c64..96f8b4e0c 100644 --- a/app/templates/views/service-settings/set-letter.html +++ b/app/templates/views/service-settings/set-letter.html @@ -20,7 +20,7 @@ It costs between 30p and 76p to send a letter using Notify.

    - See pricing for the list + See pricing for the list of rates.

    {% call form_wrapper() %} diff --git a/app/templates/views/service-settings/set-sms.html b/app/templates/views/service-settings/set-sms.html index ef7d62ecb..1c442e1b8 100644 --- a/app/templates/views/service-settings/set-sms.html +++ b/app/templates/views/service-settings/set-sms.html @@ -26,7 +26,7 @@ after your free allowance.

    - See pricing for more details. + See pricing for more details.

    {% call form_wrapper() %} {{ radios(form.enabled) }} diff --git a/app/templates/views/service-settings/sms-senders.html b/app/templates/views/service-settings/sms-senders.html index e36003fc9..7fcf59770 100644 --- a/app/templates/views/service-settings/sms-senders.html +++ b/app/templates/views/service-settings/sms-senders.html @@ -33,7 +33,7 @@ {% endif %} {% if current_user.has_permissions('manage_service') %} - Change + Change {% endif %} {% if current_service.count_sms_senders > 1 %} {{ api_key(item.id, thing="ID") }} diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 66e379a32..2b6bd0479 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -16,10 +16,10 @@ @@ -38,7 +38,7 @@ "classes": "product-page-button button-container__button govuk-!-margin-right-3", "href": url_for('main.register' ) }) }} - or sign in if you’ve used + or sign in if you’ve used it before @@ -135,7 +135,7 @@

    See the - list of services and organisations. + list of services and organisations.

    @@ -163,7 +163,7 @@

    There’s no monthly charge, no setup fee and no procurement process.

    -

    Find out more about pricing. +

    Find out more about pricing.

    @@ -180,7 +180,7 @@ and is supported 24 hours a day, 7 days a week.

    - Contact us if you have a question or want + Contact us if you have a question or want to give feedback.

    diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index 047d51c8c..c51349b9a 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -27,7 +27,7 @@

    Sign in

    If you do not have an account, you can - create one now. + create one now.

    {% endif %} diff --git a/app/templates/views/styleguide.html b/app/templates/views/styleguide.html index 430ffb399..34cbe4ea6 100644 --- a/app/templates/views/styleguide.html +++ b/app/templates/views/styleguide.html @@ -16,11 +16,11 @@ {% block maincolumn_content %}

    - www.notify.works/_styleguide + www.notify.works/_styleguide

    - View source + View source

    Banner

    @@ -125,7 +125,7 @@ {{ boolean_field(True) }} {{ boolean_field(False) }} {% call field(align='right') %} - Change + Change {% endcall %} {% endcall %} {% endcall %} @@ -173,7 +173,7 @@ {% endcall %} {% endcall %}

    - Add a job now + Add a job now

    diff --git a/app/templates/views/support/bat-phone.html b/app/templates/views/support/bat-phone.html index 6a48c0d4b..82b7b6972 100644 --- a/app/templates/views/support/bat-phone.html +++ b/app/templates/views/support/bat-phone.html @@ -15,7 +15,7 @@

    First, check the - system status page. + system status page. You do not need to contact us if the problem you’re having is listed on that page.

    @@ -33,11 +33,11 @@

    Any other problems

    - Fill in this form + Fill in this form and we’ll get back to you by the next working day.

    - Back to support + Back to support

    diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index f6106e732..77ba37be2 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -20,7 +20,7 @@ {{ page_footer('Continue') }} {% endcall %} -

    You can also contact us on Slack.

    +

    You can also contact us on Slack.

    Office hours

    Our office hours are 9:30am to 5:30pm, Monday to Friday.

    diff --git a/app/templates/views/support/report-problem.html b/app/templates/views/support/report-problem.html index 12f40e2c1..99c250640 100644 --- a/app/templates/views/support/report-problem.html +++ b/app/templates/views/support/report-problem.html @@ -19,7 +19,7 @@

    - Check our system status + Check our system status page to see if there are any known issues with GOV.UK Notify.

    diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html index eecee2ece..a6550a7a7 100644 --- a/app/templates/views/templates/_template.html +++ b/app/templates/views/templates/_template.html @@ -23,7 +23,7 @@ {% endif %} {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) and not letter_too_long %}
    - + Send
    @@ -31,14 +31,14 @@ {% else %} {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
    - + Send
    {% endif %} {% if current_user.has_permissions('manage_templates') %}
    - + Edit
    @@ -51,14 +51,14 @@
    {% if current_user.has_permissions('manage_templates') and template.template_type == 'letter' %} {% if not current_service.letter_branding_id %} - Add logo + Add logo {% endif %} - Change - Edit + Change + Edit {% if current_service.count_letter_contact_details %} - Edit + Edit {% else %} - Edit + Edit {% endif %} {% endif %} {{ template|string }} diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html index 03956452b..5bcb03501 100644 --- a/app/templates/views/templates/_template_list.html +++ b/app/templates/views/templates/_template_list.html @@ -34,16 +34,16 @@ {% endif %}

    {% for ancestor in item.ancestors %} - + {{- format_item_name(ancestor.name) -}} {% endfor %} {% if item.is_folder %} - + {{ format_item_name(item.name) }} {% else %} - + {{ format_item_name(item.name) }} {% endif %} diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html index 84bb59b8e..c7b4b09c3 100644 --- a/app/templates/views/templates/action_blocked.html +++ b/app/templates/views/templates/action_blocked.html @@ -21,7 +21,7 @@

    If you need to send {{ message_count_label(999, notification_type, suffix='') }} - get in touch with the GOV.UK Notify team. + get in touch with the GOV.UK Notify team.

    diff --git a/app/templates/views/templates/choose-reply.html b/app/templates/views/templates/choose-reply.html index fa1681cef..823790da5 100644 --- a/app/templates/views/templates/choose-reply.html +++ b/app/templates/views/templates/choose-reply.html @@ -42,16 +42,16 @@

    {% for ancestor in item.ancestors %} - + {{ ancestor.name }} / {% endfor %} {% if item.is_folder %} - + {{ item.name }} {% else %} - + {{ item.name }} {% endif %} diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 95691fc49..99812fc89 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -54,7 +54,7 @@

    {% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
    - Manage + Manage this folder
    {% endif %}
    diff --git a/app/templates/views/templates/choose_history.html b/app/templates/views/templates/choose_history.html index f8a045028..327932172 100644 --- a/app/templates/views/templates/choose_history.html +++ b/app/templates/views/templates/choose_history.html @@ -14,6 +14,6 @@ {% endfor %}

    - Back to current templates + Back to current templates

    {% endblock %} diff --git a/app/templates/views/templates/copy.html b/app/templates/views/templates/copy.html index 84c5a36ed..7aac461ec 100644 --- a/app/templates/views/templates/copy.html +++ b/app/templates/views/templates/copy.html @@ -25,23 +25,23 @@

    {% for ancestor in item.ancestors %} {% if ancestor.is_service %} - + {% else %} - + {% endif %} {{ ancestor.name }} {% endfor %} {% if item.is_service %} - + {{ item.name }} {% elif item.is_folder %} - + {{ item.name }} {% else %} - + {{ item.name }} {% endif %} diff --git a/app/templates/views/templates/set-template-sender.html b/app/templates/views/templates/set-template-sender.html index 75f76f686..5f8d449bf 100644 --- a/app/templates/views/templates/set-template-sender.html +++ b/app/templates/views/templates/set-template-sender.html @@ -23,7 +23,7 @@ hide_legend=True ) }} {{ page_footer('Continue') }} - Add new sender + Add new sender {% endcall %} diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index 410680fe7..bce2ec075 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -60,21 +60,21 @@

      - See previous versions + See previous versions  
    {% endif %} {% if current_user.has_permissions('manage_templates') and user_has_template_permission %} {% if not template._template.archived %} - Delete this template + Delete this template   {% endif %} {% if template.template_type != 'letter' %} {% if not template._template.redact_personalisation %} - Hide personalisation after sending + Hide personalisation after sending {% else %}

    Personalisation is hidden after sending

    diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html index 5109906c8..2974c2734 100644 --- a/app/templates/views/terms-of-use.html +++ b/app/templates/views/terms-of-use.html @@ -20,9 +20,9 @@
  • tell us immediately if you have any security breaches
  • keep your API keys secure
  • get the right levels of consent (to send messages and to use data)
    • -
  • not send unsolicited messages, only ones related to a transaction or something the user has subscribed to be updated about (check the Service Manual if you’re not sure)
    • +
  • not send unsolicited messages, only ones related to a transaction or something the user has subscribed to be updated about (check the Service Manual if you’re not sure)
  • - send messages that meet the GOV.UK Service Manual standards for writing text messages and emails
    • + send messages that meet the GOV.UK Service Manual standards for writing text messages and emails
  • not send messages containing any personally or commercially sensitive information
  • check that the data you add to Notify is accurate and complies with data protection legislation
    • @@ -32,14 +32,14 @@

    Leaving Notify

    -

    You can leave Notify at any time. Just contact us and we’ll close your account.

    +

    You can leave Notify at any time. Just contact us and we’ll close your account.

    When you leave Notify, all your data will be deleted.

    {% endblock %} diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 316bc3b30..a367876c2 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -18,7 +18,7 @@ {% if current_service and current_service.trial_mode %}

    - To remove these restrictions, you can request to go live.

    + To remove these restrictions, you can request to go live.

    {% else %}

    To remove these restrictions: diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 3897a6019..897926997 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -33,7 +33,7 @@ )}}

    You can upload a single letter as a PDF.

    -

    Your file must meet our letter specification.

    +

    Your file must meet our letter specification.

    diff --git a/app/templates/views/uploads/preview.html b/app/templates/views/uploads/preview.html index 718cf8c6d..05e70e5a8 100644 --- a/app/templates/views/uploads/preview.html +++ b/app/templates/views/uploads/preview.html @@ -24,7 +24,7 @@ button_text='Upload your file again' ) }} - Back to top + Back to top {% elif current_service.trial_mode %} diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index 294d25dfd..a91a4814f 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -132,7 +132,7 @@

    What counts as 1 text message?
    - See pricing. + See pricing.

    diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index f986accf4..41127b2b6 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -19,11 +19,11 @@

    Find out more about: