From 5b306dde4d78a25ec6c3baf9d9e8ef631293c46e Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Mon, 24 Feb 2020 11:56:38 +0000 Subject: [PATCH] Revert "Convert all links to govuk frontend" --- app/assets/error_pages/5xx.html | 2 +- app/assets/javascripts/templateFolderForm.js | 2 +- app/assets/stylesheets/_grids.scss | 16 +++++ app/assets/stylesheets/app.scss | 6 ++ app/assets/stylesheets/components/banner.scss | 29 +++++--- .../stylesheets/components/big-number.scss | 1 + .../stylesheets/components/browse-list.scss | 17 ++++- .../stylesheets/components/file-upload.scss | 2 +- .../stylesheets/components/message.scss | 11 ++- .../stylesheets/components/navigation.scss | 72 ++++++++++--------- .../stylesheets/components/page-footer.scss | 17 +++++ app/assets/stylesheets/components/table.scss | 31 ++++++-- .../stylesheets/components/task-list.scss | 5 ++ .../stylesheets/components/tick-cross.scss | 22 ++++-- .../vendor/previous-next-navigation.scss | 4 ++ app/assets/stylesheets/globals.scss | 38 +++++++--- .../govuk-frontend/extensions.scss | 27 ------- app/assets/stylesheets/local/_typography.scss | 62 ---------------- app/assets/stylesheets/main.scss | 1 - .../stylesheets/views/notification.scss | 8 ++- app/main/validators.py | 3 +- app/navigation.py | 6 +- 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 | 9 ++- 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 | 6 +- .../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 | 10 ++- .../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 | 20 +++--- app/templates/views/features/emails.html | 14 ++-- app/templates/views/features/letters.html | 10 +-- .../views/features/text-messages.html | 10 +-- .../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 | 18 ++--- .../guidance/branding-and-customisation.html | 10 +-- .../guidance/create-and-send-messages.html | 2 +- .../guidance/edit-and-format-messages.html | 10 +-- app/templates/views/guidance/index.html | 14 ++-- .../views/guidance/send-files-by-email.html | 4 +- .../views/guidance/upload-a-letter.html | 4 +- app/templates/views/inbound-sms-admin.html | 14 ++-- 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 | 6 +- .../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 | 4 +- 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 | 6 +- app/templates/withoutnav_template.html | 2 +- app/utils.py | 30 ++------ .../views/organisations/test_organisation.py | 2 +- tests/app/main/views/test_agreement.py | 8 +-- tests/app/main/views/test_find_services.py | 4 +- tests/app/main/views/test_manage_users.py | 2 +- tests/app/main/views/test_user_profile.py | 2 +- tests/javascripts/cookieMessage.test.js | 4 +- tests/javascripts/cookieSettings.test.js | 2 +- tests/javascripts/liveSearch.test.js | 2 +- .../stick-to-window-when-scrolling.test.js | 2 +- tests/javascripts/support/helpers/html.js | 2 +- tests/javascripts/updateContent.test.js | 6 +- 163 files changed, 548 insertions(+), 521 deletions(-) delete mode 100644 app/assets/stylesheets/local/_typography.scss diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index 8fd9ef8bd..1f802e608 100644 --- a/app/assets/error_pages/5xx.html +++ b/app/assets/error_pages/5xx.html @@ -75,7 +75,7 @@ Try again later.

- 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 + 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 diff --git a/app/assets/javascripts/templateFolderForm.js b/app/assets/javascripts/templateFolderForm.js index 22a7f1a68..f81a9eabe 100644 --- a/app/assets/javascripts/templateFolderForm.js +++ b/app/assets/javascripts/templateFolderForm.js @@ -114,7 +114,7 @@ this.makeButton = (text, opts) => { let $btn = $('') .html(text) - .addClass('govuk-link govuk-link--no-visited-state js-cancel') + .addClass('js-cancel') // isn't set if cancelSelector is undefined .data('target', opts.cancelSelector || undefined) .attr('tabindex', '0') diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss index 024091fb3..85551da03 100644 --- a/app/assets/stylesheets/_grids.scss +++ b/app/assets/stylesheets/_grids.scss @@ -120,3 +120,19 @@ .align-with-big-number-hint { margin-top: $gutter / 0.6; } + +.global-cookie-message { + p { + @extend %site-width-container; + } +} + +.footer-nav { + @include copy-16; + margin-bottom: $gutter-two-thirds; + + a { + display: inline-block; + margin-right: $gutter-half; + } +} diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss index f3c76bd47..c195d3eed 100644 --- a/app/assets/stylesheets/app.scss +++ b/app/assets/stylesheets/app.scss @@ -1,4 +1,10 @@ // Extra CSS overlaying elements +a { + &:visited { + color: $link-colour; + } +} + .form-control-1-1 { width: 100%; } diff --git a/app/assets/stylesheets/components/banner.scss b/app/assets/stylesheets/components/banner.scss index 9eed69c66..dac7613d4 100644 --- a/app/assets/stylesheets/components/banner.scss +++ b/app/assets/stylesheets/components/banner.scss @@ -55,6 +55,19 @@ outline: 3px solid $yellow; } + a { + + &:link, + &:visited { + color: $error-colour; + } + + &:hover { + color: $mellow-red; + } + + } + .list { margin-bottom: 0; } @@ -95,7 +108,7 @@ a { - font-weight: bold; + @include bold-19; display: block; padding: 0 ; margin: 0 0 $gutter 0; @@ -105,18 +118,18 @@ color: $white; } - &:focus, + &:hover, &:active { - color: $govuk-focus-text-colour; - outline: 10px solid $yellow; - } - - &:hover { - color: $white; background-color: $link-hover-colour; outline: 10px solid $link-hover-colour; } + &:active, + &:focus { + background-color: $yellow; + outline: 10px solid $yellow; + } + } .greyed-out-step { diff --git a/app/assets/stylesheets/components/big-number.scss b/app/assets/stylesheets/components/big-number.scss index 035c99e70..7e4fa81a8 100644 --- a/app/assets/stylesheets/components/big-number.scss +++ b/app/assets/stylesheets/components/big-number.scss @@ -130,6 +130,7 @@ &:active, &:focus { color: $black; + border-bottom: 1px solid $black; } } diff --git a/app/assets/stylesheets/components/browse-list.scss b/app/assets/stylesheets/components/browse-list.scss index ec7008737..bc63bd9a6 100644 --- a/app/assets/stylesheets/components/browse-list.scss +++ b/app/assets/stylesheets/components/browse-list.scss @@ -17,7 +17,22 @@ } &-link { - @include govuk-font(24, $weight: bold); + @include bold-24; + + &-destructive { + @include bold-24; + color: $error-colour; + + &:visited, + &:link { + @include bold-24; + color: $error-colour; + } + + &:hover { + color: $mellow-red; + } + } } &-hint { diff --git a/app/assets/stylesheets/components/file-upload.scss b/app/assets/stylesheets/components/file-upload.scss index 8ff2e92a9..35adb510e 100644 --- a/app/assets/stylesheets/components/file-upload.scss +++ b/app/assets/stylesheets/components/file-upload.scss @@ -43,7 +43,7 @@ line-height: 35px; a { - font-weight: bold; + @include bold-19; } } diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss index 4b6b889be..e6773357b 100644 --- a/app/assets/stylesheets/components/message.scss +++ b/app/assets/stylesheets/components/message.scss @@ -34,8 +34,15 @@ margin-bottom: -$gutter; padding-bottom: $gutter; - &:hover .message-name-separator:before { - border-color: $link-hover-colour; + &:hover { + color: $link-hover-colour; + + .message-name-separator { + &:before { + border-color: $link-hover-colour; + } + } + } &:focus { diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss index 5b71a68dd..08b6476d4 100644 --- a/app/assets/stylesheets/components/navigation.scss +++ b/app/assets/stylesheets/components/navigation.scss @@ -1,74 +1,64 @@ .navigation { - @include govuk-font($size: 19); padding: 0 $gutter 0 0; $padding-top: 14px; $padding-bottom: 11px; - &-service-name, - &-organisation-link { - display: inline-block; - overflow: hidden; - // aligning to the baseline with overflow: hidden adds to the parent's height - // aligning to the top doesn't - // see: https://stackoverflow.com/questions/23529369/why-does-x-overflowhidden-cause-extra-space-below#answer-51088033 - vertical-align: top; - white-space: nowrap; - text-overflow: ellipsis; - } - - &-service-switch, - &-service-back-to, - &-organisation-link { - - &:link, - &:visited { - text-decoration: none; - } - - &:hover { - text-decoration: underline; - } - - } - &-service { - @include govuk-font($size: 19); border-bottom: 1px solid $border-colour; margin: 0 0 10px; position: relative; + font-size: 0; &-name { - + @include bold-19; padding: $padding-top 0 $padding-bottom 0; + display: inline-block; max-width: 50%; - + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } &-switch { + @include core-19; + text-decoration: none; text-align: right; position: absolute; top: 0; right: 0; padding: $padding-top 0 $padding-bottom $gutter-half; + &:hover { + color: $link-hover-colour; + text-decoration: underline; + } + &:focus { outline: none; border-bottom: 1px solid $yellow; border-left: 10px solid $yellow; border-right: 3px solid $yellow; right: -3px; + color: $text-colour; } } &-back-to { + @include core-19; padding: $padding-top $gutter-half $padding-bottom 0; display: inline-block; + text-decoration: none; + + &:hover { + text-decoration: underline; + color: $link-hover-colour; + } } @@ -76,7 +66,14 @@ &-organisation-link { + @include core-19; + display: inline-block; max-width: 25%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-weight: normal; + text-decoration: none; padding: $padding-top 20px $padding-bottom 0; margin-right: 7px; box-sizing: border-box; @@ -100,8 +97,13 @@ border-color: $secondary-text-colour; } - // hack to make the focus style fit in the navigation bar + &:hover { + color: $link-hover-colour; + text-decoration: underline; + } + &:focus { + color: $text-colour; outline: none; box-shadow: 0 1px 0 0 $focus-colour, -3px 0 0 0 $focus-colour, -3px 1px 0 0 $focus-colour; } @@ -109,6 +111,7 @@ } li { + @include core-19; margin: 0; list-style-type: none; } @@ -126,9 +129,14 @@ } &:hover { + color: $link-hover-colour; text-decoration: underline; } + &:focus { + color: $text-colour; + } + &.selected { @include bold-19; position: relative; diff --git a/app/assets/stylesheets/components/page-footer.scss b/app/assets/stylesheets/components/page-footer.scss index 56611d425..cdf95ff65 100644 --- a/app/assets/stylesheets/components/page-footer.scss +++ b/app/assets/stylesheets/components/page-footer.scss @@ -8,9 +8,26 @@ line-height: 40px; padding: 1px 0 0 15px; + a { + + &:visited, + &:link { + color: $error-colour; + display: inline-block; + vertical-align: center; + } + + &:hover, + &:active { + color: $mellow-red; + } + + } + } &-delete-link-without-button { + @include core-19; padding: 0; display: inline-block; } diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss index 3b4a4a49b..61dba8ed5 100644 --- a/app/assets/stylesheets/components/table.scss +++ b/app/assets/stylesheets/components/table.scss @@ -212,6 +212,15 @@ color: $error-colour; font-weight: bold; + a { + + &:link, + &:visited { + color: $error-colour; + } + + } + .status-hint { display: block; font-weight: normal; @@ -347,12 +356,22 @@ background: transparent; } - &:active:before, - &:focus:before { - border-color: $yellow; - border-style: solid; - border-width: 15px 3px 15px 15px; - right: -3px; + &:hover { + color: $link-hover-colour; + } + + &:active, + &:focus { + + color: $black; + + &:before { + border-color: $yellow; + border-style: solid; + border-width: 15px 3px 15px 15px; + right: -3px; + } + } } diff --git a/app/assets/stylesheets/components/task-list.scss b/app/assets/stylesheets/components/task-list.scss index 3330fd32d..ae751d7ea 100644 --- a/app/assets/stylesheets/components/task-list.scss +++ b/app/assets/stylesheets/components/task-list.scss @@ -31,8 +31,13 @@ $indicator-colour: $black; padding-right: 20%; position: relative; + &:hover { + color: $link-hover-colour; + } + &:focus { outline: none; + color: $black; box-shadow: -3px 0 0 0 $focus-colour, 3px 0 0 0 $focus-colour; border-color: transparent; top: -1px; diff --git a/app/assets/stylesheets/components/tick-cross.scss b/app/assets/stylesheets/components/tick-cross.scss index 53bf6588c..4136dab7e 100644 --- a/app/assets/stylesheets/components/tick-cross.scss +++ b/app/assets/stylesheets/components/tick-cross.scss @@ -61,12 +61,22 @@ background: transparent; } - &:active:before, - &:focus:before { - border-color: $yellow; - border-style: solid; - border-width: 15px 3px 15px 15px; - right: -3px; + &:hover { + color: $link-hover-colour; + } + + &:active, + &:focus { + + color: $black; + + &:before { + border-color: $yellow; + border-style: solid; + border-width: 15px 3px 15px 15px; + right: -3px; + } + } } diff --git a/app/assets/stylesheets/components/vendor/previous-next-navigation.scss b/app/assets/stylesheets/components/vendor/previous-next-navigation.scss index 8fc2213a0..0e060f12c 100644 --- a/app/assets/stylesheets/components/vendor/previous-next-navigation.scss +++ b/app/assets/stylesheets/components/vendor/previous-next-navigation.scss @@ -54,6 +54,10 @@ $is-ie: false !default; padding: $gutter-half; text-decoration: none; + &:visited { + color: $link-colour; + } + &:hover, &:active { background-color: $canvas-colour; diff --git a/app/assets/stylesheets/globals.scss b/app/assets/stylesheets/globals.scss index b24b39ea4..9da8fb427 100644 --- a/app/assets/stylesheets/globals.scss +++ b/app/assets/stylesheets/globals.scss @@ -5,16 +5,6 @@ width: device-width; } -// To be removed when all text uses the GOV.UK Frontend New Transport font styles. -// At present, some text gets these styles due to being in a GOV.UK Frontend component -// or a link. -// This ensures all text will have these styles applied, until it can be moved to use -// the GOV.UK Frontend font styles. -body { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - b, strong { font-weight: 600; @@ -51,6 +41,34 @@ input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } +// To be removed when all links follow the GOV.UK Frontend conventions: +// https://design-system.service.gov.uk/styles/typography/#links +a { + /* Give a strong clear visual idea as to what is currently in focus */ + -webkit-tap-highlight-color: rgba(0, 0, 0, 0.3); + + &:link { + color: $link-colour; + } + + &:visited { + color: $link-visited-colour; + } + + &:hover { + color: $link-hover-colour; + } + + &:active { + color: $link-active-colour; + } + + &:focus { + background-color: $focus-colour; + outline: 3px solid $focus-colour; + } +} + // Each selector, and then the whole block when only one remains, to be removed when the // element comes from the corresponding GOV.UK Frontend component: // - https://design-system.service.gov.uk/components/text-input/ diff --git a/app/assets/stylesheets/govuk-frontend/extensions.scss b/app/assets/stylesheets/govuk-frontend/extensions.scss index dfb5d7ae7..0d4b693fa 100644 --- a/app/assets/stylesheets/govuk-frontend/extensions.scss +++ b/app/assets/stylesheets/govuk-frontend/extensions.scss @@ -8,30 +8,3 @@ } } -// Extends govuk-link to create a class of link that causes a destructive action -// Based on styles of link in: -// https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/helpers/_links.scss -// -// Note: all destructive actions must have a confirmation step these links navigate to -@mixin govuk-link-style-destructive-no-visited-state { - &:link, - &:visited { - color: $govuk-error-colour; - } - - &:hover { - color: govuk-tint($govuk-error-colour, 25%); - } - - // When focussed, the text colour needs to be darker to ensure that colour - // contrast is still acceptable against the focus colour - // Activated links are usually focused so this applies to them as well - &:active, - &:focus { - color: $govuk-focus-text-colour; - } -} - -.govuk-link--destructive { - @include govuk-link-style-destructive-no-visited-state; -} diff --git a/app/assets/stylesheets/local/_typography.scss b/app/assets/stylesheets/local/_typography.scss deleted file mode 100644 index 401562515..000000000 --- a/app/assets/stylesheets/local/_typography.scss +++ /dev/null @@ -1,62 +0,0 @@ -@import 'settings/all'; -@import 'helpers/all'; - -@mixin destructive-link-style-default { - &:link { - color: $govuk-error-colour; - } - - &:visited { - color: $govuk-link-visited-colour; - } - - &:hover { - color: govuk-tint( $govuk-error-colour, 25% ); - } - - &:active { - color: $govuk-link-active-colour; - } - - // When focussed, the text colour needs to be darker to ensure that colour - // contrast is still acceptable - &:focus { - color: $govuk-focus-text-colour; - } -} - -@mixin destructive-link-style-no-visited-state { - &:link { - color: $govuk-error-colour; - } - - &:visited { - color: $govuk-error-colour; - } - - &:hover { - color: govuk-tint( $govuk-error-colour, 25% ); - } - - &:active { - color: $govuk-link-active-colour; - } - - // When focussed, the text colour needs to be darker to ensure that colour - // contrast is still acceptable - &:focus { - color: $govuk-focus-text-colour; - } -} - -// mimics styles for govuk-link: -// https://github.com/alphagov/govuk-frontend/blob/063cd8e2470b62b824c6e50ca66342ac7a95d2d8/package/core/_links.scss#L7 -.destructive-link { - @include govuk-link-common; - @include destructive-link-style-default; - @include govuk-link-print-friendly; -} - -.destructive-link--no-visited-state { - @include destructive-link-style-no-visited-state; -} diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index bff09e95e..cec02421b 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -36,7 +36,6 @@ $path: '/static/images/'; @import './govuk-frontend/all'; // Specific to this application -@import 'local/typography'; @import 'grids'; @import 'components/cookie-message'; @import 'components/site-footer'; diff --git a/app/assets/stylesheets/views/notification.scss b/app/assets/stylesheets/views/notification.scss index 0961dc815..e26268f56 100644 --- a/app/assets/stylesheets/views/notification.scss +++ b/app/assets/stylesheets/views/notification.scss @@ -6,14 +6,18 @@ &.error { - color: $govuk-error-colour; + color: $error-colour; font-weight: bold; + a { + color: $error-colour; + } + } &-cancelled { @include bold-19; - color: $govuk-error-colour; + color: $error-colour; } } diff --git a/app/main/validators.py b/app/main/validators.py index 7ef28cdb9..63f36d5f5 100644 --- a/app/main/validators.py +++ b/app/main/validators.py @@ -46,8 +46,7 @@ class ValidGovEmail: message = ( 'Enter a government email address.' ' If you think you should have access' - ' contact us' - ).format(url_for('main.support')) + ' contact us').format(url_for('main.support')) if not is_gov_user(field.data.lower()): raise ValidationError(message) diff --git a/app/navigation.py b/app/navigation.py index 3f94bbc9f..dd6aeecc4 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -7,7 +7,7 @@ class Navigation: mapping = {} exclude = {} - selected_class = "selected" + selected_attribute = "class=selected" def __init__(self): self.mapping = { @@ -32,7 +32,7 @@ class Navigation: def is_selected(self, navigation_item): if request.endpoint in self.mapping[navigation_item]: - return " " + self.selected_class + return self.selected_attribute return '' @staticmethod @@ -42,6 +42,8 @@ class Navigation: class HeaderNavigation(Navigation): + selected_attribute = "class=active" + mapping = { 'support': { 'bat_phone', diff --git a/app/templates/components/big-number.html b/app/templates/components/big-number.html index 8b5176a04..8ca33b3fb 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 b75d09218..d59e9ae37 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 1908f1e48..647629248 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 0d1900745..5400e91c2 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 4d06641d5..fb9f478be 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 d6a416522..bcbb5408b 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 483dc3f18..b73846c6a 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 be999a765..74747f50e 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 170b4acc0..acb43af52 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 170b4acc0..acb43af52 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 28304e083..4dfddc603 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 0d352163b..0d3109996 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 e953e1332..92c05dd6c 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 7d7156ab4..a9f518e11 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 be9994c86..32bbdab14 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 d3ee32933..7ab180295 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 341622ba5..a26fb9a13 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 55c8f784d..43f225e75 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 842a9d805..869573da2 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 c8124b94b..d90e82462 100644 --- a/app/templates/partials/notifications/status.html +++ b/app/templates/partials/notifications/status.html @@ -1,14 +1,12 @@
    - {% set field_status = notification.status|format_notification_status_as_field_status(notification.notification_type) %} - {% set status_url = notification.status|format_notification_status_as_url(notification.notification_type) %} -

    - {% if status_url %} - +

    + {% if notification.status|format_notification_status_as_url(notification.notification_type) %} + {% endif %} {{ notification.status|format_notification_status( notification.template.template_type ) }} - {% if status_url %} + {% if notification.status|format_notification_status_as_url(notification.notification_type) %} {% endif %} {% if sent_with_test_key %} diff --git a/app/templates/partials/templates/guidance-character-count.html b/app/templates/partials/templates/guidance-character-count.html index 1f39028e8..9dea399f4 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 c0b78a00e..a428b0a82 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 d033ab1d8..6a5f74dd1 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 c117862fa..9fba8b93e 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 ed98307eb..97e24a301 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 6da38cea5..0145cf89e 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 1922f13af..70f502b96 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 9669ac714..1d0512168 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 8dd4dad78..1e6cb6e06 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 575c8df1f..9e08dd9ab 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 0c62a0b73..66c3f8867 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 f9f1d3250..cebb5442d 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 b9d0ba773..affe25b99 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 ad2750650..18bc8a624 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 b9e641594..976c7a17d 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 3ec9d2ac9..a50744189 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 69b6bc373..6df7563fc 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 144696473..bfde30431 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 e7d8fd378..9847bf65b 100644 --- a/app/templates/views/edit-user-permissions.html +++ b/app/templates/views/edit-user-permissions.html @@ -25,17 +25,11 @@ ) }}

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

    {% if mobile_number %}

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

    {% endif %}
    diff --git a/app/templates/views/email-branding/select-branding.html b/app/templates/views/email-branding/select-branding.html index 267e04143..9ffdcc341 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 4c41e46cf..a0cdf2be3 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

    @@ -27,18 +27,18 @@

    Personalised content

    Notify makes it easy to send personalised messages from a single template.

    -

    See how to personalise your content.

    +

    See how to personalise your content.

    Bulk sending

    To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.

    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 63d283ce8..f9ddc5693 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,11 +20,11 @@
  • 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.

    -

    See how to change your email branding.

    +

    See how to change your email branding.

    Send files by email

    Notify offers a safe and reliable way to send files by email.

    @@ -35,16 +35,16 @@
  • 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.

    Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.

    -

    See how to add a reply-to address.

    +

    See how to add a reply-to address.

    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 94a53fd91..c779951b3 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.

    @@ -29,11 +29,11 @@

    Branding

    Add your organisation’s logo to your letter templates.

    -

    See how to change your letter branding.

    +

    See how to change your letter branding.

    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 0fe4b3ed5..270e192f5 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,16 +19,16 @@
  • 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.

    -

    See how to change the text message sender.

    +

    See how to change the text message sender.

    Pricing

    Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.

    @@ -36,6 +36,6 @@
    • 250,000 free text messages for central government services
    • 25,000 free text messages for other public sector services
    -

    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 2fbb8f402..04ef957bf 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 @@
      {% for service in services_found %}
    • - {{ service.name }} + {{ service.name }}
      • {% endfor %} diff --git a/app/templates/views/find-users/find-users-by-email.html b/app/templates/views/find-users/find-users-by-email.html index 296977b9f..fc9380456 100644 --- a/app/templates/views/find-users/find-users-by-email.html +++ b/app/templates/views/find-users/find-users-by-email.html @@ -43,7 +43,7 @@
        {% for user in users_found %}
      • - {{ user.email_address }} + {{ user.email_address }}

        {{ user.name }}

        • diff --git a/app/templates/views/find-users/user-information.html b/app/templates/views/find-users/user-information.html index e45b948c5..aa8d699a2 100644 --- a/app/templates/views/find-users/user-information.html +++ b/app/templates/views/find-users/user-information.html @@ -19,7 +19,7 @@ @@ -35,7 +35,7 @@ @@ -62,7 +62,7 @@ {% endif %} {% if user.state == 'active' %} - + Archive user diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html index 489791f17..2fc4390c1 100644 --- a/app/templates/views/get-started.html +++ b/app/templates/views/get-started.html @@ -14,7 +14,7 @@

        1. Check if GOV.UK Notify is right for you

          -

          Read about our features, pricing and roadmap.

          +

          Read about our features, pricing and roadmap.

          {{ govukDetails({ "summaryText": "Organisations that can use Notify", "html": ''' @@ -35,15 +35,15 @@

        2. Create an account

          {% if not current_user.is_authenticated %} -

          Create an account for free and add your first Notify service. When you add a new service it will start in trial mode.

          +

          Create an account for free and add your first Notify service. When you add a new service it will start in trial mode.

          {% else %} -

          Create an account for free and add your first Notify service. When you add a new service, it will start in trial mode.

          +

          Create an account for free and add your first Notify service. When you add a new service, it will start in trial mode.

          {% endif %}

        3. Write some messages

          -

          Add message templates with examples of the content you plan to send. You can use our guidance to help you.

          +

          Add message templates with examples of the content you plan to send. You can use our guidance to help you.

        4. @@ -52,15 +52,15 @@

          Review your settings to add message branding, reply-to addresses and sender information.

          Add team members and check their permissions.

          {% else %} -

          Review your settings to add message branding, reply-to addresses and sender information.

          -

          Add team members and check their permissions.

          +

          Review your settings to add message branding, reply-to addresses and sender information.

          +

          Add team members and check their permissions.

          {% endif %}

        5. Set up an API integration (optional)

          You can use the Notify API to send messages automatically.

          -

          Our documentation explains how to integrate the API with a web application or back office system.

          +

          Our documentation explains how to integrate the API with a web application or back office system.

        6. @@ -68,9 +68,9 @@ {% if not current_user.is_authenticated or not current_service %}

          When you’re ready to send messages to people outside your team, go to the Settings page and select Request to go live. We’ll approve your request within one working day.

          {% else %} -

          You should request to go live when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.

          +

          You should request to go live when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.

          {% endif %} -

          Check how to pay if you’re planning to send letters or exceed the free text message allowance.

          +

          Check how to pay if you’re planning to send letters or exceed the free text message allowance.

        diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html index 0d017d65d..44d8c1072 100644 --- a/app/templates/views/guidance/branding-and-customisation.html +++ b/app/templates/views/guidance/branding-and-customisation.html @@ -12,10 +12,10 @@

        This page explains how to:

        Change your email branding

        @@ -31,7 +31,7 @@

        Add a reply-to email address

        -

        You can choose the email address that your users reply to. You must add at least one reply-to address for your service before you can request to go live.

        +

        You can choose the email address that your users reply to. You must add at least one reply-to address for your service before you can request to go live.

        To add a reply-to email address:

        diff --git a/app/templates/views/guidance/create-and-send-messages.html b/app/templates/views/guidance/create-and-send-messages.html index a72f8eb64..5f94387d7 100644 --- a/app/templates/views/guidance/create-and-send-messages.html +++ b/app/templates/views/guidance/create-and-send-messages.html @@ -9,7 +9,7 @@

        Send messages

        -

        Create an account to see a short tutorial explaining how to create and send messages.

        +

        Create an account to see a short tutorial explaining how to create and send messages.

        Bulk sending

        diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html index a97d57484..eb74e2e7d 100644 --- a/app/templates/views/guidance/edit-and-format-messages.html +++ b/app/templates/views/guidance/edit-and-format-messages.html @@ -11,10 +11,10 @@

        This page explains how to:

        Format your content

        @@ -30,7 +30,7 @@ diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html index a4db4270d..14ba6abe4 100644 --- a/app/templates/views/guidance/index.html +++ b/app/templates/views/guidance/index.html @@ -15,9 +15,9 @@

        It explains how to:

        More information

        @@ -25,10 +25,10 @@

        The GOV.UK Service Manual has advice on:

        {% endblock %} diff --git a/app/templates/views/guidance/send-files-by-email.html b/app/templates/views/guidance/send-files-by-email.html index febb10243..331039a2e 100644 --- a/app/templates/views/guidance/send-files-by-email.html +++ b/app/templates/views/guidance/send-files-by-email.html @@ -8,8 +8,8 @@

        Send files by email

        -

        Contact us if you want to send files by email.

        +

        Contact us if you want to send files by email.

        -

        Then follow the instructions to send a file by email in our API documentation.

        +

        Then follow the instructions to send a file by email in our API documentation.

        {% endblock %} diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html index 8211c3de4..619b2a5c3 100644 --- a/app/templates/views/guidance/upload-a-letter.html +++ b/app/templates/views/guidance/upload-a-letter.html @@ -35,8 +35,8 @@

        To help you set up your letter, you can download our:

        diff --git a/app/templates/views/inbound-sms-admin.html b/app/templates/views/inbound-sms-admin.html index f0052d399..31ecef8f3 100644 --- a/app/templates/views/inbound-sms-admin.html +++ b/app/templates/views/inbound-sms-admin.html @@ -46,8 +46,8 @@ Inbound Numbers {% for value in inbound_num_list.data: %} - {{value.number}} - + {{value.number}} + {% if value.active %} Active @@ -56,13 +56,13 @@ Inbound Numbers {% else %} Inactive {% endif %} - - - {{ value.service.name }} - + + + {{ value.service.name }} + {% endfor %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/app/templates/views/integration-testing.html b/app/templates/views/integration-testing.html index 121fca034..c1a18677a 100644 --- a/app/templates/views/integration-testing.html +++ b/app/templates/views/integration-testing.html @@ -14,7 +14,7 @@

        This information has moved.

        - Refer to the documentation + Refer to the documentation for the client library you are using.

        diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html index e8cbf7f6c..79080d928 100644 --- a/app/templates/views/jobs/job.html +++ b/app/templates/views/jobs/job.html @@ -25,7 +25,7 @@
        - Cancel sending these letters + Cancel sending these letters {% else %}
         
        diff --git a/app/templates/views/letter-branding/select-letter-branding.html b/app/templates/views/letter-branding/select-letter-branding.html index 7f40f15f7..1b717b865 100644 --- a/app/templates/views/letter-branding/select-letter-branding.html +++ b/app/templates/views/letter-branding/select-letter-branding.html @@ -15,7 +15,7 @@ {% for brand in letter_brandings %}
        - + {{ brand.name }}
        diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index 44eceaa21..c87dec1b3 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -73,9 +73,9 @@ {% if current_user.has_permissions('manage_service') %}
      • {% if user.status == 'pending' %} - Cancel invitation + Cancel invitation {% elif user.state == 'active' and current_user.id != user.id %} - Change details + Change details {% endif %}
        • {% endif %} diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index b590085ba..3f500c21f 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -10,9 +10,9 @@

        Delivery status

        Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.

        -

        For security, this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.

        +

        For security, this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.

        This page describes the statuses you’ll see when you’re signed in to Notify.

        -

        If you’re using the Notify API, read our documentation for a list of API statuses.

        +

        If you’re using the Notify API, read our documentation for a list of API statuses.

        Emails

        diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html index 44333d583..7b25238d4 100644 --- a/app/templates/views/notifications.html +++ b/app/templates/views/notifications.html @@ -72,7 +72,7 @@ {% if current_user.has_permissions('view_activity') %}

        - Download this report + Download this report   Data available for {{ partials.service_data_retention_days }} days

        diff --git a/app/templates/views/notifications/check.html b/app/templates/views/notifications/check.html index 92935daeb..5988b43b4 100644 --- a/app/templates/views/notifications/check.html +++ b/app/templates/views/notifications/check.html @@ -81,7 +81,7 @@ {{ govukButton({ "text": button_text }) }} {% endif %} {% if template.template_type == 'letter' %} - Download as a PDF + Download as a PDF {% endif %}
        diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html index 288cb7ee4..8aa91cb08 100644 --- a/app/templates/views/notifications/notification.html +++ b/app/templates/views/notifications/notification.html @@ -26,7 +26,7 @@ {% if help %} ‘{{ template.name }}’ {% else %} - ‘{{ template.name }}’ + ‘{{ template.name }}’ {% endif %} was sent {% endif %} @@ -34,7 +34,7 @@ {% set destination = {'letter': 'an address', 'email': 'an email address', 'sms': 'a phone number'} %} to {{ destination[template.template_type] }} from - {{ job.original_file_name }} + {{ job.original_file_name }} {% elif created_by %} by {{ created_by.name }} {% endif %} @@ -86,12 +86,12 @@
        {% if show_cancel_button %} - Cancel sending this letter + Cancel sending this letter {% else %}
         
        {% endif %} - Download as a PDF + Download as a PDF
        {% elif template.template_type == 'email' %} @@ -104,7 +104,7 @@ {% if current_user.has_permissions('send_messages') and current_user.has_permissions('view_activity') and template.template_type == 'sms' and can_receive_inbound %}

        - See all text messages sent to this phone number + See all text messages sent to this phone number

        {% endif %} diff --git a/app/templates/views/organisations/add-organisation.html b/app/templates/views/organisations/add-organisation.html index cdd91b45a..42966327c 100644 --- a/app/templates/views/organisations/add-organisation.html +++ b/app/templates/views/organisations/add-organisation.html @@ -12,8 +12,8 @@ {% block main %}
        - All organisations - Switch service + All organisations + Switch service
        diff --git a/app/templates/views/organisations/index.html b/app/templates/views/organisations/index.html index cc78ba5a1..516b430ad 100644 --- a/app/templates/views/organisations/index.html +++ b/app/templates/views/organisations/index.html @@ -11,10 +11,10 @@ {% block maincolumn_content %}
        -
        +
         
        - Switch service + Switch service
        @@ -31,7 +31,7 @@
          {% for org in organisations %}
        • - {{ org.name }} + {{ org.name }}

          {{ org.count_of_live_services }} live service{% if org.count_of_live_services != 1 %}s{% endif %} diff --git a/app/templates/views/organisations/organisation/index.html b/app/templates/views/organisations/organisation/index.html index 9a5a973de..49b7cf452 100644 --- a/app/templates/views/organisations/organisation/index.html +++ b/app/templates/views/organisations/organisation/index.html @@ -12,7 +12,7 @@

          diff --git a/app/templates/views/organisations/organisation/trial-mode-services.html b/app/templates/views/organisations/organisation/trial-mode-services.html index 51e543ccf..5e8d0e1cf 100644 --- a/app/templates/views/organisations/organisation/trial-mode-services.html +++ b/app/templates/views/organisations/organisation/trial-mode-services.html @@ -14,7 +14,7 @@ diff --git a/app/templates/views/organisations/organisation/users/index.html b/app/templates/views/organisations/organisation/users/index.html index 1c95f8046..4fa97bf18 100644 --- a/app/templates/views/organisations/organisation/users/index.html +++ b/app/templates/views/organisations/organisation/users/index.html @@ -44,7 +44,7 @@ diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html index 99e4050e4..d1d07757e 100644 --- a/app/templates/views/platform-admin/_base_template.html +++ b/app/templates/views/platform-admin/_base_template.html @@ -27,7 +27,7 @@ ('Clear cache', url_for('main.clear_cache')), ] %}
        • - + {{ link_text }}
          • diff --git a/app/templates/views/platform-admin/reports.html b/app/templates/views/platform-admin/reports.html index c07fd26ad..8f5c90f19 100644 --- a/app/templates/views/platform-admin/reports.html +++ b/app/templates/views/platform-admin/reports.html @@ -11,17 +11,17 @@

    - Download live services csv report + Download live services csv report

    - Download performance platform report (.xlsx) + Download performance platform report (.xlsx)

    - Monthly notification statuses for live services + Monthly notification statuses for live services

    - Usage for all services + Usage for all services

    {% endblock %} diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html index e0a7eed18..e899c0a96 100644 --- a/app/templates/views/platform-admin/services.html +++ b/app/templates/views/platform-admin/services.html @@ -49,7 +49,7 @@ {% call row() %} {% call field(border=False) %} - {{ service['name'] }} + {{ service['name'] }} {% endcall %} {{ stats_fields('email', service['stats']) }} diff --git a/app/templates/views/pricing/how-to-pay.html b/app/templates/views/pricing/how-to-pay.html index a3bf6bd19..9554377fc 100644 --- a/app/templates/views/pricing/how-to-pay.html +++ b/app/templates/views/pricing/how-to-pay.html @@ -18,7 +18,7 @@

    @@ -51,7 +51,7 @@

    - Contact us if you need help raising a purchase order. + Contact us if you need help raising a purchase order.

    {% endblock %} diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html index 49c85c61b..4502ac9f0 100644 --- a/app/templates/views/pricing/index.html +++ b/app/templates/views/pricing/index.html @@ -20,13 +20,13 @@

    {% if not current_user.is_authenticated %} - Create an account then add as many different services as you need to.

    + Create an account then add as many different services as you need to.

    {% else %} You can add as many different services as you need to. {% endif %}

    -

    When you add a new service it will start in trial mode.

    +

    When you add a new service it will start in trial mode.

    Emails

    It’s free to send emails through Notify.

    @@ -40,7 +40,7 @@
  • 25,000 free text messages for other public sector services

    • It costs 1.58 pence (plus VAT) for each text message you send after you've used your free allowance.

    -

    See how to pay. +

    See how to pay.

    Long text messages

    If a text message is longer than 160 characters (including spaces), it’ll be charged as more than one message:

    diff --git a/app/templates/views/privacy.html b/app/templates/views/privacy.html index 875348fba..b4f2cf6de 100644 --- a/app/templates/views/privacy.html +++ b/app/templates/views/privacy.html @@ -23,7 +23,7 @@

    For the credentials used to access GOV.UK Notify, Cabinet Office is the data controller.

    -

    For more information see the Information Commissioner’s Office (ICO) Data Protection Public Register. +

    For more information see the Information Commissioner’s Office (ICO) Data Protection Public Register. The Cabinet Office registration number is: Z7414053

    What data we collect from you

    @@ -120,7 +120,7 @@

    GDS Privacy Team
    - gds-privacy-office@digital.cabinet-office.gov.uk + gds-privacy-office@digital.cabinet-office.gov.uk

    @@ -129,18 +129,18 @@

    Data Protection Officer
    - DPO@cabinetoffice.gov.uk
    + DPO@cabinetoffice.gov.uk
    Data Protection Officer
    Cabinet Office
    70 Whitehall
    London SW1A 2AS

    -

    If you have a complaint, you can also contact the Information Commissioner's Office (ICO). The ICO is an independent regulator set up to uphold information rights.

    +

    If you have a complaint, you can also contact the Information Commissioner's Office (ICO). The ICO is an independent regulator set up to uphold information rights.

    Information Commissioner’s Office
    - casework@ico.org.uk
    + casework@ico.org.uk
    0303 123 1113
    Wycliffe House
    Water Lane
    diff --git a/app/templates/views/providers/providers.html b/app/templates/views/providers/providers.html index 73f435c75..4314f8fc6 100644 --- a/app/templates/views/providers/providers.html +++ b/app/templates/views/providers/providers.html @@ -12,7 +12,7 @@ Providers

    SMS

    - Change priority + Change priority {% call(item, row_number) list_table( domestic_sms_providers, diff --git a/app/templates/views/roadmap.html b/app/templates/views/roadmap.html index 0e0a0cc02..085f408bf 100644 --- a/app/templates/views/roadmap.html +++ b/app/templates/views/roadmap.html @@ -11,7 +11,7 @@

    The GOV.UK Notify roadmap shows the things we’re working on and when we hope to have them ready for you to use.

    Notify is in public beta. This means it’s fully operational and supported, but we’re still adding new features. The roadmap is a guide to what we have planned, but some things might change.

    -

    You can contact us if you have any questions about the roadmap or suggestions for new features.

    +

    You can contact us if you have any questions about the roadmap or suggestions for new features.

    January to March 2020

    diff --git a/app/templates/views/security.html b/app/templates/views/security.html index 5e0b39108..d66b76acb 100644 --- a/app/templates/views/security.html +++ b/app/templates/views/security.html @@ -51,7 +51,7 @@
  • your email address and password
  • a text message code that Notify sends to your phone
    • -

    If signing in with a text message is a problem for your team, contact us to find out about using an email link instead.

    +

    If signing in with a text message is a problem for your team, contact us to find out about using an email link instead.

    Information risk management

    Our approach to information risk management follows NCSC guidance. It assesses:

    @@ -65,8 +65,8 @@

    How we manage risks on Notify

    Things we do to manage risks on Notify include:

    {% 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 f9bc93275..64772b9e6 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 3b1db42c0..a073efb1d 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 a6cc0d476..ccd22dfd5 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 c163fdaec..3c687ddd9 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 f57c5b2f0..57527ec58 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 82e54509d..9a5395e48 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 46991cd0c..15ea7e6a1 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 aaa2c2744..722f24bbe 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 bd9fda22f..72a2cb743 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 400d47cc5..8327c8b4d 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 96f8b4e0c..7d2f85c64 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 1c442e1b8..ef7d62ecb 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 7fcf59770..e36003fc9 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 2b6bd0479..66e379a32 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 c51349b9a..047d51c8c 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 34cbe4ea6..430ffb399 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 82b7b6972..6a48c0d4b 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 77ba37be2..f6106e732 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 99c250640..12f40e2c1 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 a6550a7a7..eecee2ece 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 5bcb03501..03956452b 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 c7b4b09c3..84bb59b8e 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 823790da5..fa1681cef 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 99812fc89..95691fc49 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 this folder + Manage
    {% endif %}
    diff --git a/app/templates/views/templates/choose_history.html b/app/templates/views/templates/choose_history.html index 327932172..f8a045028 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 7aac461ec..84c5a36ed 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 5f8d449bf..75f76f686 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 f9e00c136..410680fe7 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 2974c2734..5109906c8 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 4a83f3ebd..316bc3b30 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -18,13 +18,13 @@ {% 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:

      -
    1. Sign in to Notify.
      2. +
    2. Sign in to Notify.
    3. Go to the Settings page.
    4. Select Request to go live.
    diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 897926997..3897a6019 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 05e70e5a8..718cf8c6d 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 a91a4814f..294d25dfd 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 41127b2b6..f986accf4 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -19,11 +19,11 @@

    Find out more about: