diff --git a/.gitignore b/.gitignore index 508249609..9b8b7c764 100644 --- a/.gitignore +++ b/.gitignore @@ -62,7 +62,6 @@ target/ .vscode # Frontend dependencies and compiled assets -app/assets/stylesheets/govuk_template/.sass-cache/ .sass-cache/ cache/ node_modules diff --git a/Makefile b/Makefile index 17cfe64fa..3e5415b44 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,6 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD 2> /dev/null || echo "") DOCKER_IMAGE_TAG := $(shell cat docker/VERSION) DOCKER_BUILDER_IMAGE_NAME = govuk/notify-admin-builder:${DOCKER_IMAGE_TAG} -DOCKER_TTY ?= $(if ${JENKINS_HOME},,t) BUILD_TAG ?= notifications-admin-manual BUILD_NUMBER ?= 0 @@ -27,39 +26,13 @@ $(eval export CF_HOME) NOTIFY_CREDENTIALS ?= ~/.notify-credentials + +## DEVELOPMENT + .PHONY: help help: @cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' -.PHONY: check-env-vars -check-env-vars: ## Check mandatory environment variables - $(if ${DEPLOY_ENV},,$(error Must specify DEPLOY_ENV)) - $(if ${DNS_NAME},,$(error Must specify DNS_NAME)) - -.PHONY: sandbox -sandbox: ## Set environment to sandbox - $(eval export DEPLOY_ENV=sandbox) - $(eval export DNS_NAME="cloudapps.digital") - @true - -.PHONY: preview -preview: ## Set environment to preview - $(eval export DEPLOY_ENV=preview) - $(eval export DNS_NAME="notify.works") - @true - -.PHONY: staging -staging: ## Set environment to staging - $(eval export DEPLOY_ENV=staging) - $(eval export DNS_NAME="staging-notify.works") - @true - -.PHONY: production -production: ## Set environment to production - $(eval export DEPLOY_ENV=production) - $(eval export DNS_NAME="notifications.service.gov.uk") - @true - .PHONY: dependencies dependencies: ## Install build dependencies npm set progress=false @@ -76,22 +49,6 @@ build: dependencies generate-version-file ## Build project npm run build pip install -r requirements.txt -.PHONY: build-paas-artifact -build-paas-artifact: ## Build the deploy artifact for PaaS - rm -rf target - mkdir -p target - zip -y -q -r -x@deploy-exclude.lst target/notifications-admin.zip ./ - -.PHONY: upload-paas-artifact ## Upload the deploy artifact for PaaS -upload-paas-artifact: - $(if ${DEPLOY_BUILD_NUMBER},,$(error Must specify DEPLOY_BUILD_NUMBER)) - $(if ${JENKINS_S3_BUCKET},,$(error Must specify JENKINS_S3_BUCKET)) - aws s3 cp --region eu-west-1 --sse AES256 target/notifications-admin.zip s3://${JENKINS_S3_BUCKET}/build/notifications-admin/${DEPLOY_BUILD_NUMBER}.zip - -.PHONY: upload-static ## Upload the static files to be served from S3 -upload-static: - aws s3 cp --region eu-west-1 --recursive --cache-control max-age=315360000,immutable ./app/static s3://${DNS_NAME}-static - .PHONY: test test: ## Run tests ./scripts/run_tests.sh @@ -124,7 +81,7 @@ prepare-docker-build-image: ## Prepare the Docker builder image make -C docker build define run_docker_container - @docker run -i${DOCKER_TTY} --rm \ + @docker run -it --rm \ --name "${DOCKER_CONTAINER_PREFIX}-${1}" \ -v "`pwd`:/var/project" \ -e UID=$(shell id -u) \ @@ -167,6 +124,32 @@ clean-docker-containers: ## Clean up any remaining docker containers clean: rm -rf node_modules cache target + +## DEPLOYMENT + +.PHONY: check-env-vars +check-env-vars: ## Check mandatory environment variables + $(if ${DEPLOY_ENV},,$(error Must specify DEPLOY_ENV)) + $(if ${DNS_NAME},,$(error Must specify DNS_NAME)) + +.PHONY: preview +preview: ## Set environment to preview + $(eval export DEPLOY_ENV=preview) + $(eval export DNS_NAME="notify.works") + @true + +.PHONY: staging +staging: ## Set environment to staging + $(eval export DEPLOY_ENV=staging) + $(eval export DNS_NAME="staging-notify.works") + @true + +.PHONY: production +production: ## Set environment to production + $(eval export DEPLOY_ENV=production) + $(eval export DNS_NAME="notifications.service.gov.uk") + @true + .PHONY: cf-login cf-login: ## Log in to Cloud Foundry $(if ${CF_USERNAME},,$(error Must specify CF_USERNAME)) @@ -188,6 +171,10 @@ generate-manifest: --format=yaml \ <(${DECRYPT_CMD} ${NOTIFY_CREDENTIALS}/credentials/${CF_SPACE}/paas/environment-variables.gpg) 2>&1 +.PHONY: upload-static ## Upload the static files to be served from S3 +upload-static: + aws s3 cp --region eu-west-1 --recursive --cache-control max-age=315360000,immutable ./app/static s3://${DNS_NAME}-static + .PHONY: cf-deploy cf-deploy: ## Deploys the app to Cloud Foundry $(if ${CF_SPACE},,$(error Must specify CF_SPACE)) @@ -196,7 +183,7 @@ cf-deploy: ## Deploys the app to Cloud Foundry cf v3-cancel-zdt-push ${CF_APP} || true cf v3-apply-manifest ${CF_APP} -f <(make -s generate-manifest) - cf v3-zdt-push ${CF_APP} --wait-for-deploy-complete # fails after 5 mins if deploy doesn't work + CF_STARTUP_TIMEOUT=10 cf v3-zdt-push ${CF_APP} --wait-for-deploy-complete # fails after 5 mins if deploy doesn't work .PHONY: cf-deploy-prototype cf-deploy-prototype: cf-target ## Deploys the first prototype to Cloud Foundry @@ -210,10 +197,6 @@ cf-deploy-prototype-2: cf-target ## Deploys the second prototype to Cloud Foundr cf-rollback: cf-target ## Rollbacks the app to the previous release cf v3-cancel-zdt-push ${CF_APP} -.PHONY: cf-push -cf-push: - cf push -f <(make -s generate-manifest) - .PHONY: cf-target cf-target: check-env-vars @cf target -o ${CF_ORG} -s ${CF_SPACE} diff --git a/README.md b/README.md index c9eeb68ae..e175275dc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ -[![Requirements Status](https://requires.io/github/alphagov/notifications-admin/requirements.svg?branch=master)](https://requires.io/github/alphagov/notifications-admin/requirements/?branch=master) -[![Coverage Status](https://coveralls.io/repos/alphagov/notifications-admin/badge.svg?branch=master&service=github)](https://coveralls.io/github/alphagov/notifications-admin?branch=master) - - # notifications-admin GOV.UK Notify admin application. diff --git a/app/__init__.py b/app/__init__.py index 4daf81b80..759b82b11 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,11 +1,11 @@ -import itertools import os +import re import urllib from datetime import datetime, timedelta, timezone from functools import partial from time import monotonic -import ago +import humanize import jinja2 from flask import ( Markup, @@ -13,6 +13,7 @@ from flask import ( flash, g, make_response, + redirect, render_template, request, session, @@ -59,9 +60,11 @@ from app.navigation import ( MainNavigation, OrgNavigation, ) +from app.notify_client import InviteTokenError from app.notify_client.api_key_api_client import api_key_api_client from app.notify_client.billing_api_client import billing_api_client from app.notify_client.complaint_api_client import complaint_api_client +from app.notify_client.contact_list_api_client import contact_list_api_client from app.notify_client.email_branding_client import email_branding_client from app.notify_client.events_api_client import events_api_client from app.notify_client.inbound_number_client import inbound_number_client @@ -89,6 +92,7 @@ from app.url_converters import ( LetterFileExtensionConverter, SimpleDateTypeConverter, TemplateTypeConverter, + TicketTypeConverter, ) from app.utils import format_thousands, get_logo_cdn_domain, id_safe @@ -138,6 +142,7 @@ def create_app(application): # API clients api_key_api_client, billing_api_client, + contact_list_api_client, complaint_api_client, email_branding_client, events_api_client, @@ -223,6 +228,7 @@ def init_app(application): application.url_map.converters['uuid'].to_python = lambda self, value: value application.url_map.converters['template_type'] = TemplateTypeConverter + application.url_map.converters['ticket_type'] = TicketTypeConverter application.url_map.converters['letter_file_extension'] = LetterFileExtensionConverter application.url_map.converters['simple_date'] = SimpleDateTypeConverter @@ -291,7 +297,7 @@ def format_time_24h(date): return utc_string_to_aware_gmt_datetime(date).strftime('%H:%M') -def get_human_day(time): +def get_human_day(time, date_prefix=''): # Add 1 minute to transform 00:00 into ‘midnight today’ instead of ‘midnight tomorrow’ date = (utc_string_to_aware_gmt_datetime(time) - timedelta(minutes=1)).date() @@ -304,8 +310,15 @@ def get_human_day(time): if date == (now - timedelta(days=1)).date(): return 'yesterday' if date.strftime('%Y') != now.strftime('%Y'): - return '{} {}'.format(_format_datetime_short(date), date.strftime('%Y')) - return _format_datetime_short(date) + return '{} {} {}'.format( + date_prefix, + _format_datetime_short(date), + date.strftime('%Y'), + ).strip() + return '{} {}'.format( + date_prefix, + _format_datetime_short(date), + ).strip() def format_time(date): @@ -334,10 +347,29 @@ def format_date_human(date): return get_human_day(date) +def format_datetime_human(date, date_prefix=''): + return '{} at {}'.format( + get_human_day(date, date_prefix='on'), + format_time(date), + ) + + +def format_day_of_week(date): + return utc_string_to_aware_gmt_datetime(date).strftime('%A') + + def _format_datetime_short(datetime): return datetime.strftime('%d %B').lstrip('0') +def naturaltime_without_indefinite_article(date): + return re.sub( + 'an? (.*) ago', + lambda match: '1 {} ago'.format(match.group(1)), + humanize.naturaltime(date), + ) + + def format_delta(date): delta = ( datetime.now(timezone.utc) @@ -348,12 +380,17 @@ def format_delta(date): return "just now" if delta < timedelta(seconds=60): return "in the last minute" - return ago.human( - delta, - future_tense='{} from now', # No-one should ever see this - past_tense='{} ago', - precision=1 - ) + return naturaltime_without_indefinite_article(delta) + + +def format_delta_days(date): + now = datetime.now(timezone.utc) + date = utc_string_to_aware_gmt_datetime(date) + if date.strftime('%Y-%M-%D') == now.strftime('%Y-%M-%D'): + return "today" + if date.strftime('%Y-%M-%D') == (now - timedelta(days=1)).strftime('%Y-%M-%D'): + return "yesterday" + return naturaltime_without_indefinite_article(now - date) def valid_phone_number(phone_number): @@ -584,8 +621,10 @@ def useful_headers_after_request(response): def register_errorhandlers(application): # noqa (C901 too complex) - def _error_response(error_code): - resp = make_response(render_template("error/{0}.html".format(error_code)), error_code) + def _error_response(error_code, error_page_template=None): + if error_page_template is None: + error_page_template = error_code + resp = make_response(render_template("error/{0}.html".format(error_page_template)), error_code) return useful_headers_after_request(resp) @application.errorhandler(HTTPError) @@ -596,15 +635,10 @@ def register_errorhandlers(application): # noqa (C901 too complex) error.message )) error_code = error.status_code - if error_code == 400: - if isinstance(error.message, str): - msg = [error.message] - else: - msg = list(itertools.chain(*[error.message[x] for x in error.message.keys()])) - resp = make_response(render_template("error/400.html", message=msg)) - return useful_headers_after_request(resp) - elif error_code not in [401, 404, 403, 410]: - # probably a 500 or 503 + if error_code not in [401, 404, 403, 410]: + # probably a 500 or 503. + # it might be a 400, which we should handle as if it's an internal server error. If the API might + # legitimately return a 400, we should handle that within the view or the client that calls it. application.logger.exception("API {} failed with status {} message {}".format( error.response.url if error.response else 'unknown', error.status_code, @@ -614,8 +648,10 @@ def register_errorhandlers(application): # noqa (C901 too complex) return _error_response(error_code) @application.errorhandler(400) - def handle_400(error): - return _error_response(400) + def handle_client_error(error): + # This is tripped if we call `abort(400)`. + application.logger.exception('Unhandled 400 client error') + return _error_response(400, error_page_template=500) @application.errorhandler(410) def handle_gone(error): @@ -658,19 +694,11 @@ def register_errorhandlers(application): # noqa (C901 too complex) u'csrf.invalid_token: Aborting request, user_id: {user_id}', extra={'user_id': session['user_id']}) - resp = make_response(render_template( - "error/400.html", - message=['Something went wrong, please go back and try again.'] - ), 400) - return useful_headers_after_request(resp) + return _error_response(400, error_page_template=500) @application.errorhandler(405) - def handle_405(error): - resp = make_response(render_template( - "error/400.html", - message=['Something went wrong, please go back and try again.'] - ), 405) - return useful_headers_after_request(resp) + def handle_method_not_allowed(error): + return _error_response(405, error_page_template=500) @application.errorhandler(WerkzeugHTTPException) def handle_http_error(error): @@ -680,6 +708,11 @@ def register_errorhandlers(application): # noqa (C901 too complex) return _error_response(error.code) + @application.errorhandler(InviteTokenError) + def handle_bad_invite_token(error): + flash(str(error)) + return redirect(url_for('main.sign_in')) + @application.errorhandler(500) @application.errorhandler(Exception) def handle_bad_request(error): @@ -742,8 +775,11 @@ def add_template_filters(application): format_date_human, format_date_normal, format_date_short, + format_datetime_human, format_datetime_relative, + format_day_of_week, format_delta, + format_delta_days, format_notification_status, format_notification_type, format_notification_status_as_time, diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index 1f802e608..8fd9ef8bd 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/analytics/analytics.js b/app/assets/javascripts/analytics/analytics.js index 711f6ec80..a776f93a2 100644 --- a/app/assets/javascripts/analytics/analytics.js +++ b/app/assets/javascripts/analytics/analytics.js @@ -15,6 +15,7 @@ window.ga('set', 'anonymizeIp', config.anonymizeIp); window.ga('set', 'allowAdFeatures', config.allowAdFeatures); window.ga('set', 'transport', config.transport); + window.ga('set', 'title', 'GOV.UK Notify'); }; diff --git a/app/assets/javascripts/enhancedTextbox.js b/app/assets/javascripts/enhancedTextbox.js index 8adb210f8..a4965857a 100644 --- a/app/assets/javascripts/enhancedTextbox.js +++ b/app/assets/javascripts/enhancedTextbox.js @@ -27,6 +27,8 @@ `)) .on("input", this.update); + $(window).on("resize", this.resize); + visibleTextbox = this.$textbox.clone().appendTo("body").css({ position: 'absolute', visibility: 'hidden', @@ -47,7 +49,7 @@ this.resize = () => { - this.$background.width(this.$textbox.outerWidth()); + this.$background.width(this.$textbox.width()); this.$textbox.height( Math.max( diff --git a/app/assets/javascripts/previewPane.js b/app/assets/javascripts/previewPane.js index 514b02274..2dac47421 100644 --- a/app/assets/javascripts/previewPane.js +++ b/app/assets/javascripts/previewPane.js @@ -10,7 +10,7 @@ branding_style = branding_style.val(); - const $paneWrapper = $('

'); + const $paneWrapper = $('
'); const $form = $('form'); const previewType = $form.data('previewType'); const $previewPane = $(``); @@ -28,7 +28,7 @@ } $paneWrapper.append($previewPane); - $form.find('.grid-row').eq(0).prepend($paneWrapper); + $form.find('.govuk-grid-row').eq(0).prepend($paneWrapper); $form.attr('action', location.pathname.replace(new RegExp(`set-${previewType}-branding$`), `preview-${previewType}-branding`)); $form.find('button[type="submit"]').text('Save'); diff --git a/app/assets/javascripts/templateFolderForm.js b/app/assets/javascripts/templateFolderForm.js index f81a9eabe..22a7f1a68 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('js-cancel') + .addClass('govuk-link govuk-link--no-visited-state 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 85551da03..bf89c79e9 100644 --- a/app/assets/stylesheets/_grids.scss +++ b/app/assets/stylesheets/_grids.scss @@ -1,57 +1,50 @@ -.column-whole { - @include grid-column(1/1); + +.govuk-grid-column-one-sixth { + @include govuk-grid-column(one-sixth, $class: false); } -.column-three-quarters { - @include grid-column(3/4); +.govuk-grid-column-five-sixths { + @include govuk-grid-column(five-sixths, $class: false); } -.column-one-sixth { - @include grid-column(1/6); +.govuk-grid-column-one-eighth { + @include govuk-grid-column(one-eighth, $class: false); } -.column-five-sixths { - @include grid-column(5/6); +.govuk-grid-column-five-eighths { + @include govuk-grid-column(five-eighths, $class: false); } -.column-one-eighth { - @include grid-column(1/8); -} - -.column-five-eighths { - @include grid-column(5/8); -} - -.column-seven-eighths { - @include grid-column(7/8); +.govuk-grid-column-seven-eighths { + @include govuk-grid-column(seven-eighths, $class: false); } %top-gutter, .top-gutter { @extend %contain-floats; display: block; - margin-top: $gutter; + margin-top: govuk-spacing(6); clear: both; } .top-gutter-4-3 { @extend %top-gutter; - margin-top: $gutter * 4 / 3; + margin-top: govuk-spacing(7); } .top-gutter-1-2 { @extend %top-gutter; - margin-top: $gutter-half; + margin-top: govuk-spacing(3); } .top-gutter-1-3 { @extend %top-gutter; - margin-top: $gutter / 3; + margin-top: govuk-spacing(2); } .top-gutter-2-3 { @extend %top-gutter; - margin-top: $gutter * 2 / 3; + margin-top: govuk-spacing(4); } .top-gutter-0 { @@ -61,41 +54,41 @@ %bottom-gutter, .bottom-gutter { @extend %contain-floats; - margin-bottom: $gutter; + margin-bottom: govuk-spacing(6); clear: both; } .bottom-gutter-2-3 { @extend %bottom-gutter; - margin-bottom: $gutter-two-thirds; + margin-bottom: govuk-spacing(4); } .bottom-gutter-1-2 { @extend %bottom-gutter; - margin-bottom: $gutter-half; + margin-bottom: govuk-spacing(3); } .bottom-gutter-1-3 { @extend %bottom-gutter; - margin-bottom: $gutter/3; + margin-bottom: govuk-spacing(2); } .bottom-gutter-3-2 { @extend %bottom-gutter; - margin-bottom: $gutter * 3/2; + margin-bottom: govuk-spacing(6) * 3/2; } .bottom-gutter-2 { @extend %bottom-gutter; - margin-bottom: $gutter * 2; + margin-bottom: govuk-spacing(9); } .left-gutter { - padding-left: $gutter; + padding-left: govuk-spacing(6); } .left-gutter-4-3 { - padding-left: $gutter * 4 / 3; + padding-left: govuk-spacing(7); } .align-with-heading { @@ -118,21 +111,5 @@ } .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; - } + margin-top: govuk-spacing(8); } diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss index c195d3eed..1135d69ab 100644 --- a/app/assets/stylesheets/app.scss +++ b/app/assets/stylesheets/app.scss @@ -1,10 +1,4 @@ // Extra CSS overlaying elements -a { - &:visited { - color: $link-colour; - } -} - .form-control-1-1 { width: 100%; } @@ -23,7 +17,7 @@ a { .heading-large, > .heading-medium { - margin: $gutter-half 0 ($gutter / 3 * 2) 0; + margin: govuk-spacing(3) 0 govuk-spacing(4) 0; word-wrap: break-word; &.top-gutter-0 { @@ -61,7 +55,7 @@ td { } .heading-medium { - margin-top: $gutter; + margin-top: govuk-spacing(6); } .form-label { @@ -92,12 +86,12 @@ td { details summary { text-decoration: underline; - margin-bottom: $gutter-half; + margin-bottom: govuk-spacing(3); } .spreadsheet { - margin-bottom: -$gutter; + margin-bottom: -1 * govuk-spacing(6); .table { margin-bottom: 0; @@ -193,10 +187,6 @@ details .arrow { margin-top: 5px; } -#content.override-elements-content { - padding-bottom: 0; -} - .multiple-choice input:disabled+label { opacity: 1; color: $secondary-text-colour; @@ -218,5 +208,5 @@ details .arrow { } .heading-upcoming-jobs { - margin-top: $gutter-half; + margin-top: govuk-spacing(3); } diff --git a/app/assets/stylesheets/components/banner.scss b/app/assets/stylesheets/components/banner.scss index dac7613d4..5cbe60a45 100644 --- a/app/assets/stylesheets/components/banner.scss +++ b/app/assets/stylesheets/components/banner.scss @@ -5,8 +5,8 @@ @include bold-19; color: $button-colour; display: block; - padding: $gutter-half; - margin: $gutter-half 0 $gutter 0; + padding: govuk-spacing(3); + margin: govuk-spacing(3) 0 govuk-spacing(6) 0; text-align: left; position: relative; clear: both; @@ -28,11 +28,11 @@ %banner-with-tick, .banner-with-tick { - padding: $gutter-half ($gutter + $gutter-half); + padding: govuk-spacing(3) (govuk-spacing(6) + govuk-spacing(3)); background-image: file-url('tick.png'); background-size: 19px; background-repeat: no-repeat; - background-position: $gutter-half $gutter-half; + background-position: govuk-spacing(3) govuk-spacing(3); } @@ -55,19 +55,6 @@ outline: 3px solid $yellow; } - a { - - &:link, - &:visited { - color: $error-colour; - } - - &:hover { - color: $mellow-red; - } - - } - .list { margin-bottom: 0; } @@ -81,7 +68,7 @@ color: $white; margin-top: 10px; margin-bottom: 0; - padding: $gutter; + padding: govuk-spacing(6); height: 425px; overflow: hidden; box-shadow: inset 0 -1em 1.6em 0 rgba(0, 0, 0, 0.05); @@ -94,40 +81,40 @@ p { margin-top: 0; - margin-bottom: $gutter; + margin-bottom: govuk-spacing(6); &:last-child { margin-bottom: 0; } & + p { - margin-top: -$gutter-half; + margin-top: -1 * govuk-spacing(3); } } a { - @include bold-19; + font-weight: bold; display: block; padding: 0 ; - margin: 0 0 $gutter 0; + margin: 0 0 govuk-spacing(6) 0; &:link, &:visited { color: $white; } - &:hover, + &:focus, &:active { - background-color: $link-hover-colour; - outline: 10px solid $link-hover-colour; + color: $govuk-focus-text-colour; + outline: 10px solid $yellow; } - &:active, - &:focus { - background-color: $yellow; - outline: 10px solid $yellow; + &:hover { + color: $white; + background-color: $link-hover-colour; + outline: 10px solid $link-hover-colour; } } @@ -146,15 +133,15 @@ display: flex; align-items: baseline; flex-wrap: wrap; - padding: ($gutter-half - 1px) 0 ($gutter-half + 1px) 0; + padding: (govuk-spacing(3) - 1px) 0 (govuk-spacing(3) + 1px) 0; border-top: 1px solid $border-colour; border-bottom: 1px solid $border-colour; - margin-bottom: $gutter; + margin-bottom: govuk-spacing(6); text-decoration: none; &:focus { border-top: 1px solid transparent; - border-bottom: 1px solid transparent; + border-bottom: 1px solid transparent; } &-count, @@ -188,7 +175,7 @@ } & + .banner-dashboard { - margin-top: -$gutter; + margin-top: -1 * govuk-spacing(6); border-top: none; } } diff --git a/app/assets/stylesheets/components/big-number.scss b/app/assets/stylesheets/components/big-number.scss index 7e4fa81a8..bed587724 100644 --- a/app/assets/stylesheets/components/big-number.scss +++ b/app/assets/stylesheets/components/big-number.scss @@ -18,7 +18,7 @@ .big-number-dark { @extend %big-number; - padding: $gutter-half; + padding: govuk-spacing(3); position: relative; background: $black; color: $white; @@ -52,11 +52,11 @@ @extend %big-number; position: relative; - margin-bottom: $gutter-two-thirds; + margin-bottom: govuk-spacing(4); .big-number, .big-number-smaller { - padding: $gutter-half; + padding: govuk-spacing(3); position: relative; background: $black; color: $white; @@ -130,7 +130,6 @@ &:active, &:focus { color: $black; - border-bottom: 1px solid $black; } } @@ -147,12 +146,12 @@ .big-number-meta-wrapper { position: relative; - margin: $gutter-half 0 $gutter 0; + margin: govuk-spacing(3) 0 govuk-spacing(6) 0; background: $govuk-blue; .big-number-meta { - padding: ($gutter / 3) $gutter-half; + padding: govuk-spacing(2) govuk-spacing(3); color: $white; pointer-events: none; diff --git a/app/assets/stylesheets/components/browse-list.scss b/app/assets/stylesheets/components/browse-list.scss index bc63bd9a6..9b1647110 100644 --- a/app/assets/stylesheets/components/browse-list.scss +++ b/app/assets/stylesheets/components/browse-list.scss @@ -1,11 +1,11 @@ .browse-list { - margin-bottom: $gutter-half; + margin-bottom: govuk-spacing(3); .browse-sub-list { - margin-top: $gutter-half; - margin-left: $gutter; + margin-top: govuk-spacing(3); + margin-left: govuk-spacing(6); @include media('desktop') { - margin-left: $gutter * 2; + margin-left: govuk-spacing(9); } } @@ -13,26 +13,11 @@ &-sub-item { @include bold-24; list-style: none; - margin-bottom: $gutter-half; + margin-bottom: govuk-spacing(3); } &-link { - @include bold-24; - - &-destructive { - @include bold-24; - color: $error-colour; - - &:visited, - &:link { - @include bold-24; - color: $error-colour; - } - - &:hover { - color: $mellow-red; - } - } + @include govuk-font(24, $weight: bold); } &-hint { diff --git a/app/assets/stylesheets/components/checkboxes.scss b/app/assets/stylesheets/components/checkboxes.scss index 9189d46d7..3986c65bf 100644 --- a/app/assets/stylesheets/components/checkboxes.scss +++ b/app/assets/stylesheets/components/checkboxes.scss @@ -3,7 +3,7 @@ .selection-summary__text { @include core-19($tabular-numbers: true); padding: 5px 0 0 0; - margin-bottom: $gutter / 2; + margin-bottom: govuk-spacing(3); &:focus { outline: none; @@ -66,7 +66,7 @@ } .selection-content { - margin-bottom: ($gutter / 3) * 2; + margin-bottom: govuk-spacing(4); .checkboxes-nested { margin-bottom: 0; diff --git a/app/assets/stylesheets/components/conditional-radios.scss b/app/assets/stylesheets/components/conditional-radios.scss index e23eccae4..204841740 100644 --- a/app/assets/stylesheets/components/conditional-radios.scss +++ b/app/assets/stylesheets/components/conditional-radios.scss @@ -1,5 +1,5 @@ $border-thickness: 4px; -$top-spacing: $gutter - 5px; +$top-spacing: govuk-spacing(5); .multiple-choice { @@ -17,8 +17,8 @@ $top-spacing: $gutter - 5px; &-panel { border-left: $border-thickness solid $border-colour; - margin: 0 0 (-$gutter-half) ($gutter-half + ($border-thickness / 2)); - padding: $gutter-half 0 0 ($gutter - ($border-thickness / 2)); + margin: 0 0 (-1 * govuk-spacing(3)) (govuk-spacing(3) + ($border-thickness / 2)); + padding: govuk-spacing(3) 0 0 (govuk-spacing(6) - ($border-thickness / 2)); position: relative; top: -$top-spacing; z-index: 1; diff --git a/app/assets/stylesheets/components/email-message.scss b/app/assets/stylesheets/components/email-message.scss index c829a0de3..8147ed3db 100644 --- a/app/assets/stylesheets/components/email-message.scss +++ b/app/assets/stylesheets/components/email-message.scss @@ -1,12 +1,12 @@ $white-50-opaque: rgba($white, 0.5); $button-bottom-border-colour: rgba(0, 0, 0, 0.17); -$email-message-gutter: $gutter * 2; +$email-message-gutter: govuk-spacing(9); // sass-lint:disable no-important .email-message { - margin-bottom: $gutter; + margin-bottom: govuk-spacing(6); border: 1px solid $border-colour; &-meta { @@ -49,7 +49,7 @@ $email-message-gutter: $gutter * 2; width: 100%; box-sizing: border-box; - padding: $gutter-half $email-message-gutter 0 $email-message-gutter; + padding: govuk-spacing(3) $email-message-gutter 0 $email-message-gutter; margin: 0 0 0 0; clear: both; position: relative; diff --git a/app/assets/stylesheets/components/file-upload.scss b/app/assets/stylesheets/components/file-upload.scss index 35adb510e..5e99592f2 100644 --- a/app/assets/stylesheets/components/file-upload.scss +++ b/app/assets/stylesheets/components/file-upload.scss @@ -31,7 +31,7 @@ &-filename { @include bold-19; display: inline-block; - padding-left: $gutter-half; + padding-left: govuk-spacing(3); } &-submit { @@ -43,7 +43,7 @@ line-height: 35px; a { - @include bold-19; + font-weight: bold; } } diff --git a/app/assets/stylesheets/components/fullscreen-table.scss b/app/assets/stylesheets/components/fullscreen-table.scss index 08da3dfad..57c400a31 100644 --- a/app/assets/stylesheets/components/fullscreen-table.scss +++ b/app/assets/stylesheets/components/fullscreen-table.scss @@ -6,7 +6,7 @@ z-index: 10; overflow-y: hidden; box-sizing: border-box; - margin: 0 0 $gutter 0; + margin: 0 0 govuk-spacing(6) 0; padding: 0 0 0 0; overflow: hidden; border-bottom: 1px solid $border-colour; diff --git a/app/assets/stylesheets/components/letter.scss b/app/assets/stylesheets/components/letter.scss index 500fe32ac..84503da16 100644 --- a/app/assets/stylesheets/components/letter.scss +++ b/app/assets/stylesheets/components/letter.scss @@ -9,7 +9,7 @@ $iso-paper-ratio: 141.42135624%; .letter { padding: $iso-paper-ratio 0 0 0; - margin: 0 0 $gutter 0; + margin: 0 0 govuk-spacing(6) 0; position: relative; background: $panel-colour; @@ -89,3 +89,8 @@ $iso-paper-ratio: 141.42135624%; } } + +.letter-recipient-summary { + line-height: 28px; + margin-bottom: 0; +} diff --git a/app/assets/stylesheets/components/live-search.scss b/app/assets/stylesheets/components/live-search.scss index acd868b13..d1fd91b60 100644 --- a/app/assets/stylesheets/components/live-search.scss +++ b/app/assets/stylesheets/components/live-search.scss @@ -14,7 +14,7 @@ input[type=search] { } .form-group { - margin-bottom: $gutter * 2 / 3; + margin-bottom: govuk-spacing(4); } } diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss index e6773357b..3d63ff455 100644 --- a/app/assets/stylesheets/components/message.scss +++ b/app/assets/stylesheets/components/message.scss @@ -2,7 +2,7 @@ display: inline-block; vertical-align: top; width: 20px; - height: $gutter; + height: govuk-spacing(6); position: relative; &:before { @@ -31,18 +31,11 @@ margin: 0; a { - margin-bottom: -$gutter; - padding-bottom: $gutter; - - &:hover { - color: $link-hover-colour; - - .message-name-separator { - &:before { - border-color: $link-hover-colour; - } - } + margin-bottom: -1 * govuk-spacing(6); + padding-bottom: govuk-spacing(6); + &:hover .message-name-separator:before { + border-color: $link-hover-colour; } &:focus { @@ -71,7 +64,7 @@ &-type { color: $secondary-text-colour; - margin: 0 0 $gutter-two-thirds 0; + margin: 0 0 govuk-spacing(4) 0; pointer-events: none; } @@ -79,7 +72,7 @@ #template-list { - margin-top: $gutter; + margin-top: govuk-spacing(6); &.top-gutter-5px { margin-top: 5px; @@ -94,7 +87,7 @@ &-with-checkbox { position: relative; - padding-left: $gutter * 2; + padding-left: govuk-spacing(9); .multiple-choice { position: absolute; @@ -155,22 +148,22 @@ &-empty { color: $secondary-text-colour; - padding: $gutter-half 0 $gutter-one-third 0; + padding: govuk-spacing(3) 0 govuk-spacing(2) 0; } &-selected-counter { color: $secondary-text-colour; - margin: $gutter-half 0; + margin: govuk-spacing(3) 0; @include media(tablet) { position: absolute; right: 0; - top: $gutter - 1px; + top: govuk-spacing(6) - 1px; margin: 0; } .content-fixed & { - right: $gutter-half; + right: govuk-spacing(3); } } @@ -179,8 +172,8 @@ .folder-heading { - .grid-row & { - margin: $gutter-half 0 20px 0; + .govuk-grid-row & { + margin: govuk-spacing(3) 0 20px 0; word-wrap: break-word; } @@ -253,7 +246,7 @@ &-manage-link { display: block; text-align: right; - padding: $gutter-two-thirds 0 0 0; + padding: govuk-spacing(4) 0 0 0; position: relative; top: -6px; } diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss index 08b6476d4..f2f40ea54 100644 --- a/app/assets/stylesheets/components/navigation.scss +++ b/app/assets/stylesheets/components/navigation.scss @@ -1,41 +1,59 @@ .navigation { - padding: 0 $gutter 0 0; + @include govuk-font($size: 19); + padding: 0 govuk-spacing(6) 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; - } + padding: $padding-top 0 $padding-bottom govuk-spacing(3); &:focus { outline: none; @@ -43,22 +61,14 @@ 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; + padding: $padding-top govuk-spacing(3) $padding-bottom 0; display: inline-block; - text-decoration: none; - - &:hover { - text-decoration: underline; - color: $link-hover-colour; - } } @@ -66,16 +76,9 @@ &-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; + margin-right: 5px; box-sizing: border-box; position: relative; @@ -85,7 +88,7 @@ position: absolute; top: -1px; bottom: 1px; - right: 6px; + right: 7px; width: 7px; height: 7px; margin: auto 0; @@ -97,13 +100,8 @@ border-color: $secondary-text-colour; } - &:hover { - color: $link-hover-colour; - text-decoration: underline; - } - + // hack to make the focus style fit in the navigation bar &: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; } @@ -111,7 +109,6 @@ } li { - @include core-19; margin: 0; list-style-type: none; } @@ -129,14 +126,9 @@ } &:hover { - color: $link-hover-colour; text-decoration: underline; } - &:focus { - color: $text-colour; - } - &.selected { @include bold-19; position: relative; @@ -153,7 +145,7 @@ // https://github.com/alphagov/product-page-example/blob/master/source/stylesheets/modules/_sub-navigation.scss .sub-navigation { @include media(tablet) { - margin-top: $gutter * 1.5; + margin-top: govuk-spacing(6) * 1.5; } ol, @@ -168,7 +160,7 @@ border-bottom: 1px $grey-3 solid; display: block; - padding: $gutter-one-third 0; + padding: govuk-spacing(2) 0; a:link { text-decoration: none; @@ -180,7 +172,7 @@ } ol ol & { - padding-left: $gutter; + padding-left: govuk-spacing(6); } } diff --git a/app/assets/stylesheets/components/page-footer.scss b/app/assets/stylesheets/components/page-footer.scss index cdf95ff65..19209a24c 100644 --- a/app/assets/stylesheets/components/page-footer.scss +++ b/app/assets/stylesheets/components/page-footer.scss @@ -8,33 +8,16 @@ 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; } &-secondary-link { display: block; - margin-top: $gutter; + margin-top: govuk-spacing(6); } &-right-aligned-link { diff --git a/app/assets/stylesheets/components/pill.scss b/app/assets/stylesheets/components/pill.scss index d8dab6cdf..72004fa1a 100644 --- a/app/assets/stylesheets/components/pill.scss +++ b/app/assets/stylesheets/components/pill.scss @@ -88,7 +88,7 @@ display: block; text-align: left; - padding: 10px $gutter-half; + padding: 10px govuk-spacing(3); text-align: center; &:link, diff --git a/app/assets/stylesheets/components/preview-pane.scss b/app/assets/stylesheets/components/preview-pane.scss index 12b8c28c5..9b2c8618f 100644 --- a/app/assets/stylesheets/components/preview-pane.scss +++ b/app/assets/stylesheets/components/preview-pane.scss @@ -3,7 +3,7 @@ box-sizing: border-box; border: solid 1px $border-colour; min-height: 200px; - margin-bottom: $gutter + margin-bottom: govuk-spacing(6) } #logo-img { diff --git a/app/assets/stylesheets/components/show-more.scss b/app/assets/stylesheets/components/show-more.scss index cf912a311..3cba1623a 100644 --- a/app/assets/stylesheets/components/show-more.scss +++ b/app/assets/stylesheets/components/show-more.scss @@ -4,7 +4,7 @@ @include core-16; display: block; padding: 0 0; - margin: $gutter-half 0 $gutter-half 0; + margin: govuk-spacing(3) 0 govuk-spacing(3) 0; text-align: center; border-top: 1px solid $border-colour; diff --git a/app/assets/stylesheets/components/site-footer.scss b/app/assets/stylesheets/components/site-footer.scss index e4f2e24e1..ad0c1ace8 100644 --- a/app/assets/stylesheets/components/site-footer.scss +++ b/app/assets/stylesheets/components/site-footer.scss @@ -3,8 +3,8 @@ margin: 0 auto; &-wrapper { - margin-bottom: $gutter; - padding-bottom: $gutter * 2; + margin-bottom: govuk-spacing(6); + padding-bottom: govuk-spacing(9); border-bottom: 1px solid $grey-2; } diff --git a/app/assets/stylesheets/components/sms-message.scss b/app/assets/stylesheets/components/sms-message.scss index 054d6b797..f524532b3 100644 --- a/app/assets/stylesheets/components/sms-message.scss +++ b/app/assets/stylesheets/components/sms-message.scss @@ -6,12 +6,12 @@ $tail-angle: 20deg; width: 100%; max-width: 464px; box-sizing: border-box; - padding: $gutter-half $gutter-half $gutter-half $gutter-half; + padding: govuk-spacing(3); background: $panel-colour; border: 1px solid $panel-colour; border-radius: 5px; white-space: normal; - margin: 0 0 $gutter 0; + margin: 0 0 govuk-spacing(6) 0; clear: both; word-wrap: break-word; @@ -63,7 +63,7 @@ $tail-angle: 20deg; .sms-message-status { @include core-16; color: $secondary-text-colour; - margin: -20px $gutter-half 20px $gutter-half; + margin: -20px govuk-spacing(3) 20px govuk-spacing(3); } .sms-message-status-outbound { diff --git a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss index c60647f9b..14afd4352 100644 --- a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss +++ b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss @@ -1,14 +1,14 @@ // CSS adapted from // https://github.com/alphagov/govuk_frontend_toolkit/blob/d9489a987086471fe30b4b925a81c12cd198c91d/docs/javascript.md#stick-at-top-when-scrolling -$sticky-padding: $gutter * 2 / 3; +$sticky-padding: govuk-spacing(4); .js-stick-at-top-when-scrolling, .js-stick-at-bottom-when-scrolling { overflow: hidden; - margin-left: -$gutter-half; - padding: 10px 0 0 $gutter-half; + margin-left: -1 * govuk-spacing(3); + padding: 10px 0 0 govuk-spacing(3); position: relative; .form-group { @@ -21,8 +21,8 @@ $sticky-padding: $gutter * 2 / 3; .back-to-top-link { position: absolute; - top: $gutter; - right: $gutter-half; + top: govuk-spacing(6); + right: govuk-spacing(3); opacity: 0; transition: opacity 0.1s ease-in-out; } @@ -41,7 +41,7 @@ $sticky-padding: $gutter * 2 / 3; .js-stick-at-bottom-when-scrolling { transition: bottom 0.1s ease-out, box-shadow 1s ease-in-out; - padding: $sticky-padding 0 $sticky-padding $gutter-half; + padding: $sticky-padding 0 $sticky-padding govuk-spacing(3); margin-top: -$sticky-padding; & + .js-stick-at-bottom-when-scrolling { @@ -68,7 +68,7 @@ $sticky-padding: $gutter * 2 / 3; position: fixed; background: $white; z-index: 100; - padding-right: $gutter-half; + padding-right: govuk-spacing(3); margin-top: 0; .back-to-top-link { diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss index 61dba8ed5..86aff3824 100644 --- a/app/assets/stylesheets/components/table.scss +++ b/app/assets/stylesheets/components/table.scss @@ -1,11 +1,11 @@ .table { - margin-bottom: $gutter; + margin-bottom: govuk-spacing(6); width: 100%; } .table-heading { text-align: left; - margin: $gutter-half 0 $gutter-half 0; + margin: govuk-spacing(3) 0 govuk-spacing(3) 0; } .dashboard-table { @@ -49,6 +49,10 @@ } } + .big-number-label { + padding-bottom: 0; + } + } .template-statistics-table { @@ -115,7 +119,7 @@ table { table-layout: fixed; - margin-bottom: $gutter / 6; + margin-bottom: govuk-spacing(1); } th { @@ -212,15 +216,6 @@ color: $error-colour; font-weight: bold; - a { - - &:link, - &:visited { - color: $error-colour; - } - - } - .status-hint { display: block; font-weight: normal; @@ -348,30 +343,20 @@ position: absolute; - top: -$gutter-half; + top: -1 * govuk-spacing(3); right: 0; - bottom: -$gutter-half + 4px; - left: -$gutter-half; + bottom: -1 * govuk-spacing(3) + 4px; + left: -1 * govuk-spacing(3); background: transparent; } - &:hover { - color: $link-hover-colour; - } - - &:active, - &:focus { - - color: $black; - - &:before { - border-color: $yellow; - border-style: solid; - border-width: 15px 3px 15px 15px; - right: -3px; - } - + &:active:before, + &:focus:before { + border-color: $yellow; + border-style: solid; + border-width: 15px 3px 15px 15px; + right: -3px; } } @@ -396,13 +381,13 @@ td.table-empty-message { @include core-16; color: $secondary-text-colour; - margin-bottom: $gutter * 1.3333; + margin-bottom: govuk-spacing(7); border-bottom: 1px solid $border-colour; padding: 35px 0 10px 0; text-align: center; .table + & { - margin-top: -$gutter; + margin-top: -1 * govuk-spacing(6); } } @@ -415,7 +400,7 @@ a.table-show-more-link { @include core-16; color: $secondary-text-colour; margin-top: 10px; - margin-bottom: $gutter * 1.3333; + margin-bottom: govuk-spacing(7); border-top: 1px solid $border-colour; border-bottom: 1px solid $border-colour; padding: 0.75em 0 0.5625em 0; diff --git a/app/assets/stylesheets/components/task-list.scss b/app/assets/stylesheets/components/task-list.scss index ae751d7ea..5fe309920 100644 --- a/app/assets/stylesheets/components/task-list.scss +++ b/app/assets/stylesheets/components/task-list.scss @@ -6,7 +6,7 @@ $indicator-colour: $black; padding: 3px 8px 1px 8px; position: absolute; right: 0; - top: $gutter - 2px; + top: govuk-spacing(6) - 2px; margin-top: -15px; border: 2px solid $indicator-colour; pointer-events: none; @@ -18,7 +18,7 @@ $indicator-colour: $black; .task-list { border-top: 1px solid $border-colour; - margin: $gutter 0; + margin: govuk-spacing(6) 0; &-item { @@ -27,23 +27,18 @@ $indicator-colour: $black; a { border-bottom: 1px solid $border-colour; display: block; - padding: $gutter-half 0; + padding: govuk-spacing(3) 0; 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; margin-bottom: -2px; - padding-top: $gutter-half + 1px; - padding-bottom: $gutter-half + 1px; + padding-top: govuk-spacing(3) + 1px; + padding-bottom: govuk-spacing(3) + 1px; } } diff --git a/app/assets/stylesheets/components/textbox.scss b/app/assets/stylesheets/components/textbox.scss index 4e6c4e484..f3a170eb4 100644 --- a/app/assets/stylesheets/components/textbox.scss +++ b/app/assets/stylesheets/components/textbox.scss @@ -36,7 +36,7 @@ overflow-wrap: break-word; word-wrap: break-word; border: 2px solid transparent; - padding-bottom: $gutter-half; + padding-bottom: govuk-spacing(3); z-index: 10; .placeholder, diff --git a/app/assets/stylesheets/components/tick-cross.scss b/app/assets/stylesheets/components/tick-cross.scss index 4136dab7e..9d9ce2489 100644 --- a/app/assets/stylesheets/components/tick-cross.scss +++ b/app/assets/stylesheets/components/tick-cross.scss @@ -23,12 +23,10 @@ &-list { - @extend %grid-row; position: relative; &-permissions { - @include grid-column(3/4); margin-top: 5px; li { @@ -53,30 +51,20 @@ position: absolute; - top: -$gutter-half - 1; + top: -1 * govuk-spacing(3) - 1; right: 0; - bottom: -$gutter-half; - left: -$gutter-half; + bottom: -1 * govuk-spacing(3); + left: -1 * govuk-spacing(3); background: transparent; } - &:hover { - color: $link-hover-colour; - } - - &:active, - &:focus { - - color: $black; - - &:before { - border-color: $yellow; - border-style: solid; - border-width: 15px 3px 15px 15px; - right: -3px; - } - + &:active:before, + &:focus:before { + border-color: $yellow; + border-style: solid; + border-width: 15px 3px 15px 15px; + right: -3px; } } diff --git a/app/assets/stylesheets/components/vendor/breadcrumbs.scss b/app/assets/stylesheets/components/vendor/breadcrumbs.scss index 8f1cb149a..53a233b8a 100644 --- a/app/assets/stylesheets/components/vendor/breadcrumbs.scss +++ b/app/assets/stylesheets/components/vendor/breadcrumbs.scss @@ -29,14 +29,14 @@ */ .breadcrumbs { - @extend %site-width-container; + @include govuk-width-container; @include core-16($line-height: (25 / 16), $line-height-640: 1.75); - padding: $gutter-one-third 0; + padding: govuk-spacing(2) 0; list-style: none; @include media(tablet) { - margin-bottom: $gutter; + margin-bottom: govuk-spacing(6); } ol { @@ -49,7 +49,7 @@ display: inline-block; margin: 0; - padding: 0 $gutter-one-quarter 0 (11px + $gutter-one-quarter); + padding: 0 (govuk-spacing(6) / 4) 0 (11px + govuk-spacing(6) / 4); background-image: file-url('separator.png'); background-repeat: no-repeat; diff --git a/app/assets/stylesheets/components/vendor/previous-next-navigation.scss b/app/assets/stylesheets/components/vendor/previous-next-navigation.scss index 0e060f12c..940542a4e 100644 --- a/app/assets/stylesheets/components/vendor/previous-next-navigation.scss +++ b/app/assets/stylesheets/components/vendor/previous-next-navigation.scss @@ -30,10 +30,11 @@ $is-ie: false !default; .govuk-previous-and-next-navigation { display: block; - margin-top: $gutter; - margin-bottom: $gutter; - margin-left: -$gutter-half; - margin-right: -$gutter-half; + margin-top: govuk-spacing(6); + margin-bottom: govuk-spacing(6); + margin-left: -1 * govuk-spacing(3); + margin-right: -1 * govuk-spacing(3); + overflow: hidden; ul { margin: 0; @@ -51,13 +52,9 @@ $is-ie: false !default; a { display: block; - padding: $gutter-half; + padding: govuk-spacing(3); 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 9da8fb427..b24b39ea4 100644 --- a/app/assets/stylesheets/globals.scss +++ b/app/assets/stylesheets/globals.scss @@ -5,6 +5,16 @@ 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; @@ -41,34 +51,6 @@ 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 0d4b693fa..80cce8a3b 100644 --- a/app/assets/stylesheets/govuk-frontend/extensions.scss +++ b/app/assets/stylesheets/govuk-frontend/extensions.scss @@ -8,3 +8,43 @@ } } +// 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; +} +$govuk-grid-widths: ( + one-eighth: 12.5%, + one-sixth: 16.6666%, + one-quarter: 25%, + one-third: 33.3333%, + one-half: 50%, + five-eighths: 62.5%, + two-thirds: 66.6666%, + three-quarters: 75%, + five-sixths: 83.3333%, + seven-eighths: 87.5%, + full: 100% +); diff --git a/app/assets/stylesheets/local/_typography.scss b/app/assets/stylesheets/local/_typography.scss new file mode 100644 index 000000000..401562515 --- /dev/null +++ b/app/assets/stylesheets/local/_typography.scss @@ -0,0 +1,62 @@ +@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 cec02421b..2a9ae48ae 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -27,7 +27,6 @@ $path: '/static/images/'; @import 'elements/forms'; @import 'elements/forms/form-multiple-choice'; @import 'elements/forms/form-validation'; -@import 'elements/layout'; @import 'elements/lists'; @import 'elements/panels'; @import 'elements/tables'; @@ -36,6 +35,7 @@ $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/api.scss b/app/assets/stylesheets/views/api.scss index 4049c43c5..f2f1b717b 100644 --- a/app/assets/stylesheets/views/api.scss +++ b/app/assets/stylesheets/views/api.scss @@ -18,7 +18,7 @@ &__heading { display: block; - margin-bottom: $gutter-half; + margin-bottom: govuk-spacing(3); &::before { top: -1.3em; diff --git a/app/assets/stylesheets/views/dashboard.scss b/app/assets/stylesheets/views/dashboard.scss index b300d5be2..1db274e5f 100644 --- a/app/assets/stylesheets/views/dashboard.scss +++ b/app/assets/stylesheets/views/dashboard.scss @@ -5,14 +5,14 @@ } > .heading-medium:first-of-type { - margin-top: $gutter-half; + margin-top: govuk-spacing(3); } } .keyline-block { border-top: 1px solid $border-colour; - padding-top: $gutter-half; + padding-top: govuk-spacing(3); } .spark-bar { @@ -21,8 +21,8 @@ box-sizing: border-box; display: block; width: 100%; - margin-bottom: $gutter-half; - height: $gutter-half; + margin-bottom: govuk-spacing(3); + height: govuk-spacing(3); color: $text-colour; text-align: left; @@ -56,6 +56,18 @@ margin-top: -10px; } + &-filename-large { + @include bold-24; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + padding-bottom: 30px; + padding-top: 10px; + margin-bottom: -30px; + margin-top: -10px; + } + &-filename-unlinked { @include core-19; } @@ -71,6 +83,17 @@ max-width: 580px; } + &-hint-large { + @include core-19; + display: block; + color: $secondary-text-colour; + pointer-events: none; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + max-width: 580px; + } + } .failure-highlight { @@ -80,5 +103,5 @@ .align-with-message-body { display: block; - margin-top: $gutter * 5 / 6; + margin-top: govuk-spacing(5); } diff --git a/app/assets/stylesheets/views/get_started.scss b/app/assets/stylesheets/views/get_started.scss index b46ae0115..ed914894f 100644 --- a/app/assets/stylesheets/views/get_started.scss +++ b/app/assets/stylesheets/views/get_started.scss @@ -5,8 +5,8 @@ &__item { counter-increment: get-started-counter; - padding: 0 0 0 $gutter + 5px; - margin: ($gutter * 1.67) 0 0 0; + padding: 0 0 0 govuk-spacing(6) + 5px; + margin: govuk-spacing(8) 0 0 0; position: relative; &:before { @@ -26,7 +26,7 @@ &__heading { @include bold-24; display: inline-block; - margin: 5px 0 $gutter-half 0; + margin: 5px 0 govuk-spacing(3) 0; } } diff --git a/app/assets/stylesheets/views/history.scss b/app/assets/stylesheets/views/history.scss index b625c82e1..a8d16514e 100644 --- a/app/assets/stylesheets/views/history.scss +++ b/app/assets/stylesheets/views/history.scss @@ -1,13 +1,13 @@ -$item-top-padding: $gutter-half; +$item-top-padding: govuk-spacing(3); .history-list { @include core-19; - margin-bottom: $gutter; + margin-bottom: govuk-spacing(6); &-item { - padding: $item-top-padding 0 $gutter-half 0; + padding: $item-top-padding 0 govuk-spacing(3) 0; border-top: 1px solid $border-colour; position: relative; diff --git a/app/assets/stylesheets/views/notification.scss b/app/assets/stylesheets/views/notification.scss index e26268f56..e0586069a 100644 --- a/app/assets/stylesheets/views/notification.scss +++ b/app/assets/stylesheets/views/notification.scss @@ -2,22 +2,18 @@ @include core-16; color: $secondary-text-colour; - margin-top: -$gutter-half; + margin-top: -1 * govuk-spacing(3); &.error { - color: $error-colour; + color: $govuk-error-colour; font-weight: bold; - a { - color: $error-colour; - } - } &-cancelled { @include bold-19; - color: $error-colour; + color: $govuk-error-colour; } } diff --git a/app/assets/stylesheets/views/product-page.scss b/app/assets/stylesheets/views/product-page.scss index 927379ff2..d1de13f70 100644 --- a/app/assets/stylesheets/views/product-page.scss +++ b/app/assets/stylesheets/views/product-page.scss @@ -11,14 +11,14 @@ $button-shadow-size: $govuk-border-width-form-element; // We need the `
` section to be above it, like the default order, so when we apply the // negative margin-top it overlaps the theme bar at the bottom of the header position: relative; - margin: -10px 0 $gutter * 1.5 0; - padding: 0 0 $gutter * 2 0; + margin: -10px 0 govuk-spacing(6) * 1.5 0; + padding: 0 0 govuk-spacing(9) 0; background: $product-page-blue; color: $white; &-wrapper { - @extend %site-width-container; + @include govuk-width-container; @include media(desktop) { background-image: file-url('product/proposition-illustration.png'); @@ -31,12 +31,12 @@ $button-shadow-size: $govuk-border-width-form-element; h1 { @include bold-48; - margin: 20px 0 $gutter 0; + margin: 20px 0 govuk-spacing(6) 0; } p { @include core-24; - margin: $gutter-half 0 $gutter; + margin: govuk-spacing(3) 0 govuk-spacing(6); } .govuk-link { @@ -57,22 +57,22 @@ $button-shadow-size: $govuk-border-width-form-element; &-section { - @extend %site-width-container; - margin-bottom: $gutter-half; + @include govuk-width-container; + margin-bottom: govuk-spacing(3); h2 { @include bold-27; - margin: 0 0 $gutter; + margin: 0 0 govuk-spacing(6); } .with-keyline { border-top: 1px solid $border-colour; - padding: $gutter * 1.5 0 0 0; + padding: govuk-spacing(6) * 1.5 0 0 0; } img { width: 100%; - margin: 0 0 $gutter * 1.5 0; + margin: 0 0 govuk-spacing(6) * 1.5 0; } } diff --git a/app/assets/stylesheets/views/template.scss b/app/assets/stylesheets/views/template.scss index df7539f5b..201abefac 100644 --- a/app/assets/stylesheets/views/template.scss +++ b/app/assets/stylesheets/views/template.scss @@ -9,7 +9,7 @@ position: absolute; background: $link-colour; color: $white; - padding: 10px $gutter-half; + padding: 10px govuk-spacing(3); z-index: 10000; &:link, &:visited { diff --git a/app/assets/stylesheets/views/users.scss b/app/assets/stylesheets/views/users.scss index 3610e7567..259d14bcc 100644 --- a/app/assets/stylesheets/views/users.scss +++ b/app/assets/stylesheets/views/users.scss @@ -1,19 +1,19 @@ -$item-top-padding: $gutter-half; +$item-top-padding: govuk-spacing(3); .user-list { @include core-19; - margin-bottom: $gutter; + margin-bottom: govuk-spacing(6); &-item { - padding: $item-top-padding 150px $gutter-half 0; + padding: $item-top-padding 150px govuk-spacing(3) 0; border-top: 1px solid $border-colour; position: relative; h3 { - padding-right: $gutter-half; + padding-right: govuk-spacing(3); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/app/config.py b/app/config.py index cd694be4b..9d470974e 100644 --- a/app/config.py +++ b/app/config.py @@ -24,7 +24,6 @@ class Config(object): STATSD_ENABLED = False STATSD_HOST = os.getenv('STATSD_HOST') STATSD_PORT = 8125 - STATSD_PREFIX = os.getenv('STATSD_PREFIX') # Logging DEBUG = False @@ -69,6 +68,7 @@ class Config(object): WTF_CSRF_ENABLED = True WTF_CSRF_TIME_LIMIT = None CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload' + CONTACT_LIST_UPLOAD_BUCKET_NAME = 'local-contact-list' ACTIVITY_STATS_LIMIT_DAYS = 7 TEST_MESSAGE_FILENAME = 'Report' @@ -99,6 +99,7 @@ class Development(Config): SESSION_PROTECTION = None STATSD_ENABLED = False CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload' + CONTACT_LIST_UPLOAD_BUCKET_NAME = 'development-contact-list' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-tools' MOU_BUCKET_NAME = 'notify.tools-mou' TRANSIENT_UPLOADED_LETTERS = 'development-transient-uploaded-letters' @@ -122,6 +123,7 @@ class Test(Development): STATSD_ENABLED = False WTF_CSRF_ENABLED = False CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload' + CONTACT_LIST_UPLOAD_BUCKET_NAME = 'test-contact-list' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-test' MOU_BUCKET_NAME = 'test-mou' TRANSIENT_UPLOADED_LETTERS = 'test-transient-uploaded-letters' @@ -141,6 +143,7 @@ class Preview(Config): HEADER_COLOUR = '#F499BE' # $baby-pink STATSD_ENABLED = True CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload' + CONTACT_LIST_UPLOAD_BUCKET_NAME = 'preview-contact-list' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-preview' MOU_BUCKET_NAME = 'notify.works-mou' TRANSIENT_UPLOADED_LETTERS = 'preview-transient-uploaded-letters' @@ -159,6 +162,7 @@ class Staging(Config): HEADER_COLOUR = '#6F72AF' # $mauve STATSD_ENABLED = True CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload' + CONTACT_LIST_UPLOAD_BUCKET_NAME = 'staging-contact-list' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-staging' MOU_BUCKET_NAME = 'staging-notify.works-mou' TRANSIENT_UPLOADED_LETTERS = 'staging-transient-uploaded-letters' @@ -174,6 +178,7 @@ class Live(Config): HTTP_PROTOCOL = 'https' STATSD_ENABLED = True CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload' + CONTACT_LIST_UPLOAD_BUCKET_NAME = 'production-contact-list' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-production' MOU_BUCKET_NAME = 'notifications.service.gov.uk-mou' TRANSIENT_UPLOADED_LETTERS = 'production-transient-uploaded-letters' diff --git a/app/event_handlers.py b/app/event_handlers.py index 166a694b9..049ea3e66 100644 --- a/app/event_handlers.py +++ b/app/event_handlers.py @@ -25,6 +25,15 @@ def create_mobile_number_change_event(user_id, updated_by_id, original_mobile_nu new_mobile_number=new_mobile_number) +def create_remove_user_from_service_event(user_id, removed_by_id, service_id): + _send_event( + 'remove_user_from_service', + user_id=user_id, + removed_by_id=removed_by_id, + service_id=service_id + ) + + def create_archive_user_event(user_id, archived_by_id): _send_event( 'archive_user', diff --git a/app/main/forms.py b/app/main/forms.py index e9a0bb48f..85639dfa7 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -4,6 +4,7 @@ from itertools import chain import pytz from flask import request +from flask_login import current_user from flask_wtf import FlaskForm as Form from flask_wtf.file import FileAllowed from flask_wtf.file import FileField as FileField_wtf @@ -42,10 +43,12 @@ from app.main.validators import ( LettersNumbersAndFullStopsOnly, MustContainAlphanumericCharacters, NoCommasInPlaceHolders, + NoEmbeddedImagesInSVG, OnlySMSCharacters, ValidEmail, ValidGovEmail, ) +from app.models.feedback import PROBLEM_TICKET_TYPE, QUESTION_TICKET_TYPE from app.models.organisation import Organisation from app.models.roles_and_permissions import permissions, roles from app.utils import guess_name_from_email_address @@ -499,7 +502,7 @@ class InviteUserForm(PermissionsForm): self.invalid_email_address = invalid_email_address.lower() def validate_email_address(self, field): - if field.data.lower() == self.invalid_email_address: + if field.data.lower() == self.invalid_email_address and not current_user.platform_admin: raise ValidationError("You cannot send an invitation to yourself") @@ -511,7 +514,7 @@ class InviteOrgUserForm(StripWhitespaceForm): self.invalid_email_address = invalid_email_address.lower() def validate_email_address(self, field): - if field.data.lower() == self.invalid_email_address: + if field.data.lower() == self.invalid_email_address and not current_user.platform_admin: raise ValidationError("You cannot send an invitation to yourself") @@ -883,23 +886,30 @@ class SupportType(StripWhitespaceForm): support_type = RadioField( 'How can we help you?', choices=[ - ('report-problem', 'Report a problem'), - ('ask-question-give-feedback', 'Ask a question or give feedback'), + (PROBLEM_TICKET_TYPE, 'Report a problem'), + (QUESTION_TICKET_TYPE, 'Ask a question or give feedback'), ], validators=[DataRequired()] ) -class Feedback(StripWhitespaceForm): - name = StringField('Name') - email_address = email_address(label='Email address', gov_user=False, required=False) +class SupportRedirect(StripWhitespaceForm): + who = RadioField( + 'What do you need help with?', + choices=[ + ('public-sector', 'I work in the public sector and need to send emails, text messages or letters'), + ('public', 'I’m a member of the public with a question for the government'), + ], + validators=[DataRequired()] + ) + + +class FeedbackOrProblem(StripWhitespaceForm): + name = StringField('Name (optional)') + email_address = email_address(label='Email address', gov_user=False, required=True) feedback = TextAreaField('Your message', validators=[DataRequired(message="Cannot be empty")]) -class Problem(Feedback): - email_address = email_address(label='Email address', gov_user=False) - - class Triage(StripWhitespaceForm): severe = RadioField( 'Is it an emergency?', @@ -1133,7 +1143,8 @@ class SVGFileUpload(StripWhitespaceForm): 'Upload an SVG logo', validators=[ FileAllowed(['svg'], 'SVG Images only!'), - DataRequired(message="You need to upload a file to submit") + DataRequired(message="You need to upload a file to submit"), + NoEmbeddedImagesInSVG() ] ) diff --git a/app/main/validators.py b/app/main/validators.py index 63f36d5f5..39bf2fb0b 100644 --- a/app/main/validators.py +++ b/app/main/validators.py @@ -46,7 +46,8 @@ 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) @@ -79,6 +80,18 @@ class NoCommasInPlaceHolders: raise ValidationError(self.message) +class NoEmbeddedImagesInSVG: + + def __init__(self, message='This SVG has an embedded raster image in it and will not render well'): + self.message = message + + def __call__(self, form, field): + is_image_embedded = '', methods=['GET', 'POST']) +def triage(ticket_type=PROBLEM_TICKET_TYPE): form = Triage() if form.validate_on_submit(): return redirect(url_for( '.feedback', - ticket_type=PROBLEM_TICKET_TYPE, + ticket_type=ticket_type, severe=form.severe.data )) return render_template( 'views/support/triage.html', - form=form + form=form, + page_title={ + PROBLEM_TICKET_TYPE: 'Report a problem', + GENERAL_TICKET_TYPE: 'Contact GOV.UK Notify support', + }.get(ticket_type) ) -@main.route('/support/', methods=['GET', 'POST']) +@main.route('/support/', methods=['GET', 'POST']) def feedback(ticket_type): - try: - form = { - QUESTION_TICKET_TYPE: Feedback, - PROBLEM_TICKET_TYPE: Problem, - }[ticket_type]() - except KeyError: - abort(404) + form = FeedbackOrProblem() if not form.feedback.data: form.feedback.data = session.pop('feedback_message', '') @@ -72,14 +84,14 @@ def feedback(ticket_type): severe = None out_of_hours_emergency = all(( - ticket_type == PROBLEM_TICKET_TYPE, + ticket_type != QUESTION_TICKET_TYPE, not in_business_hours(), severe, )) if needs_triage(ticket_type, severe): session['feedback_message'] = form.feedback.data - return redirect(url_for('.triage')) + return redirect(url_for('.triage', ticket_type=ticket_type)) if needs_escalation(ticket_type, severe): return redirect(url_for('.bat_phone')) @@ -99,10 +111,9 @@ def feedback(ticket_type): else: service_string = '' - feedback_msg = '{}\n{}{}'.format( + feedback_msg = '{}\n{}'.format( form.feedback.data, service_string, - '' if user_email else '{} (no email address supplied)'.format(form.name.data) ) zendesk_client.create_ticket( @@ -121,13 +132,20 @@ def feedback(ticket_type): ), )) - if not form.feedback.data: - form.feedback.data = get_prefilled_message() - return render_template( - 'views/support/{}.html'.format(ticket_type), + 'views/support/form.html', form=form, - ticket_type=ticket_type, + back_link=( + url_for('.support') + if severe is None else + url_for('.triage', ticket_type=ticket_type) + ), + show_status_page_banner=(ticket_type == PROBLEM_TICKET_TYPE), + page_title={ + GENERAL_TICKET_TYPE: 'Contact GOV.UK Notify support', + PROBLEM_TICKET_TYPE: 'Report a problem', + QUESTION_TICKET_TYPE: 'Ask a question or give feedback', + }.get(ticket_type), ) @@ -237,7 +255,7 @@ def has_live_services(user_id): def needs_triage(ticket_type, severe): return all(( - ticket_type == PROBLEM_TICKET_TYPE, + ticket_type != QUESTION_TICKET_TYPE, severe is None, ( not current_user.is_authenticated or has_live_services(current_user.id) @@ -248,7 +266,7 @@ def needs_triage(ticket_type, severe): def needs_escalation(ticket_type, severe): return all(( - ticket_type == PROBLEM_TICKET_TYPE, + ticket_type != QUESTION_TICKET_TYPE, severe, not current_user.is_authenticated, not in_business_hours(), diff --git a/app/main/views/index.py b/app/main/views/index.py index 13effe361..86c244d6f 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -15,12 +15,12 @@ from notifications_utils.template import HTMLEmailTemplate, LetterImageTemplate from app import email_branding_client, letter_branding_client, status_api_client from app.main import main from app.main.forms import FieldWithNoneOption, SearchByNameForm -from app.main.views.feedback import QUESTION_TICKET_TYPE from app.main.views.sub_navigation_dictionaries import ( features_nav, pricing_nav, using_notify_nav, ) +from app.models.feedback import QUESTION_TICKET_TYPE from app.utils import get_logo_cdn_domain diff --git a/app/main/views/invites.py b/app/main/views/invites.py index c1e03d402..e2b32219f 100644 --- a/app/main/views/invites.py +++ b/app/main/views/invites.py @@ -12,16 +12,11 @@ from app.models.user import ( User, Users, ) -from app.notify_client import InviteTokenError @main.route("/invitation/") def accept_invite(token): - try: - invited_user = InvitedUser.from_token(token) - except InviteTokenError as exception: - flash(str(exception)) - return redirect(url_for('main.sign_in')) + invited_user = InvitedUser.from_token(token) if not current_user.is_anonymous and current_user.email_address.lower() != invited_user.email_address.lower(): message = Markup(""" @@ -78,6 +73,7 @@ def accept_invite(token): @main.route("/organisation-invitation/") def accept_org_invite(token): invited_org_user = InvitedOrgUser.from_token(token) + if not current_user.is_anonymous and current_user.email_address.lower() != invited_org_user.email_address.lower(): message = Markup(""" You’re signed in as {}. diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 50dfd71ff..375bc3523 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -51,19 +51,16 @@ def view_jobs(service_id): if jobs.next_page: next_page = generate_next_dict('main.view_jobs', service_id, jobs.current_page) - scheduled_jobs = '' - if not current_user.has_permissions('view_activity') and jobs.current_page == 1: - scheduled_jobs = render_template( - 'views/dashboard/_upcoming.html', - hide_heading=True, - ) - return render_template( 'views/jobs/jobs.html', jobs=jobs, prev_page=prev_page, next_page=next_page, - scheduled_jobs=scheduled_jobs, + show_scheduled_jobs=( + jobs.current_page == 1 + and not current_user.has_permissions('view_activity') + and current_service.scheduled_jobs + ), ) @@ -93,10 +90,7 @@ def view_job(service_id, job_id): status=request.args.get('status', ''), ), partials=get_job_partials(job), - just_sent=bool( - request.args.get('just_sent') == 'yes' - and job.template_type == 'letter' - ), + just_sent=request.args.get('just_sent') == 'yes', just_sent_message=just_sent_message, ) diff --git a/app/main/views/letter_branding.py b/app/main/views/letter_branding.py index 76edbc08a..76c694e30 100644 --- a/app/main/views/letter_branding.py +++ b/app/main/views/letter_branding.py @@ -8,7 +8,6 @@ from flask import ( url_for, ) from notifications_python_client.errors import HTTPError -from requests import get as requests_get from app import letter_branding_client from app.main import main @@ -21,11 +20,9 @@ from app.s3_client.s3_logo_client import ( LETTER_TEMP_TAG, delete_letter_temp_file, delete_letter_temp_files_created_by, - get_letter_filename_with_no_path_or_extension, letter_filename_for_db, permanent_letter_logo_name, persist_logo, - upload_letter_png_logo, upload_letter_temp_logo, ) from app.utils import get_logo_cdn_domain, user_is_platform_admin @@ -87,15 +84,13 @@ def update_letter_branding(branding_id, logo=None): return redirect(url_for('main.letter_branding')) else: - png_file = get_png_file_from_svg(logo) - letter_branding_client.update_letter_branding( branding_id=branding_id, filename=db_filename, name=letter_branding_details_form.name.data, ) - upload_letter_logos(logo, db_filename, png_file, session['user_id']) + upload_letter_svg_logo(logo, db_filename, session['user_id']) return redirect(url_for('main.letter_branding')) @@ -149,7 +144,6 @@ def create_letter_branding(logo=None): if details_form_submitted and letter_branding_details_form.validate_on_submit(): if logo: db_filename = letter_filename_for_db(logo, session['user_id']) - png_file = get_png_file_from_svg(logo) try: letter_branding_client.create_letter_branding( @@ -157,7 +151,7 @@ def create_letter_branding(logo=None): name=letter_branding_details_form.name.data, ) - upload_letter_logos(logo, db_filename, png_file, session['user_id']) + upload_letter_svg_logo(logo, db_filename, session['user_id']) return redirect(url_for('main.letter_branding')) @@ -179,29 +173,7 @@ def create_letter_branding(logo=None): ) -def get_png_file_from_svg(filename): - filename_for_template_preview = get_letter_filename_with_no_path_or_extension(filename) - - template_preview_svg_endpoint = '{}/{}.svg.png'.format( - current_app.config['TEMPLATE_PREVIEW_API_HOST'], - filename_for_template_preview - ) - - response = requests_get( - template_preview_svg_endpoint, - headers={'Authorization': 'Token {}'.format(current_app.config['TEMPLATE_PREVIEW_API_KEY'])} - ) - - return response.content - - -def upload_letter_logos(old_filename, new_filename, png_file, user_id): +def upload_letter_svg_logo(old_filename, new_filename, user_id): persist_logo(old_filename, permanent_letter_logo_name(new_filename, 'svg')) - upload_letter_png_logo( - permanent_letter_logo_name(new_filename, 'png'), - png_file, - current_app.config['AWS_REGION'], - ) - delete_letter_temp_files_created_by(user_id) diff --git a/app/main/views/manage_users.py b/app/main/views/manage_users.py index 5f977bf7c..8102ba521 100644 --- a/app/main/views/manage_users.py +++ b/app/main/views/manage_users.py @@ -14,6 +14,7 @@ from app import current_service, service_api_client from app.event_handlers import ( create_email_change_event, create_mobile_number_change_event, + create_remove_user_from_service_event, ) from app.main import main from app.main.forms import ( @@ -132,6 +133,8 @@ def remove_user_from_service(service_id, user_id): service_id=service_id)) else: abort(500, e) + else: + create_remove_user_from_service_event(user_id=user_id, removed_by_id=current_user.id, service_id=service_id) return redirect(url_for( '.manage_users', diff --git a/app/main/views/notifications.py b/app/main/views/notifications.py index 5cff773e7..710d8f97d 100644 --- a/app/main/views/notifications.py +++ b/app/main/views/notifications.py @@ -78,7 +78,10 @@ def view_notification(service_id, notification_id): page_count = get_page_count_for_letter(notification['template'], values=personalisation) if notification.get('postage'): - notification['template']['postage'] = notification['postage'] + if notification["status"] == "validation-failed": + notification['template']['postage'] = None + else: + notification['template']['postage'] = notification['postage'] template = get_template( notification['template'], current_service, diff --git a/app/main/views/organisations.py b/app/main/views/organisations.py index 68ae4995d..7b656bbfa 100644 --- a/app/main/views/organisations.py +++ b/app/main/views/organisations.py @@ -1,4 +1,5 @@ from collections import OrderedDict +from functools import partial from flask import flash, redirect, render_template, request, session, url_for from flask_login import current_user @@ -33,6 +34,10 @@ from app.main.forms import ( SetEmailBranding, SetLetterBranding, ) +from app.main.views.dashboard import ( + get_tuples_of_financial_years, + requested_and_current_financial_year, +) from app.main.views.service_settings import get_branding_as_value_and_label from app.models.organisation import Organisation, Organisations from app.models.user import InvitedOrgUser, User @@ -125,8 +130,24 @@ def add_organisation_from_nhs_local_service(service_id): @main.route("/organisations/", methods=['GET']) @user_has_permissions() def organisation_dashboard(org_id): + year, current_financial_year = requested_and_current_financial_year(request) + services = current_organisation.services_and_usage( + financial_year=year + )['services'] return render_template( 'views/organisations/organisation/index.html', + services=services, + years=get_tuples_of_financial_years( + partial(url_for, '.organisation_dashboard', org_id=current_organisation.id), + start=current_financial_year - 1, + end=current_financial_year + 1, + ), + selected_year=year, + search_form=SearchByNameForm() if len(services) > 7 else None, + **{ + f'total_{key}': sum(service[key] for service in services) + for key in ('emails_sent', 'sms_cost', 'letter_cost') + } ) diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py index 25b727630..50917c819 100644 --- a/app/main/views/platform_admin.py +++ b/app/main/views/platform_admin.py @@ -42,6 +42,14 @@ ZERO_FAILURE_THRESHOLD = 0 @main.route("/platform-admin") @user_is_platform_admin +def platform_admin_splash_page(): + return render_template( + 'views/platform-admin/splash-page.html', + ) + + +@main.route("/platform-admin/summary") +@user_is_platform_admin def platform_admin(): form = DateFilterForm(request.args, meta={'csrf': False}) api_args = {} diff --git a/app/main/views/returned_letters.py b/app/main/views/returned_letters.py index cdc06e464..bb81f3449 100644 --- a/app/main/views/returned_letters.py +++ b/app/main/views/returned_letters.py @@ -2,7 +2,7 @@ from collections import OrderedDict from flask import render_template -from app import service_api_client +from app import current_service, service_api_client from app.main import main from app.utils import Spreadsheet, user_has_permissions @@ -10,10 +10,9 @@ from app.utils import Spreadsheet, user_has_permissions @main.route("/services//returned-letters") @user_has_permissions('view_activity') def returned_letter_summary(service_id): - summary = service_api_client.get_returned_letter_summary(service_id) return render_template( 'views/returned-letter-summary.html', - data=summary, + data=current_service.returned_letter_summary, ) diff --git a/app/main/views/send.py b/app/main/views/send.py index 8764406c4..7784dd902 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -42,6 +42,7 @@ from app.main.forms import ( SetSenderForm, get_placeholder_form_instance, ) +from app.models.contact_list import ContactList, ContactListsAlphabetical from app.models.user import Users from app.s3_client.s3_csv_client import ( s3download, @@ -151,7 +152,7 @@ def send_messages(service_id, template_id): try: upload_id = s3upload( service_id, - Spreadsheet.from_file(form.file.data, filename=form.file.data.filename).as_dict, + Spreadsheet.from_file_form(form).as_dict, current_app.config['AWS_REGION'] ) return redirect(url_for( @@ -491,6 +492,48 @@ def send_test_preview(service_id, template_id, filetype): return TemplatePreview.from_utils_template(template, filetype, page=request.args.get('page')) +@main.route( + '/services//send/' + '/from-contact-list' +) +@user_has_permissions('send_messages') +def choose_from_contact_list(service_id, template_id): + db_template = current_service.get_template_with_user_permission_or_403( + template_id, current_user + ) + template = get_template( + db_template, current_service, + ) + return render_template( + 'views/send-contact-list.html', + contact_lists=ContactListsAlphabetical( + current_service.id, + template_type=template.template_type, + ), + template=template, + ) + + +@main.route( + '/services//send/' + '/from-contact-list/' +) +@user_has_permissions('send_messages') +def send_from_contact_list(service_id, template_id, contact_list_id): + contact_list = ContactList.from_id( + contact_list_id, + service_id=current_service.id, + ) + return redirect(url_for( + 'main.check_messages', + service_id=current_service.id, + template_id=template_id, + upload_id=contact_list.copy_to_uploads(), + original_file_name=contact_list.original_file_name, + contact_list_id=contact_list.id, + )) + + def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_pdf=False): try: @@ -700,7 +743,8 @@ def start_job(service_id, upload_id): job_api_client.create_job( upload_id, service_id, - scheduled_for=request.form.get('scheduled_for', '') + scheduled_for=request.form.get('scheduled_for', ''), + contact_list_id=request.form.get('contact_list_id', ''), ) session.pop('sender_id', None) @@ -907,8 +951,11 @@ def get_template_error_dict(exception): error = 'not-allowed-to-send-to' elif 'Exceeded send limits' in exception.message: error = 'too-many-messages' + # the error from the api is changing for message-too-long, but we need both until the api is deployed. elif 'Content for template has a character count greater than the limit of' in exception.message: error = 'message-too-long' + elif 'Text messages cannot be longer than' in exception.message: + error = 'message-too-long' else: raise exception diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 75de09ad6..614f861d9 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -67,8 +67,8 @@ from app.utils import ( PLATFORM_ADMIN_SERVICE_PERMISSIONS = OrderedDict([ ('inbound_sms', {'title': 'Receive inbound SMS', 'requires': 'sms', 'endpoint': '.service_set_inbound_number'}), ('email_auth', {'title': 'Email authentication'}), - ('upload_document', {'title': 'Send files by email', 'endpoint': '.service_switch_can_upload_document'}), ('upload_letters', {'title': 'Uploading letters', 'requires': 'letter'}), + ('international_letters', {'title': 'Send international letters', 'requires': 'letter'}), ]) @@ -294,26 +294,6 @@ def service_set_permission(service_id, permission): ) -@main.route("/services//service-settings/can-upload-document", methods=['GET', 'POST']) -@user_is_platform_admin -def service_switch_can_upload_document(service_id): - if current_service.contact_link: - return redirect(url_for('.service_set_permission', service_id=service_id, permission='upload_document')) - - form = ServiceContactDetailsForm() - - if form.validate_on_submit(): - contact_type = form.contact_details_type.data - - current_service.update( - contact_link=form.data[contact_type] - ) - - return redirect(url_for('.service_set_permission', service_id=service_id, permission='upload_document')) - - return render_template('views/service-settings/contact_link.html', form=form) - - @main.route("/services//service-settings/archive", methods=['GET', 'POST']) @user_has_permissions('manage_service') def archive_service(service_id): @@ -359,18 +339,20 @@ def resume_service(service_id): return service_settings(service_id) -@main.route("/services//service-settings/contact-link", methods=['GET', 'POST']) +@main.route("/services//service-settings/send-files-by-email", methods=['GET', 'POST']) @user_has_permissions('manage_service') -def service_set_contact_link(service_id): +def send_files_by_email_contact_details(service_id): form = ServiceContactDetailsForm() + contact_details = None if request.method == 'GET': contact_details = current_service.contact_link - contact_type = check_contact_details_type(contact_details) - field_to_update = getattr(form, contact_type) + if contact_details: + contact_type = check_contact_details_type(contact_details) + field_to_update = getattr(form, contact_type) - form.contact_details_type.data = contact_type - field_to_update.data = contact_details + form.contact_details_type.data = contact_type + field_to_update.data = contact_details if form.validate_on_submit(): contact_type = form.contact_details_type.data @@ -380,7 +362,9 @@ def service_set_contact_link(service_id): ) return redirect(url_for('.service_settings', service_id=current_service.id)) - return render_template('views/service-settings/contact_link.html', form=form) + return render_template( + 'views/service-settings/send-files-by-email.html', form=form, contact_details=contact_details + ) @main.route("/services//service-settings/set-reply-to-email", methods=['GET']) diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py index 49ea321f3..567bb3f5a 100644 --- a/app/main/views/sign_in.py +++ b/app/main/views/sign_in.py @@ -50,7 +50,7 @@ def sign_in(): flash(Markup( ( "The email address or password you entered is incorrect." - " Forgot your password?" + " Forgotten your password?" ).format(password_reset=url_for('.forgot_password')) )) diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index 2316fd083..b3acbb468 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -76,6 +76,10 @@ def using_notify_nav(): "name": "Send files by email", "link": "main.send_files_by_email", }, + { + "name": "Upload a letter", + "link": "main.upload_a_letter", + }, ] }, { diff --git a/app/main/views/two_factor.py b/app/main/views/two_factor.py index 0cd8b8444..00e2a3b53 100644 --- a/app/main/views/two_factor.py +++ b/app/main/views/two_factor.py @@ -111,7 +111,5 @@ def redirect_when_logged_in(platform_admin): next_url = request.args.get('next') if next_url and _is_safe_redirect_url(next_url): return redirect(next_url) - if platform_admin: - return redirect(url_for('main.platform_admin')) return redirect(url_for('main.show_accounts_or_dashboard')) diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index 60c28c894..4398152eb 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -1,25 +1,35 @@ import base64 +import itertools import json import urllib import uuid from io import BytesIO +from zipfile import BadZipFile from flask import ( abort, current_app, + flash, redirect, render_template, request, + send_file, url_for, ) +from notifications_utils.columns import Columns from notifications_utils.pdf import pdf_page_count +from notifications_utils.recipients import RecipientCSV +from notifications_utils.sanitise_text import SanitiseASCII from PyPDF2.utils import PdfReadError from requests import RequestException +from xlrd.biffh import XLRDError +from xlrd.xldate import XLDateError from app import current_service, notification_api_client, service_api_client from app.extensions import antivirus_client from app.main import main -from app.main.forms import LetterUploadPostageForm, PDFUploadForm +from app.main.forms import CsvUploadForm, LetterUploadPostageForm, PDFUploadForm +from app.models.contact_list import ContactList from app.s3_client.s3_letter_upload_client import ( get_letter_metadata, get_letter_pdf_and_metadata, @@ -28,10 +38,13 @@ from app.s3_client.s3_letter_upload_client import ( ) from app.template_previews import TemplatePreview, sanitise_letter from app.utils import ( + Spreadsheet, generate_next_dict, generate_previous_dict, + get_errors_for_csv, get_letter_validation_error, get_template, + unicode_truncate, user_has_permissions, ) @@ -46,18 +59,26 @@ def uploads(service_id): uploads = current_service.get_page_of_uploads(page=request.args.get('page')) prev_page = None - if uploads.next_page: + if uploads.prev_page: prev_page = generate_previous_dict('main.uploads', service_id, uploads.current_page) next_page = None - if uploads.prev_page: + if uploads.next_page: next_page = generate_next_dict('main.uploads', service_id, uploads.current_page) + if uploads.current_page == 1: + listed_uploads = ( + current_service.contact_lists + + current_service.scheduled_jobs + + uploads + ) + else: + listed_uploads = uploads + return render_template( 'views/jobs/jobs.html', - jobs=uploads, + jobs=listed_uploads, prev_page=prev_page, next_page=next_page, - scheduled_jobs='', ) @@ -234,7 +255,6 @@ def uploaded_letter_preview(service_id, file_id): @main.route("/services//preview-letter-image/") @user_has_permissions('send_messages') def view_letter_upload_as_preview(service_id, file_id): - try: page = int(request.args.get('page')) except ValueError: @@ -279,3 +299,156 @@ def send_uploaded_letter(service_id): service_id=service_id, notification_id=file_id, )) + + +@main.route("/services//upload-contact-list", methods=['GET', 'POST']) +@user_has_permissions('send_messages') +def upload_contact_list(service_id): + form = CsvUploadForm() + + if form.validate_on_submit(): + try: + upload_id = ContactList.upload( + current_service.id, + Spreadsheet.from_file_form(form).as_dict, + ) + return redirect(url_for( + '.check_contact_list', + service_id=service_id, + upload_id=upload_id, + original_file_name=form.file.data.filename, + )) + except (UnicodeDecodeError, BadZipFile, XLRDError): + flash('Could not read {}. Try using a different file format.'.format( + form.file.data.filename + )) + except (XLDateError): + flash(( + '{} contains numbers or dates that Notify cannot understand. ' + 'Try formatting all columns as ‘text’ or export your file as CSV.' + ).format( + form.file.data.filename + )) + + return render_template( + 'views/uploads/contact-list/upload.html', + form=form, + ) + + +@main.route( + "/services//check-contact-list/", + methods=['GET', 'POST'], +) +@user_has_permissions('send_messages') +def check_contact_list(service_id, upload_id): + + form = CsvUploadForm() + + contents = ContactList.download(service_id, upload_id) + first_row = contents.splitlines()[0].strip().rstrip(',') if contents else '' + + template_type = { + 'emailaddress': 'email', + 'phonenumber': 'sms', + }.get(Columns.make_key(first_row)) + + original_file_name = SanitiseASCII.encode(request.args.get('original_file_name', '')) + + recipients = RecipientCSV( + contents, + template_type=template_type or 'sms', + whitelist=itertools.chain.from_iterable( + [user.name, user.mobile_number, user.email_address] + for user in current_service.active_users + ) if current_service.trial_mode else None, + international_sms=current_service.has_permission('international_sms'), + max_initial_rows_shown=50, + max_errors_shown=50, + ) + + non_empty_column_headers = list(filter(None, recipients.column_headers)) + + if len(non_empty_column_headers) > 1 or not template_type or not recipients: + return render_template( + 'views/uploads/contact-list/too-many-columns.html', + recipients=recipients, + original_file_name=original_file_name, + template_type=template_type, + form=form, + ) + + if recipients.too_many_rows or not len(recipients): + return render_template( + 'views/uploads/contact-list/column-errors.html', + recipients=recipients, + original_file_name=original_file_name, + form=form, + ) + + row_errors = get_errors_for_csv(recipients, template_type) + if row_errors: + return render_template( + 'views/uploads/contact-list/row-errors.html', + recipients=recipients, + original_file_name=original_file_name, + row_errors=row_errors, + form=form, + ) + + if recipients.has_errors: + return render_template( + 'views/uploads/contact-list/column-errors.html', + recipients=recipients, + original_file_name=original_file_name, + form=form, + ) + + metadata_kwargs = { + 'row_count': len(recipients), + 'valid': True, + 'original_file_name': unicode_truncate( + original_file_name, + 1600, + ), + 'template_type': template_type + } + + ContactList.set_metadata(service_id, upload_id, **metadata_kwargs) + + return render_template( + 'views/uploads/contact-list/ok.html', + recipients=recipients, + original_file_name=original_file_name, + upload_id=upload_id, + ) + + +@main.route("/services//save-contact-list/", methods=['POST']) +@user_has_permissions('send_messages') +def save_contact_list(service_id, upload_id): + ContactList.create(current_service.id, upload_id) + return redirect(url_for( + '.uploads', + service_id=current_service.id, + )) + + +@main.route("/services//contact-list/", methods=['GET']) +@user_has_permissions('send_messages') +def contact_list(service_id, contact_list_id): + return render_template( + 'views/uploads/contact-list/contact-list.html', + contact_list=ContactList.from_id(contact_list_id, service_id=service_id), + ) + + +@main.route("/services//contact-list/.csv", methods=['GET']) +@user_has_permissions('send_messages') +def download_contact_list(service_id, contact_list_id): + contact_list = ContactList.from_id(contact_list_id, service_id=service_id) + return send_file( + filename_or_fp=BytesIO(contact_list.contents.encode('utf-8')), + attachment_filename=contact_list.saved_file_name, + as_attachment=True, + ) diff --git a/app/models/__init__.py b/app/models/__init__.py index 4f8850e9d..d63f21bbe 100644 --- a/app/models/__init__.py +++ b/app/models/__init__.py @@ -75,6 +75,5 @@ class ModelList(ABC, Sequence): def __add__(self, other): return list(self) + list(other) - -class InviteTokenError(Exception): - pass + def __radd__(self, other): + return list(other) + list(self) diff --git a/app/models/contact_list.py b/app/models/contact_list.py new file mode 100644 index 000000000..70378cb12 --- /dev/null +++ b/app/models/contact_list.py @@ -0,0 +1,150 @@ +from functools import partial +from os import path + +from flask import abort, current_app +from notifications_utils.formatters import strip_whitespace +from notifications_utils.recipients import RecipientCSV +from werkzeug.utils import cached_property + +from app.models import JSONModel, ModelList +from app.notify_client.contact_list_api_client import contact_list_api_client +from app.s3_client.s3_csv_client import ( + get_csv_metadata, + s3download, + s3upload, + set_metadata_on_csv_upload, +) + + +class ContactList(JSONModel): + + ALLOWED_PROPERTIES = { + 'id', + 'created_at', + 'created_by', + 'service_id', + 'original_file_name', + 'row_count', + 'template_type', + } + + upload_type = 'contact_list' + + @classmethod + def from_id(cls, contact_list_id, *, service_id): + return cls(contact_list_api_client.get_contact_list( + service_id=service_id, + contact_list_id=contact_list_id, + )) + + @staticmethod + def get_bucket_name(): + return current_app.config['CONTACT_LIST_UPLOAD_BUCKET_NAME'] + + @staticmethod + def upload(service_id, file_dict): + return s3upload( + service_id, + file_dict, + current_app.config['AWS_REGION'], + bucket=ContactList.get_bucket_name(), + ) + + @staticmethod + def download(service_id, upload_id): + return strip_whitespace(s3download( + service_id, + upload_id, + bucket=ContactList.get_bucket_name(), + )) + + @staticmethod + def set_metadata(service_id, upload_id, **kwargs): + return set_metadata_on_csv_upload( + service_id, + upload_id, + bucket=ContactList.get_bucket_name(), + **kwargs, + ) + + @staticmethod + def get_metadata(service_id, upload_id): + return get_csv_metadata( + service_id, + upload_id, + bucket=ContactList.get_bucket_name(), + ) + + def copy_to_uploads(self): + metadata = self.get_metadata(self.service_id, self.id) + new_upload_id = s3upload( + self.service_id, + {'data': self.contents}, + current_app.config['AWS_REGION'], + ) + set_metadata_on_csv_upload( + self.service_id, + new_upload_id, + **metadata, + ) + return new_upload_id + + @classmethod + def create(cls, service_id, upload_id): + + metadata = cls.get_metadata(service_id, upload_id) + + if not metadata.get('valid'): + abort(403) + + return cls(contact_list_api_client.create_contact_list( + service_id=service_id, + upload_id=upload_id, + original_file_name=metadata['original_file_name'], + row_count=int(metadata['row_count']), + template_type=metadata['template_type'], + )) + + @property + def contents(self): + return self.download(self.service_id, self.id) + + @cached_property + def recipients(self): + return RecipientCSV( + self.contents, + template_type=self.template_type, + international_sms=True, + max_initial_rows_shown=50, + ) + + @property + def saved_file_name(self): + file_name, extention = path.splitext(self.original_file_name) + return f'{file_name}.csv' + + +class ContactLists(ModelList): + + client_method = contact_list_api_client.get_contact_lists + model = ContactList + sort_function = partial( + sorted, + key=lambda item: item['created_at'], + reverse=True, + ) + + def __init__(self, service_id, template_type=None): + super().__init__(service_id) + self.items = self.sort_function([ + item for item in self.items + if template_type in {item['template_type'], None} + ]) + + +class ContactListsAlphabetical(ContactLists): + + sort_function = partial( + sorted, + key=lambda item: item['original_file_name'].lower(), + ) diff --git a/app/models/feedback.py b/app/models/feedback.py new file mode 100644 index 000000000..345be5e6a --- /dev/null +++ b/app/models/feedback.py @@ -0,0 +1,3 @@ +QUESTION_TICKET_TYPE = 'ask-question-give-feedback' +PROBLEM_TICKET_TYPE = 'report-problem' +GENERAL_TICKET_TYPE = 'general' diff --git a/app/models/job.py b/app/models/job.py index 5cd92c3a0..02d40159e 100644 --- a/app/models/job.py +++ b/app/models/job.py @@ -30,6 +30,8 @@ class Job(JSONModel): 'processing_started', 'notification_count', 'created_by', + 'template_type', + 'recipient', } @classmethod @@ -56,6 +58,10 @@ class Job(JSONModel): def upload_type(self): return self._dict.get('upload_type') + @property + def pdf_letter(self): + return self.upload_type == 'letter' + @property def processing_started(self): if not self._dict.get('processing_started'): @@ -132,10 +138,6 @@ class Job(JSONModel): version=self.template_version, )['data'] - @property - def template_type(self): - return self.template['template_type'] - @property def percentage_complete(self): return self.notifications_requested / self.notification_count * 100 diff --git a/app/models/organisation.py b/app/models/organisation.py index 327be5670..8d1390250 100644 --- a/app/models/organisation.py +++ b/app/models/organisation.py @@ -198,6 +198,9 @@ class Organisation(JSONModel): self.id ) + def services_and_usage(self, financial_year): + return organisations_client.get_services_and_usage(self.id, financial_year) + class Organisations(ModelList): client_method = organisations_client.get_organisations diff --git a/app/models/service.py b/app/models/service.py index 9e4fad965..041ef5e5a 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -1,7 +1,12 @@ +from datetime import datetime, timedelta + +from dateutil.parser import parse from flask import abort, current_app +from notifications_utils.timezones import local_timezone from werkzeug.utils import cached_property from app.models import JSONModel +from app.models.contact_list import ContactLists from app.models.job import ( ImmediateJobs, PaginatedJobs, @@ -480,6 +485,12 @@ class Service(JSONModel): def has_inbound_number(self): return bool(self.inbound_number) + @cached_property + def inbound_sms_summary(self): + if not self.has_permission('inbound_sms'): + return None + return service_api_client.get_inbound_sms_summary(self.id) + @cached_property def all_template_folders(self): return sorted( @@ -660,3 +671,32 @@ class Service(JSONModel): ): if test: yield BASE + '_incomplete' + tag + + @cached_property + def returned_letter_summary(self): + return service_api_client.get_returned_letter_summary(self.id) + + @property + def most_recent_returned_letter_report(self): + if not self.returned_letter_summary: + return None + return parse( + self.returned_letter_summary[0]['reported_at'] + " 00:00:00" + ).replace(tzinfo=local_timezone) + + @property + def count_of_returned_letters_in_last_7_days(self): + seven_days_ago = ( + datetime.now() - timedelta(days=7) + ).replace( + hour=0, minute=0, second=0 + ) + return sum( + report['returned_letter_count'] + for report in self.returned_letter_summary + if parse(report['reported_at'] + " 00:00:00") >= seven_days_ago + ) + + @property + def contact_lists(self): + return ContactLists(self.id) diff --git a/app/navigation.py b/app/navigation.py index 503e47ebe..53f01483c 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -7,7 +7,7 @@ class Navigation: mapping = {} exclude = {} - selected_attribute = "class=selected" + selected_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_attribute + return " " + self.selected_class return '' @staticmethod @@ -42,13 +42,12 @@ class Navigation: class HeaderNavigation(Navigation): - selected_attribute = "class=active" - mapping = { 'support': { 'bat_phone', 'feedback', 'support', + 'support_public', 'thanks', 'triage', }, @@ -103,6 +102,7 @@ class HeaderNavigation(Navigation): 'platform_admin_list_complaints', 'platform_admin_reports', 'platform_admin_returned_letters', + 'platform_admin_splash_page', 'suspend_service', 'trial_services', 'update_email_branding', @@ -151,6 +151,7 @@ class HeaderNavigation(Navigation): 'check_notification', 'no_cookie.check_notification_preview', 'choose_account', + 'choose_from_contact_list', 'choose_service', 'choose_template', 'choose_template_to_copy', @@ -171,6 +172,7 @@ class HeaderNavigation(Navigation): 'delivery_and_failure', 'delivery_status_callback', 'design_content', + 'download_contact_list', 'download_notifications_csv', 'edit_data_retention', 'edit_organisation_agreement', @@ -261,6 +263,7 @@ class HeaderNavigation(Navigation): 'send_test', 'no_cookie.send_test_preview', 'send_test_step', + 'send_from_contact_list', 'send_uploaded_letter', 'service_add_email_reply_to', 'service_add_letter_contact', @@ -289,7 +292,7 @@ class HeaderNavigation(Navigation): 'service_preview_letter_branding', 'service_set_auth_type', 'service_set_channel', - 'service_set_contact_link', + 'send_files_by_email_contact_details', 'service_set_email_branding', 'service_set_inbound_number', 'service_set_inbound_sms', @@ -301,7 +304,6 @@ class HeaderNavigation(Navigation): 'service_set_sms_prefix', 'service_settings', 'service_sms_senders', - 'service_switch_can_upload_document', 'service_switch_count_as_live', 'service_switch_live', 'service_set_permission', @@ -320,6 +322,10 @@ class HeaderNavigation(Navigation): 'template_history', 'template_usage', 'trial_mode', + 'upload_contact_list', + 'check_contact_list', + 'save_contact_list', + 'contact_list', 'upload_letter', 'uploaded_letter_preview', 'uploads', @@ -354,10 +360,10 @@ class MainNavigation(Navigation): 'conversation', 'inbox', 'monthly', + 'returned_letter_summary', + 'returned_letters', 'service_dashboard', 'template_usage', - 'view_job', - 'view_jobs', 'view_notification', 'view_notifications', }, @@ -366,6 +372,7 @@ class MainNavigation(Navigation): 'add_service_template', 'check_messages', 'check_notification', + 'choose_from_contact_list', 'choose_template', 'choose_template_to_copy', 'confirm_redact_template', @@ -388,9 +395,15 @@ class MainNavigation(Navigation): 'view_template_versions', }, 'uploads': { + 'upload_contact_list', + 'check_contact_list', + 'save_contact_list', + 'contact_list', 'upload_letter', 'uploaded_letter_preview', 'uploads', + 'view_job', + 'view_jobs', }, 'team-members': { 'confirm_edit_user_email', @@ -433,7 +446,7 @@ class MainNavigation(Navigation): 'service_preview_letter_branding', 'service_set_auth_type', 'service_set_channel', - 'service_set_contact_link', + 'send_files_by_email_contact_details', 'service_set_email_branding', 'service_set_inbound_number', 'service_set_inbound_sms', @@ -496,6 +509,7 @@ class MainNavigation(Navigation): 'delivery_and_failure', 'design_content', 'documentation', + 'download_contact_list', 'download_notifications_csv', 'edit_data_retention', 'edit_organisation_agreement', @@ -568,6 +582,7 @@ class MainNavigation(Navigation): 'platform_admin_list_complaints', 'platform_admin_reports', 'platform_admin_returned_letters', + 'platform_admin_splash_page', 'pricing', 'privacy', 'public_agreement', @@ -581,21 +596,19 @@ class MainNavigation(Navigation): 'resend_email_link', 'resend_email_verification', 'resume_service', - 'returned_letter_summary', - 'returned_letters', 'returned_letters_report', 'revalidate_email_sent', 'roadmap', 'robots', 'security', 'send_notification', + 'send_from_contact_list', 'send_uploaded_letter', 'service_dashboard_updates', 'service_delete_email_reply_to', 'service_delete_letter_contact', 'service_delete_sms_sender', 'service_download_agreement', - 'service_switch_can_upload_document', 'service_switch_count_as_live', 'service_switch_live', 'service_set_permission', @@ -607,6 +620,7 @@ class MainNavigation(Navigation): 'start_tour', 'styleguide', 'support', + 'support_public', 'suspend_service', 'template_history', 'terms', @@ -652,6 +666,7 @@ class CaseworkNavigation(Navigation): mapping = { 'send-one-off': { + 'choose_from_contact_list', 'choose_template', 'send_one_off', 'send_one_off_step', @@ -665,6 +680,10 @@ class CaseworkNavigation(Navigation): 'uploads': { 'view_jobs', 'view_job', + 'upload_contact_list', + 'check_contact_list', + 'save_contact_list', + 'contact_list', 'upload_letter', 'uploaded_letter_preview', 'uploads', @@ -731,6 +750,7 @@ class CaseworkNavigation(Navigation): 'delivery_status_callback', 'design_content', 'documentation', + 'download_contact_list', 'download_notifications_csv', 'edit_data_retention', 'edit_organisation_agreement', @@ -812,6 +832,7 @@ class CaseworkNavigation(Navigation): 'platform_admin_reports', 'platform_admin_returned_letters', 'platform_admin', + 'platform_admin_splash_page', 'pricing', 'privacy', 'public_agreement', @@ -839,6 +860,7 @@ class CaseworkNavigation(Navigation): 'send_messages', 'send_notification', 'no_cookie.send_test_preview', + 'send_from_contact_list', 'send_uploaded_letter', 'service_add_email_reply_to', 'service_add_letter_contact', @@ -867,7 +889,7 @@ class CaseworkNavigation(Navigation): 'service_preview_letter_branding', 'service_set_auth_type', 'service_set_channel', - 'service_set_contact_link', + 'send_files_by_email_contact_details', 'service_set_email_branding', 'service_set_inbound_number', 'service_set_inbound_sms', @@ -878,7 +900,6 @@ class CaseworkNavigation(Navigation): 'service_set_sms_prefix', 'service_settings', 'service_sms_senders', - 'service_switch_can_upload_document', 'service_switch_count_as_live', 'service_switch_live', 'service_set_permission', @@ -897,6 +918,7 @@ class CaseworkNavigation(Navigation): 'styleguide', 'submit_request_to_go_live', 'support', + 'support_public', 'suspend_service', 'template_history', 'template_usage', @@ -1008,6 +1030,7 @@ class OrgNavigation(Navigation): 'check_notification', 'no_cookie.check_notification_preview', 'choose_account', + 'choose_from_contact_list', 'choose_service', 'choose_template', 'choose_template_to_copy', @@ -1031,6 +1054,7 @@ class OrgNavigation(Navigation): 'delivery_status_callback', 'design_content', 'documentation', + 'download_contact_list', 'download_notifications_csv', 'edit_data_retention', 'edit_provider', @@ -1099,6 +1123,7 @@ class OrgNavigation(Navigation): 'platform_admin_list_complaints', 'platform_admin_reports', 'platform_admin_returned_letters', + 'platform_admin_splash_page', 'pricing', 'privacy', 'public_agreement', @@ -1129,6 +1154,7 @@ class OrgNavigation(Navigation): 'send_test', 'no_cookie.send_test_preview', 'send_test_step', + 'send_from_contact_list', 'send_uploaded_letter', 'service_add_email_reply_to', 'service_add_letter_contact', @@ -1157,7 +1183,7 @@ class OrgNavigation(Navigation): 'service_preview_letter_branding', 'service_set_auth_type', 'service_set_channel', - 'service_set_contact_link', + 'send_files_by_email_contact_details', 'service_set_email_branding', 'service_set_inbound_number', 'service_set_inbound_sms', @@ -1168,7 +1194,6 @@ class OrgNavigation(Navigation): 'service_set_sms_prefix', 'service_settings', 'service_sms_senders', - 'service_switch_can_upload_document', 'service_switch_count_as_live', 'service_switch_live', 'service_set_permission', @@ -1187,6 +1212,7 @@ class OrgNavigation(Navigation): 'styleguide', 'submit_request_to_go_live', 'support', + 'support_public', 'suspend_service', 'template_history', 'template_usage', @@ -1201,6 +1227,10 @@ class OrgNavigation(Navigation): 'two_factor_email_sent', 'update_email_branding', 'update_letter_branding', + 'upload_contact_list', + 'check_contact_list', + 'save_contact_list', + 'contact_list', 'upload_letter', 'uploaded_letter_preview', 'uploads', diff --git a/app/notify_client/contact_list_api_client.py b/app/notify_client/contact_list_api_client.py new file mode 100644 index 000000000..9315d57d8 --- /dev/null +++ b/app/notify_client/contact_list_api_client.py @@ -0,0 +1,34 @@ +from app.notify_client import NotifyAdminAPIClient, _attach_current_user + + +class ContactListApiClient(NotifyAdminAPIClient): + + def create_contact_list( + self, + *, + service_id, + upload_id, + original_file_name, + row_count, + template_type, + ): + data = { + "id": upload_id, + "original_file_name": original_file_name, + "row_count": row_count, + "template_type": template_type, + } + + data = _attach_current_user(data) + job = self.post(url='/service/{}/contact-list'.format(service_id), data=data) + + return job + + def get_contact_lists(self, service_id): + return self.get(f'/service/{service_id}/contact-list') + + def get_contact_list(self, *, service_id, contact_list_id): + return self.get(f'/service/{service_id}/contact-list/{contact_list_id}') + + +contact_list_api_client = ContactListApiClient() diff --git a/app/notify_client/job_api_client.py b/app/notify_client/job_api_client.py index 7fa93d52f..f143da94b 100644 --- a/app/notify_client/job_api_client.py +++ b/app/notify_client/job_api_client.py @@ -14,8 +14,9 @@ class JobApiClient(NotifyAdminAPIClient): 'ready to send', 'sent to dvla' } - - NON_SCHEDULED_JOB_STATUSES = JOB_STATUSES - {'scheduled', 'cancelled'} + SCHEDULED_JOB_STATUS = 'scheduled' + CANCELLED_JOB_STATUS = 'cancelled' + NON_SCHEDULED_JOB_STATUSES = JOB_STATUSES - {SCHEDULED_JOB_STATUS, CANCELLED_JOB_STATUS} def get_job(self, service_id, job_id): params = {} @@ -65,20 +66,27 @@ class JobApiClient(NotifyAdminAPIClient): def get_scheduled_jobs(self, service_id): return sorted( - self.get_jobs(service_id, statuses=['scheduled'])['data'], - key=lambda job: job['scheduled_for'] + self.get_jobs( + service_id, + statuses=[self.SCHEDULED_JOB_STATUS] + )['data'], + key=lambda job: job['scheduled_for'], + reverse=True, ) @cache.set('has_jobs-{service_id}') def has_jobs(self, service_id): return bool(self.get_jobs(service_id)['data']) - def create_job(self, job_id, service_id, scheduled_for=None): + def create_job(self, job_id, service_id, scheduled_for=None, contact_list_id=None): data = {"id": job_id} if scheduled_for: data.update({'scheduled_for': scheduled_for}) + if contact_list_id: + data.update({'contact_list_id': contact_list_id}) + data = _attach_current_user(data) job = self.post(url='/service/{}/job'.format(service_id), data=data) diff --git a/app/notify_client/organisations_api_client.py b/app/notify_client/organisations_api_client.py index a62949350..d1c309081 100644 --- a/app/notify_client/organisations_api_client.py +++ b/app/notify_client/organisations_api_client.py @@ -87,5 +87,11 @@ class OrganisationsClient(NotifyAdminAPIClient): params={"org_id": org_id, "name": name} )["result"] + def get_services_and_usage(self, org_id, year): + return self.get( + url=f"/organisations/{org_id}/services-with-usage", + params={"year": str(year)} + ) + organisations_client = OrganisationsClient() diff --git a/app/s3_client/s3_csv_client.py b/app/s3_client/s3_csv_client.py index f9d0b5b9f..8ddfb1a57 100644 --- a/app/s3_client/s3_csv_client.py +++ b/app/s3_client/s3_csv_client.py @@ -9,20 +9,20 @@ from app.s3_client.s3_logo_client import get_s3_object FILE_LOCATION_STRUCTURE = 'service-{}-notify/{}.csv' -def get_csv_location(service_id, upload_id): +def get_csv_location(service_id, upload_id, bucket=None): return ( - current_app.config['CSV_UPLOAD_BUCKET_NAME'], + bucket or current_app.config['CSV_UPLOAD_BUCKET_NAME'], FILE_LOCATION_STRUCTURE.format(service_id, upload_id), ) -def get_csv_upload(service_id, upload_id): - return get_s3_object(*get_csv_location(service_id, upload_id)) +def get_csv_upload(service_id, upload_id, bucket=None): + return get_s3_object(*get_csv_location(service_id, upload_id, bucket)) -def s3upload(service_id, filedata, region): +def s3upload(service_id, filedata, region, bucket=None): upload_id = str(uuid.uuid4()) - bucket_name, file_location = get_csv_location(service_id, upload_id) + bucket_name, file_location = get_csv_location(service_id, upload_id, bucket) utils_s3upload( filedata=filedata['data'], region=region, @@ -32,10 +32,10 @@ def s3upload(service_id, filedata, region): return upload_id -def s3download(service_id, upload_id): +def s3download(service_id, upload_id, bucket=None): contents = '' try: - key = get_csv_upload(service_id, upload_id) + key = get_csv_upload(service_id, upload_id, bucket) contents = key.get()['Body'].read().decode('utf-8') except botocore.exceptions.ClientError as e: current_app.logger.error("Unable to download s3 file {}".format( @@ -44,14 +44,33 @@ def s3download(service_id, upload_id): return contents -def set_metadata_on_csv_upload(service_id, upload_id, **kwargs): +def set_metadata_on_csv_upload(service_id, upload_id, bucket=None, **kwargs): get_csv_upload( - service_id, upload_id + service_id, upload_id, bucket=bucket ).copy_from( - CopySource='{}/{}'.format(*get_csv_location(service_id, upload_id)), + CopySource='{}/{}'.format(*get_csv_location(service_id, upload_id, bucket=bucket)), ServerSideEncryption='AES256', Metadata={ key: str(value) for key, value in kwargs.items() }, MetadataDirective='REPLACE', ) + + +def set_metadata_on_contact_list(service_id, upload_id, **kwargs): + return set_metadata_on_csv_upload( + service_id, + upload_id, + bucket=current_app.config['CONTACT_LIST_UPLOAD_BUCKET_NAME'], + **kwargs, + ) + + +def get_csv_metadata(service_id, upload_id, bucket=None): + try: + key = get_csv_upload(service_id, upload_id, bucket) + return key.get()['Metadata'] + except botocore.exceptions.ClientError as e: + current_app.logger.error("Unable to download s3 file {}".format( + FILE_LOCATION_STRUCTURE.format(service_id, upload_id))) + raise e diff --git a/app/s3_client/s3_logo_client.py b/app/s3_client/s3_logo_client.py index bb8626bae..3e280bc25 100644 --- a/app/s3_client/s3_logo_client.py +++ b/app/s3_client/s3_logo_client.py @@ -80,17 +80,6 @@ def upload_letter_temp_logo(filename, filedata, region, user_id): return upload_filename -def upload_letter_png_logo(filename, filedata, region): - bucket_name = current_app.config['LOGO_UPLOAD_BUCKET_NAME'] - utils_s3upload( - filedata=filedata, - region=region, - bucket_name=bucket_name, - file_location=filename, - content_type='image/png' - ) - - def permanent_email_logo_name(filename, user_id): if filename.startswith(TEMP_TAG.format(user_id=user_id)): return get_temp_truncated_filename(filename=filename, user_id=user_id) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 91eec3123..96e3d0cf4 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -55,7 +55,7 @@ "active": header_navigation.is_selected('user-profile') }, { - "href": url_for('main.platform_admin'), + "href": url_for('main.platform_admin_splash_page'), "text": "Platform admin", "active": header_navigation.is_selected('platform-admin') }, diff --git a/app/templates/components/ajax-block.html b/app/templates/components/ajax-block.html index 4d40a25b3..c0aa403d8 100644 --- a/app/templates/components/ajax-block.html +++ b/app/templates/components/ajax-block.html @@ -1,4 +1,4 @@ -{% macro ajax_block(partials, url, key, interval=2, finished=False, form='') %} +{% macro ajax_block(partials, url, key, interval=5, finished=False, form='') %} {% if not finished %}
+ {% endif %}
@@ -42,7 +42,7 @@
{% if failures %} {% if failure_link %} - + {{ "{:,}".format(failures) }} failed – {{ failure_percentage }}% diff --git a/app/templates/components/browse-list.html b/app/templates/components/browse-list.html index d59e9ae37..b75d09218 100644 --- a/app/templates/components/browse-list.html +++ b/app/templates/components/browse-list.html @@ -5,7 +5,7 @@ {% for item in items %} {% if item.title and item.link %}
  • - {{ item.title }} + {{ item.title }} {% if item.hint %}
    {{ item.hint }} diff --git a/app/templates/components/file-upload.html b/app/templates/components/file-upload.html index 647629248..1908f1e48 100644 --- a/app/templates/components/file-upload.html +++ b/app/templates/components/file-upload.html @@ -32,7 +32,7 @@ {% if alternate_link and alternate_link_text %} - or {{ alternate_link_text }} + or {{ alternate_link_text }} {% endif %} diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html index 5400e91c2..0d1900745 100644 --- a/app/templates/components/folder-path.html +++ b/app/templates/components/folder-path.html @@ -17,12 +17,12 @@ {% else %} {% if folder.id %} {% if current_user.has_template_folder_permission(folder) %} - {{ folder.name }} + {{ folder.name }} {% else %} {{ folder.name }} {% endif %} {% else %} - Templates + Templates {% endif %} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} {% endif %} @@ -40,7 +40,7 @@ {% if folder_path %}

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

    {% endmacro %} diff --git a/app/templates/components/pill.html b/app/templates/components/pill.html index bcbb5408b..d6a416522 100644 --- a/app/templates/components/pill.html +++ b/app/templates/components/pill.html @@ -13,7 +13,7 @@
    {% else %}
  • - + {% endif %} {% if show_count %} {{ big_number(count, **big_number_args) }} diff --git a/app/templates/components/previous-next-navigation.html b/app/templates/components/previous-next-navigation.html index b73846c6a..483dc3f18 100644 --- a/app/templates/components/previous-next-navigation.html +++ b/app/templates/components/previous-next-navigation.html @@ -4,7 +4,7 @@
    • diff --git a/app/templates/content_template.html b/app/templates/content_template.html index 95c0f63f1..d1476c0e8 100644 --- a/app/templates/content_template.html +++ b/app/templates/content_template.html @@ -8,15 +8,15 @@ {% block maincolumn_content %} -
    +
    {% if navigation_links %} -
    +
    {{ sub_navigation(navigation_links) }}
    -
    +
    {% else %} -
    +
    {% endif %} {% block content_column_content %} diff --git a/app/templates/error/400.html b/app/templates/error/400.html deleted file mode 100644 index f874031c1..000000000 --- a/app/templates/error/400.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "withoutnav_template.html" %} -{% block per_page_title %}Bad request{% endblock %} -{% block maincolumn_content %} -
    -
    -

    - {{ message|join(",")}} -

    -
    -
    -{% endblock %} diff --git a/app/templates/error/401.html b/app/templates/error/401.html index 74747f50e..5a3ce2ea2 100644 --- a/app/templates/error/401.html +++ b/app/templates/error/401.html @@ -1,9 +1,9 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}You’re not authorised to see this page{% endblock %} {% block maincolumn_content %} -
    -
    +
    +

    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/403.html b/app/templates/error/403.html index 13b4602b8..bf6845b91 100644 --- a/app/templates/error/403.html +++ b/app/templates/error/403.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}You’re not allowed to see this page{% endblock %} {% block maincolumn_content %} -
    -
    +
    +

    You’re not allowed to see this page

    diff --git a/app/templates/error/404.html b/app/templates/error/404.html index acb43af52..b50e23adb 100644 --- a/app/templates/error/404.html +++ b/app/templates/error/404.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}Page not found{% endblock %} {% block maincolumn_content %} -
    -
    +
    +

    Page not found

    @@ -13,7 +13,7 @@ If you pasted the web address, check you copied the entire address.

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

    diff --git a/app/templates/error/410.html b/app/templates/error/410.html index acb43af52..b50e23adb 100644 --- a/app/templates/error/410.html +++ b/app/templates/error/410.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}Page not found{% endblock %} {% block maincolumn_content %} -
    -
    +
    +

    Page not found

    @@ -13,7 +13,7 @@ If you pasted the web address, check you copied the entire address.

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

    diff --git a/app/templates/error/413.html b/app/templates/error/413.html index 4dfddc603..f273a10f1 100644 --- a/app/templates/error/413.html +++ b/app/templates/error/413.html @@ -1,18 +1,18 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}File too big{% endblock %} {% block maincolumn_content %} -
    -
    +
    +

    The file you uploaded was too big

    -
    -
    +
    +

    Files must be smaller than 5 MB.

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

    diff --git a/app/templates/error/500.html b/app/templates/error/500.html index 0d3109996..32562ff18 100644 --- a/app/templates/error/500.html +++ b/app/templates/error/500.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}Sorry, there’s a problem with the service{% endblock %} {% block maincolumn_content %} -
    -
    +
    +

    Sorry, there’s a problem with GOV.UK Notify

    @@ -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/govuk_template.html b/app/templates/govuk_template.html deleted file mode 100644 index c8ea57fe9..000000000 --- a/app/templates/govuk_template.html +++ /dev/null @@ -1,109 +0,0 @@ -{% block top_of_page %}{% endblock %} - - - - - - {% block page_title %}GOV.UK - The best place to find government services and information{% endblock %} - - - - - - - - - - - - - - - - - - - - - - - - {% block head %}{% endblock %} - - - - - - - - - {% block body_start %}{% endblock %} - - - - - - - - - - {% block after_header %}{% endblock %} - -
    - - {% block content %}{% endblock %} - - - - - - - - {% block body_end %}{% endblock %} - - - - - diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index 92c05dd6c..3e5d8b2bd 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -5,32 +5,26 @@ diff --git a/app/templates/org_nav.html b/app/templates/org_nav.html index a9f518e11..7d7156ab4 100644 --- a/app/templates/org_nav.html +++ b/app/templates/org_nav.html @@ -1,10 +1,10 @@ diff --git a/app/templates/org_template.html b/app/templates/org_template.html index 32bbdab14..2088b05cf 100644 --- a/app/templates/org_template.html +++ b/app/templates/org_template.html @@ -8,18 +8,18 @@
    {% if current_user.platform_admin %} - All organisations + All organisations {% endif %} -
    +
    {{ current_org.name }}
    - Switch service + Switch service
    -
    -
    +
    +
    {% include "org_nav.html" %}
    -
    +
    {% block beforeContent %}{% endblock %}
    {% block content %} diff --git a/app/templates/partials/check/message-too-long.html b/app/templates/partials/check/message-too-long.html index 6aea90a64..9b07ca20b 100644 --- a/app/templates/partials/check/message-too-long.html +++ b/app/templates/partials/check/message-too-long.html @@ -1,13 +1,7 @@ -{% from "components/banner.html" import banner_wrapper %} - -
    - {% call banner_wrapper(type='dangerous') %} -

    - Message too long -

    -

    - Text messages cannot be longer than {{ SMS_CHAR_COUNT_LIMIT }} characters. - Your message is {{ template.content_count }} characters. -

    - {% endcall %} -
    +

    + Message too long +

    +

    + Text messages cannot be longer than {{ SMS_CHAR_COUNT_LIMIT }} characters. + Your message is {{ template.content_count }} characters. +

    diff --git a/app/templates/partials/check/not-allowed-to-send-to.html b/app/templates/partials/check/not-allowed-to-send-to.html index 7ab180295..d3ee32933 100644 --- a/app/templates/partials/check/not-allowed-to-send-to.html +++ b/app/templates/partials/check/not-allowed-to-send-to.html @@ -7,6 +7,6 @@ {%- endif %}

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

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

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

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

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

    diff --git a/app/templates/partials/count.html b/app/templates/partials/count.html index c66b6bff2..21834648b 100644 --- a/app/templates/partials/count.html +++ b/app/templates/partials/count.html @@ -3,9 +3,9 @@
    {% if notifications_deleted %} -
    +
    {% for label, query_param, url, count in counts %} -
    +
    {{ big_number(count, label, smaller=True) }}
    {% endfor %} diff --git a/app/templates/partials/jobs/count-letters.html b/app/templates/partials/jobs/count-letters.html index 6d844ad4e..21e242d4e 100644 --- a/app/templates/partials/jobs/count-letters.html +++ b/app/templates/partials/jobs/count-letters.html @@ -1,8 +1,8 @@ {% from 'components/big-number.html' import big_number %} {% from 'components/message-count-label.html' import message_count_label %} -
    -
    +
    +
    {{ big_number( job.notification_count, @@ -11,7 +11,7 @@ )}}
    -
    +
    {{ big_number( job.letter_timings.earliest_delivery|string|format_date_short, diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html index 869573da2..86c52fb57 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 }}

    @@ -25,21 +25,21 @@
    {% endif %} - {% if template.template_type == 'letter' %} + {% if job.template_type == 'letter' %}
    {% endif %} {% if job.still_processing %} -

    +

    Report is {{ "{:.0f}%".format(job.percentage_complete * 0.99) }} complete…

    {% elif notifications %} -

    - Download this report +

    + Download this report   {{ time_left }}

    {% endif %} - {% if template.template_type == 'letter' %} + {% if job.template_type == 'letter' %}
    {% endif %} @@ -55,7 +55,7 @@ field_headings_visible=False ) %} {% call row_heading() %} - {{ item.to }} + {{ item.to }}

    {{ item.preview_of_content }}

    diff --git a/app/templates/partials/notifications/status.html b/app/templates/partials/notifications/status.html index d90e82462..c8124b94b 100644 --- a/app/templates/partials/notifications/status.html +++ b/app/templates/partials/notifications/status.html @@ -1,12 +1,14 @@
    -

    - {% if notification.status|format_notification_status_as_url(notification.notification_type) %} - + {% 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 %} + {% endif %} {{ notification.status|format_notification_status( notification.template.template_type ) }} - {% if notification.status|format_notification_status_as_url(notification.notification_type) %} + {% if status_url %} {% 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 9dea399f4..1f39028e8 100644 --- a/app/templates/partials/templates/guidance-character-count.html +++ b/app/templates/partials/templates/guidance-character-count.html @@ -4,5 +4,5 @@ cost more.

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

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

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

    diff --git a/app/templates/partials/templates/guidance-send-a-document.html b/app/templates/partials/templates/guidance-send-a-document.html index 6a5f74dd1..6a67d6ce8 100644 --- a/app/templates/partials/templates/guidance-send-a-document.html +++ b/app/templates/partials/templates/guidance-send-a-document.html @@ -6,7 +6,7 @@

    - Download your document at: ((link_to_document)) + Download your document at: ((link_to_file))

    - Next, use the API to upload your document. Follow the instructions to send a document by email in the API documentation. + Next, use the API to upload your document. Follow the instructions to send a document by email in the API documentation. diff --git a/app/templates/partials/tour.html b/app/templates/partials/tour.html index 9fba8b93e..e4ea7f74b 100644 --- a/app/templates/partials/tour.html +++ b/app/templates/partials/tour.html @@ -2,36 +2,36 @@ {% call banner_wrapper(type='tour') %}

    Try sending yourself this example

    -
    -
    +
    +

    1.

    -
    +

    Every message is sent from a template

    -
    -
    +
    +

    2.

    -
    +

    The template pulls in the data you provide

    -
    -
    +
    +

    3.

    -
    +

    Notify delivers the message

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

    {{ item.preview_of_content }} diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html index adf2191cc..aeaf37dba 100644 --- a/app/templates/views/add-service.html +++ b/app/templates/views/add-service.html @@ -11,8 +11,8 @@ {% block maincolumn_content %} -

    -
    +
    +
    {{ page_header('About your service') }} diff --git a/app/templates/views/agreement/agreement-accept.html b/app/templates/views/agreement/agreement-accept.html index 42e80bddc..8a01e952a 100644 --- a/app/templates/views/agreement/agreement-accept.html +++ b/app/templates/views/agreement/agreement-accept.html @@ -12,8 +12,8 @@ {% block maincolumn_content %} -
    -
    +
    +
    {{ page_header( 'Accept our data sharing and financial agreement', diff --git a/app/templates/views/agreement/agreement-confirm.html b/app/templates/views/agreement/agreement-confirm.html index 9f16c9581..dd21769ad 100644 --- a/app/templates/views/agreement/agreement-confirm.html +++ b/app/templates/views/agreement/agreement-confirm.html @@ -9,8 +9,8 @@ {% block maincolumn_content %} -
    -
    +
    +
    {{ page_header( 'Confirm that you accept the agreement', diff --git a/app/templates/views/agreement/agreement-public.html b/app/templates/views/agreement/agreement-public.html index 0145cf89e..bb157bcf3 100644 --- a/app/templates/views/agreement/agreement-public.html +++ b/app/templates/views/agreement/agreement-public.html @@ -7,15 +7,15 @@ {% block maincolumn_content %} -
    -
    +
    +

    Download the GOV.UK Notify data sharing and financial agreement

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

    The agreement contains commercially sensitive information. Do not share it outside your organisation. diff --git a/app/templates/views/agreement/service-agreement-choose.html b/app/templates/views/agreement/service-agreement-choose.html index 70f502b96..31c466636 100644 --- a/app/templates/views/agreement/service-agreement-choose.html +++ b/app/templates/views/agreement/service-agreement-choose.html @@ -7,8 +7,8 @@ {% block maincolumn_content %} -

    -
    +
    +
    {{ page_header( 'Accept the data sharing and financial agreement', @@ -28,7 +28,7 @@ There are different agreements for crown and non-crown organisations.

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

    diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index 1d0512168..0f14b14a3 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -7,8 +7,8 @@ {% block maincolumn_content %} -
    -
    +
    +
    {{ page_header( 'Your organisation has already accepted the agreement', @@ -19,7 +19,7 @@ {{ current_service.organisation.name }} has already accepted the GOV.UK Notify data sharing and financial agreement.

    -

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

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

    The agreement is confidential and should not be shared outside your organisation. diff --git a/app/templates/views/agreement/service-agreement.html b/app/templates/views/agreement/service-agreement.html index 1e6cb6e06..5f6e94468 100644 --- a/app/templates/views/agreement/service-agreement.html +++ b/app/templates/views/agreement/service-agreement.html @@ -8,8 +8,8 @@ {% block maincolumn_content %} -

    -
    +
    +
    {{ page_header( 'Accept our data sharing and financial agreement', @@ -26,7 +26,7 @@ Once accepted, the agreement covers all Notify services from {{ current_service.organisation.name }}.

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

    The agreement is confidential and should not be shared outside your organisation. diff --git a/app/templates/views/api/callbacks/delivery-status-callback.html b/app/templates/views/api/callbacks/delivery-status-callback.html index 9e08dd9ab..c2efcacdd 100644 --- a/app/templates/views/api/callbacks/delivery-status-callback.html +++ b/app/templates/views/api/callbacks/delivery-status-callback.html @@ -9,8 +9,8 @@ {% endblock %} {% block maincolumn_content %} -

    -
    +
    +
    {{ page_header( 'Callbacks for delivery receipts', @@ -19,7 +19,7 @@

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

    {% call form_wrapper() %} diff --git a/app/templates/views/api/callbacks/received-text-messages-callback.html b/app/templates/views/api/callbacks/received-text-messages-callback.html index 66c3f8867..d592ee704 100644 --- a/app/templates/views/api/callbacks/received-text-messages-callback.html +++ b/app/templates/views/api/callbacks/received-text-messages-callback.html @@ -13,11 +13,11 @@ 'Callbacks for received text messages', back_link=url_for('.api_callbacks', service_id=current_service.id) ) }} -
    -
    +
    +

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

    {% call form_wrapper() %} diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index cebb5442d..c8cf54694 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -14,26 +14,26 @@ API integration -
    -
    +
    {% block platform_admin_content %}{% endblock %}
    diff --git a/app/templates/views/platform-admin/_global_stats.html b/app/templates/views/platform-admin/_global_stats.html index 5cfe1c50b..1fe7c6c2a 100644 --- a/app/templates/views/platform-admin/_global_stats.html +++ b/app/templates/views/platform-admin/_global_stats.html @@ -1,7 +1,7 @@ {% from "components/big-number.html" import big_number_with_status %} {% from "components/message-count-label.html" import message_count_label %} -
    -
    +
    +
    {{ big_number_with_status( global_stats.email.delivered + global_stats.email.failed, message_count_label(global_stats.email.delivered, 'email'), @@ -11,7 +11,7 @@ smaller=True ) }}
    -
    +
    {{ big_number_with_status( global_stats.sms.delivered + global_stats.sms.failed, message_count_label(global_stats.sms.delivered, 'sms'), @@ -21,7 +21,7 @@ smaller=True ) }}
    -
    +
    {{ big_number_with_status( global_stats.letter.requested, message_count_label(global_stats.letter.requested, 'letter'), diff --git a/app/templates/views/platform-admin/index.html b/app/templates/views/platform-admin/index.html index 449461b88..60f591a4c 100644 --- a/app/templates/views/platform-admin/index.html +++ b/app/templates/views/platform-admin/index.html @@ -32,9 +32,9 @@ "open": form.errors | convert_to_boolean }) }} -
    +
    {% for noti_type in global_stats %} -
    +
    {{ big_number_simple( noti_type.black_box.number, message_count_label(noti_type.black_box.number, noti_type.black_box.notification_type) @@ -53,9 +53,9 @@ {% endfor %}
    -
    +
    {% for noti_type in global_stats %} -
    +
    {{ "{:,}".format(noti_type.test_data.number) }} {{ noti_type.test_data.label }} diff --git a/app/templates/views/platform-admin/reports.html b/app/templates/views/platform-admin/reports.html index 8f5c90f19..c07fd26ad 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/returned-letters.html b/app/templates/views/platform-admin/returned-letters.html index 666afbc97..12b1df7be 100644 --- a/app/templates/views/platform-admin/returned-letters.html +++ b/app/templates/views/platform-admin/returned-letters.html @@ -9,8 +9,8 @@ {% block platform_admin_content %} -
    -
    +
    +

    Submit returned letters

    {% call form_wrapper() %} {{ textbox(form.references, width='1-1', rows=8, autosize=True) }} diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html index e899c0a96..e0a7eed18 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/platform-admin/splash-page.html b/app/templates/views/platform-admin/splash-page.html new file mode 100644 index 000000000..d048ef002 --- /dev/null +++ b/app/templates/views/platform-admin/splash-page.html @@ -0,0 +1,17 @@ +{% extends "views/platform-admin/_base_template.html" %} + +{% block per_page_title %} + Summary +{% endblock %} + +{% block platform_admin_content %} + +

    + Summary +

    + +

    + Load summary +

    + +{% endblock %} diff --git a/app/templates/views/pricing/how-to-pay.html b/app/templates/views/pricing/how-to-pay.html index 9554377fc..a3bf6bd19 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 4502ac9f0..49c85c61b 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 b4f2cf6de..c7d2337c6 100644 --- a/app/templates/views/privacy.html +++ b/app/templates/views/privacy.html @@ -6,8 +6,8 @@ {% block maincolumn_content %} -
    -
    +
    +

    Privacy notice: how we use your data

    Last update: 5 March 2019

    @@ -16,14 +16,14 @@

    GOV.UK Notify is a service that lets public service teams in the UK send emails, text messages, and letters to users of their service.

    - +

    GOV.UK Notify is provided by the Government Digital Service (GDS) which is part of the Cabinet Office.

    Organisations sending notifications using GOV.UK Notify are the data controller and Cabinet Office is the data processor. The data controller must tell you about what they are doing with your personal data.

    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

    @@ -63,7 +63,7 @@

    Where your data is processed and stored

    -

    We design, build and run our systems to make sure that your data is as safe as possible at any stage, both while it’s +

    We design, build and run our systems to make sure that your data is as safe as possible at any stage, both while it’s processed and when it’s stored.

    Your personal data will not be transferred outside of the European Economic Area (EEA) throughout the course of its @@ -112,7 +112,7 @@

    Questions and complaints

    Contact the GDS Privacy Team if you either:

    - +
    • have any questions about anything in this document
    • think that your personal data has been misused or mishandled
      • @@ -120,27 +120,27 @@

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

      - +

      You can also contact the Cabinet Office Data Protection Officer.

      - +

      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/edit-provider.html b/app/templates/views/providers/edit-provider.html index 70703f2d6..bf8bf557c 100644 --- a/app/templates/views/providers/edit-provider.html +++ b/app/templates/views/providers/edit-provider.html @@ -10,8 +10,8 @@ Provider - {{provider.display_name}} {% block maincolumn_content %} -

      -
      +
      +
      {{ page_header( provider.display_name, diff --git a/app/templates/views/providers/edit-sms-provider-ratio.html b/app/templates/views/providers/edit-sms-provider-ratio.html index 832a31fe9..8d7be43ae 100644 --- a/app/templates/views/providers/edit-sms-provider-ratio.html +++ b/app/templates/views/providers/edit-sms-provider-ratio.html @@ -19,9 +19,9 @@
      -
      -
       
      -
      +
      +
       
      +
      {{ primary_provider }} @@ -59,8 +59,8 @@
        {% for version in versions %}
      • -
        -
        +
        +
        {{ version.created_by.name or (' '|safe) }}
        @@ -70,7 +70,7 @@
        {% endif %}
        -
        +
        {{ primary_provider }}

        diff --git a/app/templates/views/providers/provider.html b/app/templates/views/providers/provider.html index 3a107cbd2..faf5d4000 100644 --- a/app/templates/views/providers/provider.html +++ b/app/templates/views/providers/provider.html @@ -9,8 +9,8 @@ Provider versions {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( provider_versions[0].display_name, diff --git a/app/templates/views/providers/providers.html b/app/templates/views/providers/providers.html index 4314f8fc6..73f435c75 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/re-validate-email-sent.html b/app/templates/views/re-validate-email-sent.html index 6394c3a85..89d70e33b 100644 --- a/app/templates/views/re-validate-email-sent.html +++ b/app/templates/views/re-validate-email-sent.html @@ -7,8 +7,8 @@ {% block maincolumn_content %} -
        -
        +
        +

        {{ title }}

        For security, we need to check if you still have access to your email address.

        We’ve sent you a link to sign in to Notify. The link will open in a new browser window, so you can close this one.

        diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html index d91de327b..deadda544 100644 --- a/app/templates/views/register-from-invite.html +++ b/app/templates/views/register-from-invite.html @@ -9,8 +9,8 @@ Create an account {% block maincolumn_content %} -
        -
        +
        +

        Create an account

        Your account will be created with this email address: diff --git a/app/templates/views/register-from-org-invite.html b/app/templates/views/register-from-org-invite.html index be9d73374..a7c9bce8d 100644 --- a/app/templates/views/register-from-org-invite.html +++ b/app/templates/views/register-from-org-invite.html @@ -9,8 +9,8 @@ Create an account {% block maincolumn_content %} -

        -
        +
        +

        Create an account

        Your account will be created with this email: {{invited_org_user.email_address}}

        {% call form_wrapper() %} diff --git a/app/templates/views/register.html b/app/templates/views/register.html index d0c4c9c2d..71611a4ae 100644 --- a/app/templates/views/register.html +++ b/app/templates/views/register.html @@ -9,8 +9,8 @@ Create an account {% block maincolumn_content %} -
        -
        +
        +

        Create an account

        {% call form_wrapper(autocomplete=True) %} {{ textbox(form.name, width='3-4') }} diff --git a/app/templates/views/returned-letter-summary.html b/app/templates/views/returned-letter-summary.html index 5be1fc0b3..b38591297 100644 --- a/app/templates/views/returned-letter-summary.html +++ b/app/templates/views/returned-letter-summary.html @@ -1,5 +1,6 @@ {% from "components/table.html" import list_table, row_heading %} {% from "components/message-count-label.html" import message_count_label %} +{% from "components/page-header.html" import page_header %} {% extends "withnav_template.html" %} {% block service_page_title %} @@ -7,9 +8,20 @@ {% endblock %} {% block maincolumn_content %} -

        - Returned letters -

        +
        +
        + {{ page_header( + 'Returned letters', + back_link=url_for('main.service_dashboard', service_id=current_service.id) + ) }} +

        + Reports are published once a month. +

        +

        + You’ll only get a report if one or more of your letters is returned. +

        +
        +
        {% call(item, row_number) list_table( data, @@ -20,7 +32,7 @@ field_headings_visible=False ) %} {% call row_heading() %} - {{ item.reported_at | format_date_normal }}

        {{ item.returned_letter_count}} {{ message_count_label(item.returned_letter_count, 'letter', suffix='')}} diff --git a/app/templates/views/returned-letters.html b/app/templates/views/returned-letters.html index fe0e85462..f033a33bc 100644 --- a/app/templates/views/returned-letters.html +++ b/app/templates/views/returned-letters.html @@ -42,7 +42,7 @@ {% call field(align='right') %} - Originally sent {{ item.created_at|format_date_normal }} + Sent {{ item.created_at|format_date_normal }} {% endcall %} diff --git a/app/templates/views/roadmap.html b/app/templates/views/roadmap.html index 085f408bf..0e0a0cc02 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 d66b76acb..5e0b39108 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:

        -
      • formal risk assessments based on ISO 2700:2011 and National Cyber Security Centre guidance
        • -
      • CHECK-based testing, both annually and when any major changes are made to Notify
        • +
      • formal risk assessments based on ISO 2700:2011 and National Cyber Security Centre guidance
        • +
      • CHECK-based testing, both annually and when any major changes are made to Notify
      • residual risk statement preparation and active management of the risk treatment plan
      • regular updates to the Privacy Impact Assessment
      • security impact assessments
        • @@ -77,8 +77,8 @@

        Notify also has approval from the Office of the Government’s SIRO to host data within the EEA.

        Classifications and security vetting

        -

        You can use Notify to send messages classified as ‘OFFICIAL’ or ‘OFFICIAL-SENSITIVE’ under the Government Security Classifications policy.

        -

        You must not use Notify to send ‘special category data’, as defined in the General Data Protection Regulation (GDPR).

        -

        The Notify team has Security Check (SC) level clearance from United Kingdom Security Vetting (UKSV).

        +

        You can use Notify to send messages classified as ‘OFFICIAL’ or ‘OFFICIAL-SENSITIVE’ under the Government Security Classifications policy.

        +

        You must not use Notify to send ‘special category data’, as defined in the General Data Protection Regulation (GDPR).

        +

        The Notify team has Security Check (SC) level clearance from United Kingdom Security Vetting (UKSV).

        {% endblock %} diff --git a/app/templates/views/send-contact-list.html b/app/templates/views/send-contact-list.html new file mode 100644 index 000000000..e08c020fb --- /dev/null +++ b/app/templates/views/send-contact-list.html @@ -0,0 +1,80 @@ +{% extends "withnav_template.html" %} +{% from "components/big-number.html" import big_number -%} +{% from "components/list.html" import list_of_placeholders %} +{% from "components/message-count-label.html" import recipient_count_label %} +{% from "components/page-header.html" import page_header %} +{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %} + +{% block service_page_title %} + Choose a saved contact list +{% endblock %} + +{% block maincolumn_content %} + + {{ page_header( + 'Choose a saved contact list', + back_link=url_for('.send_one_off', service_id=current_service.id, template_id=template.id) + ) }} + + {% if template.placeholders %} +
        +
        +

        + You cannot use a saved contact list with this template because it + is personalised with {{ list_of_placeholders(template.placeholders) }}. +

        +

        + Saved contact lists can only store email addresses or phone + numbers. +

        +
        +
        + {% elif contact_lists %} +
        + {% call(item, row_number) list_table( + contact_lists, + caption="Existing contact lists", + caption_visible=False, + empty_message=( + 'You don’t have any contact lists yet' + ), + field_headings=[ + 'File', + 'Status' + ], + field_headings_visible=False + ) %} + {% call row_heading() %} +
        + {{ item.original_file_name }} + + Uploaded {{ item.created_at|format_datetime_relative }} + +
        + {% endcall %} + {% call field() %} + {{ big_number( + item.row_count, + smallest=True, + label=recipient_count_label( + item.row_count, + item.template_type + ) + ) }} + {% endcall %} + {% endcall %} +
        + {% else %} +
        +
        +

        + You have not saved any lists of {{ recipient_count_label(99, template.template_type) }} yet. +

        +

        + To upload and save a new contact list, go to the uploads page. +

        +
        +
        + {% endif %} + +{% endblock %} diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html index 20c1728f3..ad3915678 100644 --- a/app/templates/views/send-test.html +++ b/app/templates/views/send-test.html @@ -21,25 +21,31 @@ module="autofocus", data_kwargs={'force-focus': True} ) %} -
        -
        +
        +
        {{ textbox( form.placeholder_value, hint='Optional' if optional_placeholder else None, width='1-1', ) }}
        - {% if skip_link %} -
        - {{ skip_link[0] }} + {% if skip_link or link_to_upload %} +
        + {% if link_to_upload %} + Upload a list of {{ recipient_count_label(999, template.template_type) }} + {% if current_service.contact_lists %} + Use a saved list + {% endif %} + {% endif %} + {% if skip_link %} + {{ skip_link[0] }} + {% endif %}
        {% endif %}
        {% if link_to_upload %}

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

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

        - Download this example + Download this example

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

        diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index a073efb1d..7b7213e3a 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -45,19 +45,6 @@ ) }} {% endcall %} - - {% call settings_row(if_has_permission='upload_document') %} - {{ text_field('Contact details') }} - {{ text_field(current_service.contact_link, truncate=true) }} - {{ edit_field( - 'Change', - url_for('.service_set_contact_link', - service_id=current_service.id), - permissions=['manage_service'] - ) - }} - {% endcall %} - {% endcall %} {% call mapping_table( @@ -110,6 +97,16 @@ )}} {% endcall %} + {% call settings_row(if_has_permission='email') %} + {{ text_field('Send files by email') }} + {{ text_field(current_service.contact_link if current_service.contact_link else "Not set up", truncate=true) }} + {{ edit_field( + 'Manage', + url_for('.send_files_by_email_contact_details', service_id=current_service.id), + permissions=['manage_service'], + )}} + {% endcall %} + {% endcall %} {% call mapping_table( @@ -263,7 +260,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 +276,7 @@

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

        {% endif %} @@ -318,7 +315,7 @@ {{ text_field('Organisation')}} {% call field() %} {% if current_service.organisation_id %} - + {{ current_service.organisation.name }} {% else %} @@ -375,13 +372,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 +391,7 @@ Service suspended

        - + Resume service diff --git a/app/templates/views/service-settings/confirm.html b/app/templates/views/service-settings/confirm.html index 12b90a7c5..0fdf3b923 100644 --- a/app/templates/views/service-settings/confirm.html +++ b/app/templates/views/service-settings/confirm.html @@ -15,8 +15,8 @@ back_link=url_for('main.service_settings', service_id=current_service.id) ) }} -
        -
        +
        +
        {% call form_wrapper() %} {{ textbox(form.password, autocomplete='current-password') }} diff --git a/app/templates/views/service-settings/data-retention.html b/app/templates/views/service-settings/data-retention.html index 3a91f6101..d47e8cb49 100644 --- a/app/templates/views/service-settings/data-retention.html +++ b/app/templates/views/service-settings/data-retention.html @@ -9,13 +9,13 @@ {% block maincolumn_content %} -
        -
        +
        +

        Data retention

        -
        +
        {{ govukButton({ "element": "a", "text": "Add data retention", @@ -24,8 +24,8 @@ }) }}
        -
        -
        +
        +
        By default data is kept for 7 days
        diff --git a/app/templates/views/service-settings/delete.html b/app/templates/views/service-settings/delete.html index 5be72fafd..04122b683 100644 --- a/app/templates/views/service-settings/delete.html +++ b/app/templates/views/service-settings/delete.html @@ -10,8 +10,8 @@ -
        -
        +
        +

        Delete this service from GOV.UK Notify

        diff --git a/app/templates/views/service-settings/email-reply-to/_verify-updates.html b/app/templates/views/service-settings/email-reply-to/_verify-updates.html index ccd22dfd5..a6cc0d476 100644 --- a/app/templates/views/service-settings/email-reply-to/_verify-updates.html +++ b/app/templates/views/service-settings/email-reply-to/_verify-updates.html @@ -15,7 +15,7 @@

        - Refresh + Refresh

        {% elif verification_status == "success" %} {{ banner("‘{}’ is ready to use".format(reply_to_email_address), type='default', with_tick=True) }} diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html index 3c687ddd9..6bd83a11f 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") }} @@ -39,8 +39,8 @@
        {% endfor %}
        -
        -
        +
        +
        {% if current_user.has_permissions('manage_service') %}
        {{ govukButton({ @@ -51,7 +51,7 @@
        {% endif %}
        -
        +

        You need to add at least one reply-to address so recipients can reply to your messages.

        diff --git a/app/templates/views/service-settings/estimate-usage.html b/app/templates/views/service-settings/estimate-usage.html index b30d5675c..0b8635cc1 100644 --- a/app/templates/views/service-settings/estimate-usage.html +++ b/app/templates/views/service-settings/estimate-usage.html @@ -11,8 +11,8 @@ {% endblock %} {% block maincolumn_content %} -
        -
        +
        +
        {% if not form.at_least_one_volume_filled %} {% call banner_wrapper(type='dangerous') %}

        diff --git a/app/templates/views/service-settings/letter-contact-details.html b/app/templates/views/service-settings/letter-contact-details.html index 57527ec58..be5831ba5 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") }} @@ -49,8 +49,8 @@ {% endfor %}

        {% if current_user.has_permissions('manage_service') %} -
        -
        +
        +
        {{ govukButton({ "element": "a", diff --git a/app/templates/views/service-settings/letter-contact/add.html b/app/templates/views/service-settings/letter-contact/add.html index d81c97219..46f10b0da 100644 --- a/app/templates/views/service-settings/letter-contact/add.html +++ b/app/templates/views/service-settings/letter-contact/add.html @@ -15,8 +15,8 @@ 'Add a new address', back_link=back_link ) }} -
        -
        +
        +
        {% call form_wrapper() %} {{ textbox( form.letter_contact_block, diff --git a/app/templates/views/service-settings/preview-email-branding.html b/app/templates/views/service-settings/preview-email-branding.html index f9426a49a..d0149947d 100644 --- a/app/templates/views/service-settings/preview-email-branding.html +++ b/app/templates/views/service-settings/preview-email-branding.html @@ -9,8 +9,8 @@ {% block maincolumn_content %}

        Preview email branding

        -
        -
        +
        +
        {% call form_wrapper(action=action) %}
        diff --git a/app/templates/views/service-settings/preview-letter-branding.html b/app/templates/views/service-settings/preview-letter-branding.html index 9a5395e48..a65d6c432 100644 --- a/app/templates/views/service-settings/preview-letter-branding.html +++ b/app/templates/views/service-settings/preview-letter-branding.html @@ -9,15 +9,15 @@ {% block platform_admin_content %}

        Preview letter branding

        -
        -
        +
        +
        {% call form_wrapper(action=action) %}
        {{ form.hidden_tag() }}
        {{ govukButton({ "text": "Save", "classes": "govuk-!-margin-right-2" }) }} - Back to service settings + Back to service settings
        {% endcall %} diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html index 15ea7e6a1..3b28fb680 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -9,8 +9,8 @@ {% endblock %} {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( 'Before you request to go live', back_link=url_for('main.service_settings', service_id=current_service.id) @@ -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/contact_link.html b/app/templates/views/service-settings/send-files-by-email.html similarity index 63% rename from app/templates/views/service-settings/contact_link.html rename to app/templates/views/service-settings/send-files-by-email.html index d9e61582b..ca90dc03d 100644 --- a/app/templates/views/service-settings/contact_link.html +++ b/app/templates/views/service-settings/send-files-by-email.html @@ -7,20 +7,25 @@ {% from "components/form.html" import form_wrapper %} {% block service_page_title %} - {{ 'Change' if 'upload_document' in current_service.permissions else 'Add' }} contact details for ‘Download your document’ page + Send files by email {% endblock %} {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( - '{} contact details for ‘Download your document’ page'.format('Change' if 'upload_document' in current_service.permissions else 'Add'), + 'Send files by email', back_link=url_for('main.service_settings', service_id=current_service.id) ) }}

        - When you send users a document to download, you need to include the contact details for your service - on the download page. This is so users can contact you if there’s a problem (for example, - if the link to download the document has expired). + This is an API-only feature. +

        +

        + To send a file by email, follow the instructions in our API documentation. +

        +

        {% if contact_details %}Change contact details for{% else %}Add contact details to{% endif %} the file download page

        +

        + You need to include contact details for your service so your users can get in touch if there’s a problem. For example, if the link to download the file you sent them has expired.

        {% call form_wrapper() %} diff --git a/app/templates/views/service-settings/set-auth-type.html b/app/templates/views/service-settings/set-auth-type.html index 722f24bbe..de532137d 100644 --- a/app/templates/views/service-settings/set-auth-type.html +++ b/app/templates/views/service-settings/set-auth-type.html @@ -9,8 +9,8 @@ {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( 'Sign-in method', back_link=url_for('main.service_settings', service_id=current_service.id) @@ -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-email-branding.html b/app/templates/views/service-settings/set-email-branding.html index 6bcb3aebb..4de59364d 100644 --- a/app/templates/views/service-settings/set-email-branding.html +++ b/app/templates/views/service-settings/set-email-branding.html @@ -16,12 +16,12 @@ back_link=url_for('.service_settings', service_id=current_service.id) ) }} {% call form_wrapper(data_kwargs={'preview-type': 'email'}) %} -
        -
        +
        +
        -
        -
        +
        +
        {{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search branding styles by name') }} {{ radios(form.branding_style) }}
        diff --git a/app/templates/views/service-settings/set-email.html b/app/templates/views/service-settings/set-email.html index 390308094..988c417a9 100644 --- a/app/templates/views/service-settings/set-email.html +++ b/app/templates/views/service-settings/set-email.html @@ -10,8 +10,8 @@ {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( 'Send emails', back_link=url_for('main.service_settings', service_id=current_service.id) diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index 72a2cb743..112c8f683 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -9,8 +9,8 @@ {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( 'Receive text messages', back_link=url_for('main.service_settings', service_id=current_service.id) @@ -23,17 +23,17 @@ You can still send text messages from a sender name if you need to, but users will not be able to reply to those messages.

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

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

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

        {% endif %} {% else %}

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

        We’ll create a unique phone number for your service that they can reply to. diff --git a/app/templates/views/service-settings/set-international-sms.html b/app/templates/views/service-settings/set-international-sms.html index 8327c8b4d..460bb97b7 100644 --- a/app/templates/views/service-settings/set-international-sms.html +++ b/app/templates/views/service-settings/set-international-sms.html @@ -10,8 +10,8 @@ {% block maincolumn_content %} -

        -
        +
        +
        {{ page_header( 'Send international text messages', back_link=url_for('main.service_settings', service_id=current_service.id) @@ -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-branding.html b/app/templates/views/service-settings/set-letter-branding.html index 032906ded..455dcad65 100644 --- a/app/templates/views/service-settings/set-letter-branding.html +++ b/app/templates/views/service-settings/set-letter-branding.html @@ -16,12 +16,12 @@ back_link=url_for('.service_settings', service_id=current_service.id) ) }} {% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %} -
        -
        +
        +
        -
        -
        +
        +
        {{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search by name') }} {{ radios(form.branding_style, hide_legend=True) }}
        diff --git a/app/templates/views/service-settings/set-letter-contact-block.html b/app/templates/views/service-settings/set-letter-contact-block.html index c39064b2f..cc5c39f88 100644 --- a/app/templates/views/service-settings/set-letter-contact-block.html +++ b/app/templates/views/service-settings/set-letter-contact-block.html @@ -14,8 +14,8 @@ 'Letter contact details', back_link=None if request.args.get('from_template') else url_for('.service_settings', service_id=current_service.id) ) }} -
        - {% call form_wrapper(class="column-half") %} +
        + {% call form_wrapper(class="govuk-grid-column-one-half") %} {{ textbox( form.letter_contact_block, label='How should users contact your service?
        This applies to all the letters you send.'|safe, diff --git a/app/templates/views/service-settings/set-letter.html b/app/templates/views/service-settings/set-letter.html index 7d2f85c64..d5beffc9b 100644 --- a/app/templates/views/service-settings/set-letter.html +++ b/app/templates/views/service-settings/set-letter.html @@ -10,17 +10,17 @@ {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( 'Send letters', back_link=url_for('main.service_settings', service_id=current_service.id) ) }}

        - It costs between 30p and 76p to send a letter using Notify. + It costs between 35p and 81p 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-service-setting.html b/app/templates/views/service-settings/set-service-setting.html index d2aae4310..98cabfe20 100644 --- a/app/templates/views/service-settings/set-service-setting.html +++ b/app/templates/views/service-settings/set-service-setting.html @@ -10,8 +10,8 @@ {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( title, back_link=url_for('.service_settings', service_id=current_service.id) diff --git a/app/templates/views/service-settings/set-sms.html b/app/templates/views/service-settings/set-sms.html index ef7d62ecb..00606c6bd 100644 --- a/app/templates/views/service-settings/set-sms.html +++ b/app/templates/views/service-settings/set-sms.html @@ -10,8 +10,8 @@ {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( 'Send text messages', back_link=url_for('main.service_settings', service_id=current_service.id) @@ -26,7 +26,7 @@ after your free allowance.

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

        {% call form_wrapper() %} {{ radios(form.enabled) }} diff --git a/app/templates/views/service-settings/sms-senders.html b/app/templates/views/service-settings/sms-senders.html index e36003fc9..5c71309cd 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") }} @@ -43,8 +43,8 @@
        {% if current_user.has_permissions('manage_service') %} -
        -
        +
        +
        {{ govukButton({ "element": "a", "text": "Add text message sender", diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 66e379a32..2af85bbd9 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -12,19 +12,19 @@ {% block content %}
        -
        +
        -
        -
        +
        +

        Send emails, text messages and letters to your users

        @@ -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
        @@ -47,8 +47,8 @@
        -
        -
        +
        +

        Control your content

        @@ -57,14 +57,14 @@ text message or letter templates.

        -
        +
        -
        -
        +
        +

        See how your messages perform

        @@ -73,7 +73,7 @@ find out which ones are not being delivered.

        -
        +
        A screenshot of GOV.UK Notify showing counts of emails and text messages sent Send messages manually or automatically -
        -
        +
        +

        Upload a spreadsheet of email addresses or phone numbers and Notify sends the messages. @@ -96,7 +96,7 @@ alt="A screenshot of a spreadsheet with columns for email address, name and colour" >

        -
        +

        Integrate the GOV.UK Notify API with your web application or back office system. @@ -121,13 +121,13 @@

        Who’s using GOV.UK Notify

        -
        -
        +
        +

        Services

        {{ counts.services|format_thousands }}
        services
        -
        +

        Organisations

        {{ counts.organisations|format_thousands }}
        organisations @@ -135,43 +135,43 @@

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

        Pricing

        -
        -
        +
        +

        Emails

        Unlimited
        free emails
        -
        +

        Text messages

        Up to 250,000
        free text messages a year,
        then 1.58 pence per message
        -
        +

        Letters

        35 pence
        to print and post a one page letter
        -
        +

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

        -

        Find out more about pricing. +

        Find out more about pricing.

        -
        -
        +
        +

        The team

        @@ -180,11 +180,11 @@ 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.

        -
        +
        A photo of the GOV.UK Notify team gathered around a big screen. One team member is pointing at a graph on the screen. -
        +
        +
        {% if again %}

        You need to sign in again

        @@ -27,14 +27,14 @@

        Sign in

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

        {% endif %} {% call form_wrapper(autocomplete=True) %} {{ textbox(form.email_address, autocomplete='email') }} {{ textbox(form.password, autocomplete='current-password') }} - {{ page_footer("Continue", secondary_link=url_for('.forgot_password'), secondary_link_text="Forgot your password?") }} + {{ page_footer("Continue", secondary_link=url_for('.forgot_password'), secondary_link_text="Forgotten your password?") }} {% endcall %}
        diff --git a/app/templates/views/styleguide.html b/app/templates/views/styleguide.html index 430ffb399..b037610b7 100644 --- a/app/templates/views/styleguide.html +++ b/app/templates/views/styleguide.html @@ -16,16 +16,16 @@ {% block maincolumn_content %}

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

        - View source + View source

        Banner

        -
        -
        +
        +

        Used to show the status of a thing or action.

        {{ banner("You sent 1,234 text messages", with_tick=True) }} @@ -42,11 +42,11 @@

        Used to show some important statistics.

        -
        -
        +
        +
        {{ big_number("567") }}
        -
        +
        {{ big_number("2", "Messages delivered") }}
        @@ -109,8 +109,8 @@ ) }}

        Tables

        -
        -
        +
        +

        Used for comparing rows of data.

        @@ -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/ask-question-give-feedback.html b/app/templates/views/support/ask-question-give-feedback.html deleted file mode 100644 index 8aa8f92dc..000000000 --- a/app/templates/views/support/ask-question-give-feedback.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "withoutnav_template.html" %} -{% from "components/textbox.html" import textbox %} -{% from "components/page-footer.html" import sticky_page_footer %} -{% from "components/page-header.html" import page_header %} -{% from "components/form.html" import form_wrapper %} - -{% block per_page_title %} - Ask a question or give feedback -{% endblock %} - -{% block maincolumn_content %} - - {{ page_header( - 'Ask a question or give feedback', - back_link=url_for('.support') - ) }} -
        -
        - {% call form_wrapper() %} - {{ textbox(form.feedback, width='1-1', hint='', rows=10, autosize=True) }} - {% if not current_user.is_authenticated %} -

        Do you want a reply?

        -

        Leave your details below if you’d like a response.

        - {{ textbox(form.name, width='1-1') }} - {{ textbox(form.email_address, width='1-1') }} - {% else %} -

        We’ll reply to {{ current_user.email_address }}

        - {% endif %} - {{ sticky_page_footer('Send') }} - {% endcall %} -
        -
        - -{% endblock %} diff --git a/app/templates/views/support/bat-phone.html b/app/templates/views/support/bat-phone.html index 6a48c0d4b..41408a6d6 100644 --- a/app/templates/views/support/bat-phone.html +++ b/app/templates/views/support/bat-phone.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/page-header.html" import page_header %} {% block per_page_title %} Out of hours emergencies @@ -8,14 +9,15 @@ {% block maincolumn_content %} -

        - Out of hours emergencies -

        -
        -
        + {{ page_header( + 'Out of hours emergencies', + url_for('.support') + )}} +
        +

        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,12 +35,9 @@

        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 -

        diff --git a/app/templates/views/support/report-problem.html b/app/templates/views/support/form.html similarity index 64% rename from app/templates/views/support/report-problem.html rename to app/templates/views/support/form.html index 12f40e2c1..bf5e2c36a 100644 --- a/app/templates/views/support/report-problem.html +++ b/app/templates/views/support/form.html @@ -6,23 +6,25 @@ {% from "components/form.html" import form_wrapper %} {% block per_page_title %} - Report a problem + {{ page_title }} {% endblock %} {% block maincolumn_content %} {{ page_header( - 'Report a problem', - back_link=url_for('.support') + page_title, + back_link=back_link ) }} -
        -
        -
        -

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

        -
        +
        +
        + {% if show_status_page_banner %} +
        +

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

        +
        + {% endif %} {% call form_wrapper() %} {{ textbox(form.feedback, width='1-1', hint='', rows=10, autosize=True) }} {% if not current_user.is_authenticated %} diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index f6106e732..09dd8caba 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -9,23 +9,29 @@ {% block maincolumn_content %} -
        -
        +

        Support

        +

        We provide 24-hour online support for teams with a live service on GOV.UK Notify.

        -

        Support

        -

        We provide 24-hour online support for teams with a live service on GOV.UK Notify.

        - - {% call form_wrapper(class="bottom-gutter-2") %} + {% call form_wrapper() %} + {% if current_user.is_authenticated %} {{ radios(form.support_type) }} - {{ page_footer('Continue') }} - {% endcall %} + {% else %} +

        + What do you need help with? +

        + {{ radios(form.who, hide_legend=True) }} + {% endif %} + {{ 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.

        When you report a problem in office hours, we’ll aim to read it within 30 minutes and reply within one working day.

        - +

        Out-of-hours

        Outside office hours, response times depend on whether you’re reporting an emergency.

        If it’s an emergency, we’ll reply within 30 minutes and update you every hour until the problem’s fixed.

        diff --git a/app/templates/views/support/public.html b/app/templates/views/support/public.html new file mode 100644 index 000000000..711a08ccb --- /dev/null +++ b/app/templates/views/support/public.html @@ -0,0 +1,48 @@ +{% extends "withoutnav_template.html" %} + +{% from "components/page-header.html" import page_header %} + +{% block per_page_title %} + The GOV.UK Notify team can’t give advice to members of the public +{% endblock %} + +{% block maincolumn_content %} + +
        +
        + + {{ page_header( + 'The GOV.UK Notify service is for people who work in the government', + back_link=url_for('.support') + ) }} + +

        + We can’t give advice to the public. We don’t have access to information about you held by government departments. +

        + +

        + There are other pages on GOV.UK where you can get help: +

        + +

        + Coronavirus (COVID-19) +

        +

        + What you need to do +

        +

        + Contact the government +

        +

        + Ask about benefits, driving, transport, tax, and more +

        +

        + Avoid and report internet scams and phishing +

        +

        + Advice on suspicious emails and text messages +

        +
        +
        + +{% endblock %} diff --git a/app/templates/views/support/triage.html b/app/templates/views/support/triage.html index 9ca1fef04..9b32dd13c 100644 --- a/app/templates/views/support/triage.html +++ b/app/templates/views/support/triage.html @@ -5,15 +5,15 @@ {% from "components/form.html" import form_wrapper %} {% block per_page_title %} - Feedback + {{ page_title }} {% endblock %} {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( - 'Report a problem', + page_title, back_link=url_for('.support') ) }} {% call form_wrapper() %} diff --git a/app/templates/views/temp-history.html b/app/templates/views/temp-history.html index 0c1d79f76..11e9e9aff 100644 --- a/app/templates/views/temp-history.html +++ b/app/templates/views/temp-history.html @@ -32,8 +32,8 @@
          {% for event in events %}
        • -
          -
          +
          +
          {{ user_getter(event.user_id) }}
          @@ -41,7 +41,7 @@ {{ event.time|format_time }}
          -
          +
          {{ event }}
          • diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html index eecee2ece..97de4182f 100644 --- a/app/templates/views/templates/_template.html +++ b/app/templates/views/templates/_template.html @@ -1,7 +1,7 @@ {% from 'components/message-count-label.html' import message_count_label %} {% from "components/banner.html" import banner_wrapper %} -
          +
          {% if template._template.archived %}

          This template was deleted {{ template._template.updated_at|format_datetime_relative }}. @@ -14,7 +14,7 @@

          {% else %}
          -
          +
          {% if template.template_type == 'letter' %} {% if letter_too_long %} {% call banner_wrapper(type='dangerous') %} @@ -22,23 +22,23 @@ {% endcall %} {% endif %} {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) and not letter_too_long %} -
          - +
          + Send
          {% endif %} {% else %} {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %} -
          - +
          + Send
          {% endif %} {% if current_user.has_permissions('manage_templates') %} -
          - +
          + Edit
          @@ -48,17 +48,17 @@
          {% endif %}
          -
          +
          {% 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_history.html b/app/templates/views/templates/_template_history.html index 853a3b059..36e62a2d6 100644 --- a/app/templates/views/templates/_template_history.html +++ b/app/templates/views/templates/_template_history.html @@ -1,4 +1,4 @@ -
          +

          {{ template.name }}

          {% if template.get_raw('version', 1) > 1 %} @@ -11,6 +11,6 @@

          -
          +
          {{ template|string }}
          diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html index 03956452b..5bcb03501 100644 --- a/app/templates/views/templates/_template_list.html +++ b/app/templates/views/templates/_template_list.html @@ -34,16 +34,16 @@ {% endif %}

          {% for ancestor in item.ancestors %} - + {{- format_item_name(ancestor.name) -}} {% endfor %} {% if item.is_folder %} - + {{ format_item_name(item.name) }} {% else %} - + {{ format_item_name(item.name) }} {% endif %} diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html index 84bb59b8e..2496f204e 100644 --- a/app/templates/views/templates/action_blocked.html +++ b/app/templates/views/templates/action_blocked.html @@ -10,8 +10,8 @@ {% block maincolumn_content %} -
          -
          +
          +
          {{ page_header( '{} are disabled'.format(notification_type.capitalize()), back_link=back_link, @@ -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/add-template-folder.html b/app/templates/views/templates/add-template-folder.html deleted file mode 100644 index 81a816918..000000000 --- a/app/templates/views/templates/add-template-folder.html +++ /dev/null @@ -1,20 +0,0 @@ - -{% extends "withnav_template.html" %} -{% from "components/textbox.html" import textbox %} -{% from "components/page-footer.html" import page_footer %} -{% from "components/form.html" import form_wrapper %} - -{% block service_page_title %} - Add a folder -{% endblock %} - -{% block maincolumn_content %} - -

          Add a folder

          - - {% call form_wrapper() %} - {{ textbox(form.name) }} - {{ page_footer('Save') }} - {% endcall %} - -{% endblock %} diff --git a/app/templates/views/templates/add.html b/app/templates/views/templates/add.html deleted file mode 100644 index 923acfb63..000000000 --- a/app/templates/views/templates/add.html +++ /dev/null @@ -1,22 +0,0 @@ -{% from "components/radios.html" import radios %} -{% from "components/page-footer.html" import page_footer %} -{% from "components/form.html" import form_wrapper %} - -{% extends "withnav_template.html" %} - -{% block service_page_title %} - Add new template or folder -{% endblock %} - -{% block maincolumn_content %} - -

          What do you want to add?

          - - {% call form_wrapper() %} - {{ radios(form.template_type) }} - {{ page_footer( - 'Continue' - ) }} - {% endcall %} - -{% endblock %} diff --git a/app/templates/views/templates/breaking-change.html b/app/templates/views/templates/breaking-change.html index 4727b98dd..c954ae1aa 100644 --- a/app/templates/views/templates/breaking-change.html +++ b/app/templates/views/templates/breaking-change.html @@ -15,8 +15,8 @@ 'Confirm changes', back_link=url_for(".edit_service_template", service_id=current_service.id, template_id=new_template.id) ) }} -
          -
          +
          +
          {% if template_change.placeholders_removed %}

          You removed {{ list_of_placeholders(template_change.placeholders_removed) }} diff --git a/app/templates/views/templates/choose-reply.html b/app/templates/views/templates/choose-reply.html index fa1681cef..df64e9b98 100644 --- a/app/templates/views/templates/choose-reply.html +++ b/app/templates/views/templates/choose-reply.html @@ -35,23 +35,23 @@ {% else %} - {{ live_search(target_selector='#template-list .column-whole', show=True, form=search_form) }} + {{ live_search(target_selector='#template-list .govuk-grid-column-full', show=True, form=search_form) }}

        @@ -32,14 +32,14 @@
        • send all the messages you pass to us, as long as they meet our guidelines
        • - show how Notify is performing (through our performance and status pages) + show how Notify is performing (through our performance and status pages)
          • -
        • keep your data secure
          • +
        • keep your data secure
        • give you one month’s notice by email if we change our terms of use or delivery providers

        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/text-not-received.html b/app/templates/views/text-not-received.html index 56a4a2aa4..10e7d9faa 100644 --- a/app/templates/views/text-not-received.html +++ b/app/templates/views/text-not-received.html @@ -9,8 +9,8 @@ Check your mobile number {% block maincolumn_content %} -
        -
        +
        +

        Check your mobile number

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

        diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 316bc3b30..4a83f3ebd 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/two-factor-email.html b/app/templates/views/two-factor-email.html index 105f66351..7fd935b66 100644 --- a/app/templates/views/two-factor-email.html +++ b/app/templates/views/two-factor-email.html @@ -7,8 +7,8 @@ {% block maincolumn_content %} -
        -
        +
        +

        {{ title }}

        We’ve emailed you a link to sign in to Notify.

        Clicking the link will open Notify in a new browser window, so you can close this one.

        diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html index 1a5faaadc..439e1ee1f 100644 --- a/app/templates/views/two-factor.html +++ b/app/templates/views/two-factor.html @@ -10,8 +10,8 @@ {% block maincolumn_content %} -
        -
        +
        +

        Check your phone

        We’ve sent you a text message with a security code.

        diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 3897a6019..8511053e8 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -8,8 +8,8 @@ {% endblock %} {% block maincolumn_content %} -
        -
        +
        +
        {% if error %} {% call banner_wrapper(type='dangerous') %}

        {{ error.title }}

        @@ -22,6 +22,8 @@ 'Upload a letter', back_link=url_for('main.uploads', service_id=current_service.id) ) }} +

        Upload a single letter as a PDF and we’ll print, pack and post it for you.

        +

        You can use this feature if you send a lot of one-off letters or if our reusable letter templates do not meet your needs.

        {% endif %}

        @@ -32,9 +34,21 @@ show_errors=False )}}

        -

        You can upload a single letter as a PDF.

        -

        Your file must meet our letter specification.

        +

        Your file must meet our letter specification

        + +

        The content of your letter must appear inside the printable area.

        + +

        Your file must be:

        + +
          +
        • a PDF
          • +
        • A4 portrait size (210 × 297 mm)
          • +
        • 10 pages or less
          • +
        • smaller than 2MB
          • +
        + +

        To help you set up your letter, you can download our letter specification document (PDF).

        {% endblock %} diff --git a/app/templates/views/uploads/contact-list/column-errors.html b/app/templates/views/uploads/contact-list/column-errors.html new file mode 100644 index 000000000..34dd9b13e --- /dev/null +++ b/app/templates/views/uploads/contact-list/column-errors.html @@ -0,0 +1,91 @@ +{% extends "withnav_template.html" %} +{% from "components/banner.html" import banner_wrapper %} +{% from "components/radios.html" import radio_select %} +{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} +{% from "components/file-upload.html" import file_upload %} +{% from "components/back-link/macro.njk" import govukBackLink %} +{% from "components/message-count-label.html" import message_count_label, recipient_count_label %} + +{% set file_contents_header_id = 'file-preview' %} +{% macro skip_to_file_contents() %} +

        + Skip to file contents +

        +{% endmacro %} + +{% block service_page_title %} + Error +{% endblock %} + +{% block maincolumn_content %} + + {{ govukBackLink({ "href": url_for('main.upload_contact_list', service_id=current_service.id) }) }} + +
        + {% call banner_wrapper(type='dangerous') %} + + {% if recipients.too_many_rows %} + +

        + Your file has too many rows +

        +

        + Notify can store files up to + {{ "{:,}".format(recipients.max_rows) }} rows in size. Your + file has {{ "{:,}".format(recipients|length) }} rows. +

        + + {% elif not recipients.allowed_to_send_to %} + +

        + You cannot save + {{ 'this' if recipients|length == 1 else 'these' }} + {{ recipient_count_label(recipients|length, recipients.template_type) }} +

        +

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

        + + {% endif %} + + {{ skip_to_file_contents() }} + + {% endcall %} +
        + + +
        +
        + {{ file_upload( + form.file, + action=url_for('.upload_contact_list', service_id=current_service.id), + button_text='Upload your file again' + ) }} +
        + Back to top +
        + +

        {{ original_file_name }}

        + + {% call(item, row_number) list_table( + recipients.displayed_rows, + caption=original_file_name, + caption_visible=False, + field_headings=[ + 'Row in file '|safe + ] + recipients.column_headers + ) %} + {{ index_field(item.index + 2) }} + {% for column in recipients.column_headers %} + {{ text_field(item[column].data or '') }} + {% endfor %} + {% endcall %} + + {% if recipients.displayed_rows|list|length < recipients|length %} +

        + Only showing the first {{ recipients.displayed_rows|list|length }} rows +

        + {% endif %} + +{% endblock %} diff --git a/app/templates/views/uploads/contact-list/contact-list.html b/app/templates/views/uploads/contact-list/contact-list.html new file mode 100644 index 000000000..50c0cef79 --- /dev/null +++ b/app/templates/views/uploads/contact-list/contact-list.html @@ -0,0 +1,48 @@ +{% extends "withnav_template.html" %} +{% from "components/banner.html" import banner_wrapper %} +{% from "components/radios.html" import radio_select %} +{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} +{% from "components/page-header.html" import page_header %} +{% from "components/message-count-label.html" import message_count_label, recipient_count_label %} +{% from "components/button/macro.njk" import govukButton %} + +{% block service_page_title %} + {{ contact_list.original_file_name }} +{% endblock %} + +{% block maincolumn_content %} + + {{ page_header( + contact_list.original_file_name, + back_link=url_for('main.uploads', service_id=current_service.id) + ) }} + +

        + Uploaded by {{ contact_list.created_by }} {{ contact_list.created_at|format_datetime_human }} +

        + +

        + Download this list  + {{ contact_list.recipients|length|format_thousands }} + {{ recipient_count_label(contact_list.recipients|length, contact_list.recipients.template_type) }} +

        + + {% set recipient_column = contact_list.recipients.column_headers[0] %} + + {% call(item, row_number) list_table( + contact_list.recipients.displayed_rows, + caption=recipient_count_label(contact_list.recipients|length, contact_list.template_type)|capitalize, + caption_visible=False, + field_headings=['1', recipient_column], + ) %} + {{ index_field(row_number) }} + {{ text_field(item[recipient_column].data) }} + {% endcall %} + + {% if contact_list.recipients.displayed_rows|list|length < contact_list.recipients|length %} +

        + Only showing the first {{ contact_list.recipients.displayed_rows|list|length }} rows +

        + {% endif %} + +{% endblock %} diff --git a/app/templates/views/uploads/contact-list/ok.html b/app/templates/views/uploads/contact-list/ok.html new file mode 100644 index 000000000..0dfa68a4a --- /dev/null +++ b/app/templates/views/uploads/contact-list/ok.html @@ -0,0 +1,70 @@ +{% extends "withnav_template.html" %} +{% from "components/banner.html" import banner_wrapper %} +{% from "components/radios.html" import radio_select %} +{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} +{% from "components/page-header.html" import page_header %} +{% from "components/message-count-label.html" import message_count_label, recipient_count_label %} +{% from "components/button/macro.njk" import govukButton %} + +{% set file_contents_header_id = 'file-preview' %} +{% macro skip_to_file_contents() %} +

        + Skip to file contents +

        +{% endmacro %} + +{% block service_page_title %} + {{ original_file_name }} +{% endblock %} + +{% block maincolumn_content %} + + {{ page_header( + original_file_name, + back_link=url_for('main.upload_contact_list', service_id=current_service.id) + ) }} + +

        + {{ recipients|length|format_thousands }} {{ recipient_count_label(recipients|length, recipients.template_type) }} found +

        + +
        +
        + + {{ govukButton({ "text": "Save contact list" }) }} +
        +
        + +

        + File preview +

        + {% call(item, row_number) list_table( + recipients.displayed_rows, + caption=original_file_name, + caption_visible=False, + field_headings=[ + 'Row in file '|safe + ] + recipients.column_headers + ) %} + {{ index_field(item.index + 2) }} + {% for column in recipients.column_headers %} + {% if item[column].ignore %} + {{ text_field(item[column].data or '', status='default') }} + {% else %} + {{ text_field(item[column].data or '') }} + {% endif %} + {% endfor %} + {% if item[None].data %} + {% for column in item[None].data %} + {{ text_field(column, status='default') }} + {% endfor %} + {% endif %} + {% endcall %} + + {% if recipients.displayed_rows|list|length < recipients|length %} +

        + Only showing the first {{ recipients.displayed_rows|list|length }} rows +

        + {% endif %} + +{% endblock %} diff --git a/app/templates/views/uploads/contact-list/row-errors.html b/app/templates/views/uploads/contact-list/row-errors.html new file mode 100644 index 000000000..c164a5ad1 --- /dev/null +++ b/app/templates/views/uploads/contact-list/row-errors.html @@ -0,0 +1,108 @@ +{% extends "withnav_template.html" %} +{% from "components/banner.html" import banner_wrapper %} +{% from "components/radios.html" import radio_select %} +{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} +{% from "components/file-upload.html" import file_upload %} +{% from "components/back-link/macro.njk" import govukBackLink %} +{% from "components/message-count-label.html" import message_count_label %} + +{% set file_contents_header_id = 'file-preview' %} +{% macro skip_to_file_contents() %} +

        + Skip to file contents +

        +{% endmacro %} + +{% block service_page_title %} + Error +{% endblock %} + +{% block maincolumn_content %} + + {{ govukBackLink({ "href": url_for('main.upload_contact_list', service_id=current_service.id) }) }} + +
        + {% call banner_wrapper(type='dangerous') %} + {% if row_errors|length == 1 %} +

        + There’s a problem with {{ original_file_name }} +

        +

        + You need to {{ row_errors[0] }}. +

        + {% else %} +

        + There are some problems with {{ original_file_name }} +

        +

        + You need to: +

        +
          + {% for error in row_errors %} +
        • {{ error }}
          • + {% endfor %} +
        + {% endif %} + {{ skip_to_file_contents() }} + {% endcall %} +
        + +
        +
        + {{ file_upload( + form.file, + action=url_for('.upload_contact_list', service_id=current_service.id), + button_text='Upload your file again' + ) }} +
        + Back to top +
        + + {% call(item, row_number) list_table( + recipients.displayed_rows, + caption=original_file_name, + caption_visible=False, + field_headings=[ + 'Row in file '|safe + ] + recipients.column_headers + ) %} + {% call index_field() %} + + {{ item.index + 2 }} + + {% endcall %} + {% for column in recipients.column_headers %} + {% if item[column].error and not recipients.missing_column_headers %} + {% call field() %} + + {{ item[column].error }} + {{ item[column].data if item[column].data != None }} + + {% endcall %} + {% elif item[column].ignore %} + {{ text_field(item[column].data or '', status='default') }} + {% else %} + {{ text_field(item[column].data or '') }} + {% endif %} + {% endfor %} + {% if item[None].data %} + {% for column in item[None].data %} + {{ text_field(column, status='default') }} + {% endfor %} + {% endif %} + {% endcall %} + + {% if recipients.displayed_rows|list|length < recipients|length %} + {% if recipients.displayed_rows|list|length < recipients.rows_with_errors|list|length %} +

        + Only showing the first {{ recipients.displayed_rows|list|length }} rows with errors +

        + {% else %} +

        + Only showing rows with errors +

        + {% endif %} + {% endif %} + + +{% endblock %} diff --git a/app/templates/views/uploads/contact-list/too-many-columns.html b/app/templates/views/uploads/contact-list/too-many-columns.html new file mode 100644 index 000000000..41ea59a86 --- /dev/null +++ b/app/templates/views/uploads/contact-list/too-many-columns.html @@ -0,0 +1,112 @@ +{% extends "withnav_template.html" %} +{% from "components/banner.html" import banner_wrapper %} +{% from "components/radios.html" import radio_select %} +{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} +{% from "components/file-upload.html" import file_upload %} +{% from "components/back-link/macro.njk" import govukBackLink %} +{% from "components/message-count-label.html" import message_count_label %} + +{% set file_contents_header_id = 'file-preview' %} +{% macro skip_to_file_contents() %} +

        + Skip to file contents +

        +{% endmacro %} + +{% block service_page_title %} + Error +{% endblock %} + +{% block maincolumn_content %} + + {{ govukBackLink({ "href": url_for('main.upload_contact_list', service_id=current_service.id) }) }} + +
        + {% call banner_wrapper(type='dangerous') %} + + {% if not recipients|length %} + +

        + Your file is missing some rows +

        +

        + It needs at least one row of data + {%- if template_type %}.{% else %}, in a column called ‘email address’ or ‘phone number’.{% endif %} +

        + + {% elif recipients.column_headers|length == 1 %} + +

        + Your file needs a column called ‘email address’ or ‘phone number’. +

        +

        + Right now it has 1 column called ‘{{ recipients._raw_column_headers[0] }}’. +

        + + {% else %} + +

        + Your file has too many columns +

        +

        + It needs to have 1 column, called ‘email address’ or ‘phone number’. +

        +

        + Right now it has {{ recipients._raw_column_headers|length }} columns called {{ recipients._raw_column_headers | formatted_list }}. +

        + + {% endif %} + + {{ skip_to_file_contents() }} + + {% endcall %} +
        + + +
        +
        + {{ file_upload( + form.file, + action=url_for('.upload_contact_list', service_id=current_service.id), + button_text='Upload your file again' + ) }} +
        + Back to top +
        + + {% set column_headers = recipients._raw_column_headers if recipients.duplicate_recipient_column_headers else recipients.column_headers %} + +

        {{ original_file_name }}

        + +
        + {% call(item, row_number) list_table( + recipients.displayed_rows, + caption=original_file_name, + caption_visible=False, + field_headings=[ + 'Row in file '|safe + ] + recipients._raw_column_headers + ) %} + {{ index_field(item.index + 2) }} + {% for column in column_headers %} + {% if item[column].ignore %} + {{ text_field(item[column].data or '', status='default') }} + {% else %} + {{ text_field(item[column].data or '') }} + {% endif %} + {% endfor %} + {% if item[None].data %} + {% for column in item[None].data %} + {{ text_field(column, status='default') }} + {% endfor %} + {% endif %} + {% endcall %} +
        + + {% if recipients.displayed_rows|list|length < recipients|length %} +

        + Only showing the first {{ recipients.displayed_rows|list|length }} rows +

        + {% endif %} + +{% endblock %} diff --git a/app/templates/views/uploads/contact-list/upload.html b/app/templates/views/uploads/contact-list/upload.html new file mode 100644 index 000000000..265b366b5 --- /dev/null +++ b/app/templates/views/uploads/contact-list/upload.html @@ -0,0 +1,91 @@ +{% extends "withnav_template.html" %} +{% from "components/banner.html" import banner_wrapper %} +{% from "components/file-upload.html" import file_upload %} +{% from "components/page-header.html" import page_header %} +{% from "components/table.html" import list_table, text_field, index_field, index_field_heading %} + +{% block service_page_title %} + Upload an emergency contact list +{% endblock %} + +{% block maincolumn_content %} + {% if error %} + {% call banner_wrapper(type='dangerous') %} +

        {{ error.title }}

        + {% if error.detail %} +

        {{ error.detail | safe }}

        + {% endif %} + {% endcall %} + {% else %} + {{ page_header( + 'Upload an emergency contact list', + back_link=url_for('main.uploads', service_id=current_service.id) + ) }} +

        + Save a list of staff email addresses or phone numbers in Notify. +

        +

        + In an emergency, you can send a message to everyone on the list. +

        +

        + Do not include contact details for members of the public. +

        + {% endif %} + +
        + {{ file_upload( + form.file, + button_text='Upload your file again' if error else 'Choose file', + show_errors=False + )}} +
        + +

        Your file needs to look like one of these examples

        + +

        + Save your file as a + CSV, + TSV, + ODS, + or Microsoft Excel spreadsheet +

        + +
        +
        +
        + {% call(item, row_number) list_table( + [ + ['email address'], + ['test@example.gov.uk'], + ], + caption="Example", + caption_visible=False, + field_headings=['', 'A'] + ) %} + {{ index_field(row_number - 1) }} + {% for column in item %} + {{ text_field(column) }} + {% endfor %} + {% endcall %} +
        +
        +
        +
        + {% call(item, row_number) list_table( + [ + ['phone number'], + ['07700 900123'], + ], + caption="Example", + caption_visible=False, + field_headings=['', 'A'] + ) %} + {{ index_field(row_number - 1) }} + {% for column in item %} + {{ text_field(column) }} + {% endfor %} + {% endcall %} +
        +
        +
        +{% endblock %} diff --git a/app/templates/views/uploads/preview.html b/app/templates/views/uploads/preview.html index 718cf8c6d..05e70e5a8 100644 --- a/app/templates/views/uploads/preview.html +++ b/app/templates/views/uploads/preview.html @@ -24,7 +24,7 @@ button_text='Upload your file again' ) }}
        - Back to top + Back to top
        {% elif current_service.trial_mode %} diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index 294d25dfd..1517e2790 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -17,15 +17,15 @@ {{ pill(years, selected_year, big_number_args={'smallest': True}) }}
        -
        -
        +
        +

        Emails

        {{ big_number(emails_sent, 'sent', smaller=True) }} {{ big_number("Unlimited", 'free allowance', smaller=True) }}
        -
        +

        Text messages

        {{ big_number(sms_sent, 'sent', smaller=True) }} @@ -40,7 +40,7 @@ {% endif %}
        -
        +

        Letters

        {{ big_number(letter_sent, 'sent', smaller=True) }} @@ -48,13 +48,13 @@
        -
        -
        +
        +
         
        -
        +
        {{ big_number( (sms_chargeable * sms_rate), @@ -64,7 +64,7 @@ ) }}
        -
        +
        {{ big_number( letter_cost, @@ -123,16 +123,16 @@ {% endif %}
        -
        -
        +
        +

        Financial year ends 31 March

        -
        +

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

        diff --git a/app/templates/views/user-profile/authenticate.html b/app/templates/views/user-profile/authenticate.html index a4cdfb759..3bd678fc2 100644 --- a/app/templates/views/user-profile/authenticate.html +++ b/app/templates/views/user-profile/authenticate.html @@ -15,8 +15,8 @@ back_link=back_link ) }} -
        -
        +
        +
        {% call form_wrapper(autocomplete=True) %} {{ textbox(form.password, autocomplete='current-password') }} diff --git a/app/templates/views/user-profile/change-password.html b/app/templates/views/user-profile/change-password.html index 68e50d911..f0143640f 100644 --- a/app/templates/views/user-profile/change-password.html +++ b/app/templates/views/user-profile/change-password.html @@ -15,8 +15,8 @@ back_link=url_for('.user_profile') ) }} -
        -
        +
        +
        {% call form_wrapper(autocomplete=True) %} {{ textbox(form.old_password) }} {{ textbox(form.new_password) }} diff --git a/app/templates/views/user-profile/change.html b/app/templates/views/user-profile/change.html index 23ac0af83..80ba1c4bb 100644 --- a/app/templates/views/user-profile/change.html +++ b/app/templates/views/user-profile/change.html @@ -15,8 +15,8 @@ back_link=url_for('.user_profile') ) }} -
        -
        +
        +
        {% call form_wrapper() %} {{ textbox(form_field, safe_error_message=True) }} {{ page_footer('Save') }} diff --git a/app/templates/views/user-profile/confirm.html b/app/templates/views/user-profile/confirm.html index a0adea2f6..f1d6e4c1b 100644 --- a/app/templates/views/user-profile/confirm.html +++ b/app/templates/views/user-profile/confirm.html @@ -15,8 +15,8 @@ back_link=url_for('.user_profile') ) }} -
        -
        +
        +

        We’ve sent a security code to your new {{ thing }}.

        diff --git a/app/templates/views/user-profile/disable-platform-admin-view.html b/app/templates/views/user-profile/disable-platform-admin-view.html index 334de0b13..48ba6d1d5 100644 --- a/app/templates/views/user-profile/disable-platform-admin-view.html +++ b/app/templates/views/user-profile/disable-platform-admin-view.html @@ -10,8 +10,8 @@ {% block maincolumn_content %} -
        -
        +
        +
        {{ page_header( 'Use platform admin view', back_link=url_for('.user_profile') diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index f986accf4..d053122f4 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -7,11 +7,11 @@ {% block maincolumn_content %} -
        -
        +
        +
        {{ sub_navigation(navigation_links) }}
        -
        +

        Using Notify

        @@ -19,11 +19,11 @@

        Find out more about: