From d92809ac475541137d43d7bd4d65ecc2163ef492 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 19 Feb 2020 08:38:08 +0000 Subject: [PATCH 01/10] Change layout and add placeholder content --- app/templates/views/uploads/choose-file.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 897926997..6f85310e6 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -22,6 +22,7 @@ 'Upload a letter', back_link=url_for('main.uploads', service_id=current_service.id) ) }} +

If a reusable letter template does not meet your needs, you can upload and send a one-off letter instead.

{% endif %}

@@ -32,9 +33,10 @@ show_errors=False )}}

+ +

Your file must meet our letter specification TBC

You can upload a single letter as a PDF.

Your file must meet our letter specification.

- {% endblock %} From a3519bb331a448320f738df99f6efe18c4c05fcc Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 19 Feb 2020 08:41:11 +0000 Subject: [PATCH 02/10] Update placeholder content --- app/templates/views/uploads/choose-file.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 6f85310e6..cac740f7a 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -22,7 +22,8 @@ 'Upload a letter', back_link=url_for('main.uploads', service_id=current_service.id) ) }} -

If a reusable letter template does not meet your needs, you can upload and send a one-off letter instead.

+

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 %}

From 82f94724407374e945b326a7162f5a92632cd883 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 19 Feb 2020 08:49:36 +0000 Subject: [PATCH 03/10] Update page title and H1 --- app/templates/views/uploads/choose-file.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index cac740f7a..5da01b501 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -4,7 +4,7 @@ {% from "components/page-header.html" import page_header %} {% block service_page_title %} - Upload a letter + Upload a one-off letter {% endblock %} {% block maincolumn_content %} @@ -19,10 +19,10 @@ {% endcall %} {% else %} {{ page_header( - 'Upload a letter', + 'Upload a one-off 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.

+

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 %} From c7c24f5f8c80d5822d4f21493d7762127d32888f Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 19 Feb 2020 09:59:13 +0000 Subject: [PATCH 04/10] Replace upload a letter content Replace upload a letter content with a more generic description. --- app/templates/views/dashboard/_jobs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html index 3d4c9bba4..4171b5c3e 100644 --- a/app/templates/views/dashboard/_jobs.html +++ b/app/templates/views/dashboard/_jobs.html @@ -7,7 +7,7 @@ caption="Recent files uploaded", caption_visible=False, empty_message=( - 'Upload a letter and Notify will print, pack and post it for you.' if current_service.can_upload_letters else 'You have not uploaded any files yet' + 'You have not yet uploaded any files yet.' ), field_headings=[ 'File', From 6f3cf91f1bac1928b2d8a3f80815095599f93920 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 19 Feb 2020 10:15:45 +0000 Subject: [PATCH 05/10] Update content so it matches 3302 Update content so it matches the changes originally made in https://github.com/alphagov/notifications-admin/pull/3302 --- app/templates/views/guidance/upload-a-letter.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html index 8211c3de4..9f0aae798 100644 --- a/app/templates/views/guidance/upload-a-letter.html +++ b/app/templates/views/guidance/upload-a-letter.html @@ -1,5 +1,6 @@ {% extends "content_template.html" %} {% from "components/service-link.html" import service_link %} +>>>>>>> Update content so it matches 3302 {% block per_page_title %} Upload a letter From 1fd0ead7e52cdcf13c25a540f04eaf1660670585 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 27 Feb 2020 12:17:00 +0000 Subject: [PATCH 06/10] Update formatting --- app/templates/views/guidance/upload-a-letter.html | 1 - 1 file changed, 1 deletion(-) diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html index 9f0aae798..8211c3de4 100644 --- a/app/templates/views/guidance/upload-a-letter.html +++ b/app/templates/views/guidance/upload-a-letter.html @@ -1,6 +1,5 @@ {% extends "content_template.html" %} {% from "components/service-link.html" import service_link %} ->>>>>>> Update content so it matches 3302 {% block per_page_title %} Upload a letter From fdf07eb9c547addf161ca6197d885f243bda8dde Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 27 Feb 2020 12:28:42 +0000 Subject: [PATCH 07/10] Update content --- app/templates/views/uploads/choose-file.html | 21 +++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 5da01b501..54e3ec0b0 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -4,7 +4,7 @@ {% from "components/page-header.html" import page_header %} {% block service_page_title %} - Upload a one-off letter + Upload a letter {% endblock %} {% block maincolumn_content %} @@ -19,7 +19,7 @@ {% endcall %} {% else %} {{ page_header( - 'Upload a one-off letter', + '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.

@@ -35,9 +35,20 @@ )}}

-

Your file must meet our letter specification TBC

-

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 %} From 117c18d3cfb0a6fe6af8444ff6a74b9a049d5089 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 27 Feb 2020 14:10:19 +0000 Subject: [PATCH 08/10] Update guidance --- .../views/guidance/upload-a-letter.html | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html index 8211c3de4..2965e2961 100644 --- a/app/templates/views/guidance/upload-a-letter.html +++ b/app/templates/views/guidance/upload-a-letter.html @@ -9,7 +9,8 @@

Upload a letter

-

You can upload and send your own letters instead of creating a reusable letter template.

+

Upload a one-off 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.

To upload and send a letter from a PDF file:

@@ -19,7 +20,9 @@
  • Select Choose file.
    • -

    Letter specification

    +

    Your file must meet our letter specification

    + +

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

    Your file must be:

    @@ -30,14 +33,6 @@
  • smaller than 2MB
    • -

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

    - -

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

    - - - +

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

    {% endblock %} From 414dee7002cc5cc2d388da549acc612bb1e7768f Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 27 Feb 2020 16:29:14 +0000 Subject: [PATCH 09/10] Fix tests --- app/templates/views/dashboard/_jobs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html index 4171b5c3e..3d4c9bba4 100644 --- a/app/templates/views/dashboard/_jobs.html +++ b/app/templates/views/dashboard/_jobs.html @@ -7,7 +7,7 @@ caption="Recent files uploaded", caption_visible=False, empty_message=( - 'You have not yet uploaded any files yet.' + 'Upload a letter and Notify will print, pack and post it for you.' if current_service.can_upload_letters else 'You have not uploaded any files yet' ), field_headings=[ 'File', From ba40f5b6292404935e064ac23634bbb6da6da1c8 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 28 Feb 2020 09:57:31 +0000 Subject: [PATCH 10/10] Fix letter spec 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 54e3ec0b0..69626e55c 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -48,7 +48,7 @@
  • smaller than 2MB
    • -

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

    +

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

    {% endblock %}