From 8fb9668775da1b124e634c98a212349317649980 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 12 Feb 2020 14:13:50 +0000 Subject: [PATCH 01/11] Add letter specification guidance Add letter specification information to the guidance --- .../views/guidance/upload-a-letter.html | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html index 1e7921fd7..f4a3d5950 100644 --- a/app/templates/views/guidance/upload-a-letter.html +++ b/app/templates/views/guidance/upload-a-letter.html @@ -21,8 +21,25 @@
  • Select Choose file.
    • -

    Use the letter specification document to help you set up your letter.

    +

    Letter specification

    +

    Your file must be:

    + + + +

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

    + +

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

    + + {% endblock %} From 600cc49345a124a149292ad68cc2af53589a1ded Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 12 Feb 2020 14:22:25 +0000 Subject: [PATCH 02/11] Add link to guidance --- app/templates/views/uploads/choose-file.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 70adde281..cfe567c38 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -33,8 +33,7 @@ )}}

    You can upload a single letter as a PDF.

    -

    Your file must meet our letter specification.

    -

    To help you set up your letter you can download a Word document template.

    +

    Your file must meet our letter specification.

    From 15aa876f4cb4b7ffbd137ad261f4f1855a69f022 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 12 Feb 2020 14:23:53 +0000 Subject: [PATCH 03/11] Add anchor --- app/templates/views/guidance/upload-a-letter.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html index f4a3d5950..7d62565bb 100644 --- a/app/templates/views/guidance/upload-a-letter.html +++ b/app/templates/views/guidance/upload-a-letter.html @@ -21,7 +21,7 @@
  • Select Choose file.
    • -

    Letter specification

    +

    Letter specification

    Your file must be:

    From e27b58524f2401ec95582909b8b7f9207ce34b7d Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 12 Feb 2020 14:24:49 +0000 Subject: [PATCH 04/11] Add anchor to link --- app/templates/views/uploads/choose-file.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index cfe567c38..3897a6019 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -33,7 +33,7 @@ )}}

    You can upload a single letter as a PDF.

    -

    Your file must meet our letter specification.

    +

    Your file must meet our letter specification.

    From ce553317c6920c6b7d6e9e96b2fe822472cbdedd Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 12 Feb 2020 15:01:17 +0000 Subject: [PATCH 05/11] Remove file types Remove file types from links while I check the GOV.UK style guide --- app/templates/views/guidance/upload-a-letter.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html index 7d62565bb..13ac6fd62 100644 --- a/app/templates/views/guidance/upload-a-letter.html +++ b/app/templates/views/guidance/upload-a-letter.html @@ -37,8 +37,8 @@

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

    From 29c5412a8dcc2aac748ea81d78dc420a6381f56d Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 13 Feb 2020 13:06:54 +0000 Subject: [PATCH 06/11] Add filetypes to links --- app/templates/views/guidance/upload-a-letter.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html index 13ac6fd62..7d62565bb 100644 --- a/app/templates/views/guidance/upload-a-letter.html +++ b/app/templates/views/guidance/upload-a-letter.html @@ -37,8 +37,8 @@

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

    From 90462d7c712087b5c41df0646fd4741574205625 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 13 Feb 2020 14:58:53 +0000 Subject: [PATCH 07/11] Update link to Letter specification guidance --- app/utils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/utils.py b/app/utils.py index 29154c7b6..d34af4a69 100644 --- a/app/utils.py +++ b/app/utils.py @@ -571,22 +571,22 @@ LETTER_VALIDATION_MESSAGES = { 'title': 'Your letter is not A4 portrait size', 'detail': ( 'You need to change the size or orientation of {invalid_pages}.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), 'summary': ( 'Validation failed because {invalid_pages} {invalid_pages_are_or_is} not A4 portrait size.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), }, 'content-outside-printable-area': { 'title': 'Your content is outside the printable area', 'detail': ( 'You need to edit {invalid_pages}.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), 'summary': ( 'Validation failed because content is outside the printable area on {invalid_pages}.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), }, 'letter-too-long': { @@ -618,11 +618,11 @@ LETTER_VALIDATION_MESSAGES = { 'title': 'The address block is empty', 'detail': ( 'You need to add a recipient address.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), 'summary': ( 'Validation failed because the address block is empty.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), } } From fadf29c9b0d1dab42c9e2175bfeb56c2fd240047 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 13 Feb 2020 15:08:40 +0000 Subject: [PATCH 08/11] Fix API validation error summary links --- app/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/utils.py b/app/utils.py index d34af4a69..86bdb9f2b 100644 --- a/app/utils.py +++ b/app/utils.py @@ -575,7 +575,7 @@ LETTER_VALIDATION_MESSAGES = { ), 'summary': ( 'Validation failed because {invalid_pages} {invalid_pages_are_or_is} not A4 portrait size.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), }, 'content-outside-printable-area': { @@ -586,7 +586,7 @@ LETTER_VALIDATION_MESSAGES = { ), 'summary': ( 'Validation failed because content is outside the printable area on {invalid_pages}.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), }, 'letter-too-long': { @@ -622,7 +622,7 @@ LETTER_VALIDATION_MESSAGES = { ), 'summary': ( 'Validation failed because the address block is empty.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), } } From 8a0a9666d7d5b7c957e7363a19bd5d61f12c471e Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 13 Feb 2020 15:50:22 +0000 Subject: [PATCH 09/11] Update links --- app/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/utils.py b/app/utils.py index 86bdb9f2b..f0c27d6b0 100644 --- a/app/utils.py +++ b/app/utils.py @@ -571,7 +571,7 @@ LETTER_VALIDATION_MESSAGES = { 'title': 'Your letter is not A4 portrait size', 'detail': ( 'You need to change the size or orientation of {invalid_pages}.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), 'summary': ( 'Validation failed because {invalid_pages} {invalid_pages_are_or_is} not A4 portrait size.
    ' @@ -582,7 +582,7 @@ LETTER_VALIDATION_MESSAGES = { 'title': 'Your content is outside the printable area', 'detail': ( 'You need to edit {invalid_pages}.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), 'summary': ( 'Validation failed because content is outside the printable area on {invalid_pages}.
    ' @@ -618,7 +618,7 @@ LETTER_VALIDATION_MESSAGES = { 'title': 'The address block is empty', 'detail': ( 'You need to add a recipient address.
    ' - 'Files must meet our letter specification.' + 'Files must meet our letter specification.' ), 'summary': ( 'Validation failed because the address block is empty.
    ' From 10e0c3900111de871dbd669cee6bbb9123e24a14 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 13 Feb 2020 15:53:03 +0000 Subject: [PATCH 10/11] Add reference for letter_spec_guidance --- app/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/utils.py b/app/utils.py index f0c27d6b0..535925dc6 100644 --- a/app/utils.py +++ b/app/utils.py @@ -650,7 +650,8 @@ def get_letter_validation_error(validation_message, invalid_pages=None, page_cou invalid_pages=invalid_pages, invalid_pages_are_or_is=invalid_pages_are_or_is, page_count=page_count, - letter_spec=url_for('.letter_spec'), + letter_spec=url_for('.letter_spec') + letter_spec_guidance=url_for('.letter_spec_guidance'), ), 'summary': LETTER_VALIDATION_MESSAGES[validation_message]['summary'].format( invalid_pages=invalid_pages, From f425fe75cf3d4a4f6d9aa1f910e480348c53000e Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 13 Feb 2020 16:14:11 +0000 Subject: [PATCH 11/11] Update link in error messages for uploaded letters --- app/utils.py | 3 +-- tests/app/test_utils.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/utils.py b/app/utils.py index 535925dc6..54de4903d 100644 --- a/app/utils.py +++ b/app/utils.py @@ -650,8 +650,7 @@ def get_letter_validation_error(validation_message, invalid_pages=None, page_cou invalid_pages=invalid_pages, invalid_pages_are_or_is=invalid_pages_are_or_is, page_count=page_count, - letter_spec=url_for('.letter_spec') - letter_spec_guidance=url_for('.letter_spec_guidance'), + letter_spec_guidance=url_for('.upload_a_letter') ), 'summary': LETTER_VALIDATION_MESSAGES[validation_message]['summary'].format( invalid_pages=invalid_pages, diff --git a/tests/app/test_utils.py b/tests/app/test_utils.py index e04a44fa8..4de340324 100644 --- a/tests/app/test_utils.py +++ b/tests/app/test_utils.py @@ -499,7 +499,7 @@ def test_get_letter_validation_error_for_known_errors( assert detail.text == expected_content if detail.select_one('a'): - assert detail.select_one('a')['href'] == url_for('.letter_spec') + assert detail.select_one('a')['href'] == url_for('.upload_a_letter') assert detail.select_one('a')['target'] == '_blank' assert summary.text == expected_summary