From acb3ee08b553c913bd2708820631e143f45ad589 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 19 May 2020 12:00:02 +0100 Subject: [PATCH 01/17] Move charities to its own section --- app/templates/views/guidance/who-its-for.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/templates/views/guidance/who-its-for.html b/app/templates/views/guidance/who-its-for.html index 5f5055637..061530e8c 100644 --- a/app/templates/views/guidance/who-its-for.html +++ b/app/templates/views/guidance/who-its-for.html @@ -22,9 +22,6 @@
  • the NHS and GP practices
  • state-funded schools
    • -

    - Notify is not currently available to charities. -

    If you work for one of these organisations but get an error when you try to create an account, contact support.

    @@ -46,4 +43,9 @@ Find government services and information on GOV.UK.

    +

    Charities

    +

    + Notify is not currently available to charities. +

    + {% endblock %} From b169d098a9d6cd9c747a09746a604a72e1c9a6b9 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 19 May 2020 14:08:04 +0100 Subject: [PATCH 02/17] Move 'charities' section above 'public' section --- app/templates/views/guidance/who-its-for.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/templates/views/guidance/who-its-for.html b/app/templates/views/guidance/who-its-for.html index 061530e8c..effad81e9 100644 --- a/app/templates/views/guidance/who-its-for.html +++ b/app/templates/views/guidance/who-its-for.html @@ -34,6 +34,11 @@ Someone from the public sector organisation you’re working with needs to set up the account. Then they can invite you as a team member.

    +

    Charities

    +

    + Notify is not currently available to charities. +

    +

    Members of the public

    The GOV.UK Notify service is only for people who work in the government @@ -43,9 +48,4 @@ Find government services and information on GOV.UK.

    -

    Charities

    -

    - Notify is not currently available to charities. -

    - {% endblock %} From a7b28161fbaede38e0f2cb0f95d611c009a78ce0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 19 May 2020 15:39:46 +0100 Subject: [PATCH 03/17] Move 'who it's for' to About menu --- app/templates/admin_template.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 804f65809..06350833e 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -181,6 +181,10 @@ "href": url_for("main.roadmap"), "text": "Roadmap" }, + { + "href": url_for("main.who_its_for"), + "text": "Who can use Notify", + }, { "href": url_for("main.security"), "text": "Security" @@ -217,10 +221,6 @@ "href": url_for("main.get_started"), "text": "Get started" }, - { - "href": url_for("main.who_its_for"), - "text": "Who it’s for", - }, { "href": url_for("main.trial_mode_new"), "text": "Trial mode" From ca2d13023f34b0764a71cd682e8f7fc9a6879d52 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 19 May 2020 16:24:06 +0100 Subject: [PATCH 04/17] Move 'who it's for' to the About subnav menu --- app/main/views/sub_navigation_dictionaries.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index 3acd67136..c0ba36ef3 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -22,6 +22,10 @@ def features_nav(): "name": "Roadmap", "link": "main.roadmap", }, + { + "name": "Who can use Notify", + "link": "main.who_its_for", + }, { "name": "Security", "link": "main.security", @@ -52,10 +56,6 @@ def using_notify_nav(): "name": "Get started", "link": "main.get_started", }, - { - "name": "Who it’s for", - "link": "main.who_its_for", - }, { "name": "Trial mode", "link": "main.trial_mode_new", From 2e48535fd0f1ad5bc0718b6442564378d6e5ea51 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 19 May 2020 16:25:01 +0100 Subject: [PATCH 05/17] Update page title and header --- app/templates/views/guidance/who-its-for.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/guidance/who-its-for.html b/app/templates/views/guidance/who-its-for.html index effad81e9..5a6a44407 100644 --- a/app/templates/views/guidance/who-its-for.html +++ b/app/templates/views/guidance/who-its-for.html @@ -2,13 +2,13 @@ {% from "components/page-header.html" import page_header %} {% block per_page_title %} - Who it’s for + Who can use Notify {% endblock %} {% block content_column_content %} {{ page_header( - 'Who it’s for' + 'Who can use Notify' ) }}

    From a823f3d77fb2916599bcf799511989c4f26245ad Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 15:54:15 +0100 Subject: [PATCH 06/17] Update who_its_for to who_can_use_notify --- app/navigation.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/navigation.py b/app/navigation.py index b3485ca20..af7b75ef8 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -350,7 +350,7 @@ class HeaderNavigation(Navigation): 'no_cookie.view_template_version_preview', 'view_template_versions', 'whitelist', - 'who_its_for', + 'who_can_use_notify', } # header HTML now comes from GOVUK Frontend so requires a boolean, not an attribute @@ -668,7 +668,7 @@ class MainNavigation(Navigation): 'view_provider', 'view_providers', 'no_cookie.view_template_version_preview', - 'who_its_for', + 'who_can_use_notify', } @@ -977,7 +977,7 @@ class CaseworkNavigation(Navigation): 'no_cookie.view_template_version_preview', 'view_template_versions', 'whitelist', - 'who_its_for', + 'who_can_use_notify', } @@ -1287,5 +1287,5 @@ class OrgNavigation(Navigation): 'no_cookie.view_template_version_preview', 'view_template_versions', 'whitelist', - 'who_its_for', + 'who_can_use_notify', } From 67316679bb8e9d1042c2b7e02cf2e1f3a35b5eec Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 15:56:09 +0100 Subject: [PATCH 07/17] Update who_can_use_notify link --- app/templates/admin_template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 06350833e..1371f4ff9 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -182,7 +182,7 @@ "text": "Roadmap" }, { - "href": url_for("main.who_its_for"), + "href": url_for("main.who_can_use_notify"), "text": "Who can use Notify", }, { From 084992c66b2398ee2a464144d04068920d2d896b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 15:57:32 +0100 Subject: [PATCH 08/17] Update who_can_use_notify link --- app/templates/views/get-started.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html index bbbe0969e..e1ca8a6d0 100644 --- a/app/templates/views/get-started.html +++ b/app/templates/views/get-started.html @@ -16,7 +16,7 @@

    Check if GOV.UK Notify is right for you

    Read about our features, pricing and roadmap.

    - Check whether your organisation can use Notify. + Check whether your organisation can use Notify.

    From 50ae629721286223960a879fc0843f8b7ab5a165 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 15:58:36 +0100 Subject: [PATCH 09/17] Update who_can_use_notify link --- app/main/validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/validators.py b/app/main/validators.py index d403f9003..d16092445 100644 --- a/app/main/validators.py +++ b/app/main/validators.py @@ -45,7 +45,7 @@ class ValidGovEmail: message = ''' Enter a public sector email address or find out who can use Notify - '''.format(url_for('main.who_its_for')) + '''.format(url_for('main.who_can_use_notify')) if not is_gov_user(field.data.lower()): raise ValidationError(message) From f06dfbafbc4a60130fea21301e0273d93b2d4987 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 15:59:30 +0100 Subject: [PATCH 10/17] Update who_can_use_notify link --- app/main/views/sub_navigation_dictionaries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index c0ba36ef3..05c9954bb 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -24,7 +24,7 @@ def features_nav(): }, { "name": "Who can use Notify", - "link": "main.who_its_for", + "link": "main.who_can_use_notify", }, { "name": "Security", From 829e247f4521512b14efa6001a6ec13dc0152dec Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 16:03:58 +0100 Subject: [PATCH 11/17] Update who_can_use_notify link --- tests/app/main/views/test_index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index 5b708ab61..3c4355412 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -83,7 +83,7 @@ def test_robots(client): 'features_letters', 'how_to_pay', 'get_started', 'guidance_index', 'branding_and_customisation', 'create_and_send_messages', 'edit_and_format_messages', - 'send_files_by_email', 'upload_a_letter', 'who_its_for', + 'send_files_by_email', 'upload_a_letter', 'who_can_use_notify', ]) def test_static_pages( client_request, From bae7adcae528259dcb6a44699e74f75a928c306c Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 16:04:45 +0100 Subject: [PATCH 12/17] Update who_can_use_notify link --- tests/app/main/views/test_register.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_register.py b/tests/app/main/views/test_register.py index 6cf7a8c16..090f100fc 100644 --- a/tests/app/main/views/test_register.py +++ b/tests/app/main/views/test_register.py @@ -117,7 +117,7 @@ def test_should_return_200_when_email_is_not_gov_uk( 'Enter a public sector email address or find out who can use Notify' ) assert page.select_one('.error-message a')['href'] == url_for( - 'main.who_its_for' + 'main.who_can_use_notify' ) From a171f964f99cfa8d771915a0a936af6a7d37d4a4 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 16:06:57 +0100 Subject: [PATCH 13/17] Update who_can_use_notify --- app/main/views/index.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index 4e4713af4..9d6f4b2fa 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -321,10 +321,10 @@ def get_started(): ) -@main.route('/using-notify/who-its-for') -def who_its_for(): +@main.route('/using-notify/who-can_use_notify') +def who_can_use_notify(): return render_template( - 'views/guidance/who-its-for.html', + 'views/guidance/who-can_use_notify.html', navigation_links=using_notify_nav(), ) From 08712bc7b9b83df29b2a5c08ac6223c82a7bb90d Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 16:07:35 +0100 Subject: [PATCH 14/17] Update file name --- .../views/guidance/{who-its-for.html => who-can-use-notify.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/templates/views/guidance/{who-its-for.html => who-can-use-notify.html} (100%) diff --git a/app/templates/views/guidance/who-its-for.html b/app/templates/views/guidance/who-can-use-notify.html similarity index 100% rename from app/templates/views/guidance/who-its-for.html rename to app/templates/views/guidance/who-can-use-notify.html From 1d9964ae0f0555e03d33c714097202821438cbd5 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 20 May 2020 16:09:25 +0100 Subject: [PATCH 15/17] Fix filename --- app/main/views/index.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index 9d6f4b2fa..8adb38a83 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -321,10 +321,10 @@ def get_started(): ) -@main.route('/using-notify/who-can_use_notify') +@main.route('/using-notify/who-can-use-notify') def who_can_use_notify(): return render_template( - 'views/guidance/who-can_use_notify.html', + 'views/guidance/who-can-use-notify.html', navigation_links=using_notify_nav(), ) From de459e570905d6e5c81ac713388775b00fa452ce Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 21 May 2020 11:17:44 +0100 Subject: [PATCH 16/17] Redirect old URL --- app/main/views/index.py | 5 +++++ app/navigation.py | 4 ++++ tests/app/main/views/test_index.py | 1 + 3 files changed, 10 insertions(+) diff --git a/app/main/views/index.py b/app/main/views/index.py index 8adb38a83..918b6573c 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -321,6 +321,11 @@ def get_started(): ) +@main.route('/using-notify/who-its-for') +def who_its_for(): + return redirect(url_for('.who_can_use_notify'), 301) + + @main.route('/using-notify/who-can-use-notify') def who_can_use_notify(): return render_template( diff --git a/app/navigation.py b/app/navigation.py index af7b75ef8..b407db0a5 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -351,6 +351,7 @@ class HeaderNavigation(Navigation): 'view_template_versions', 'whitelist', 'who_can_use_notify', + 'who_its_for', } # header HTML now comes from GOVUK Frontend so requires a boolean, not an attribute @@ -669,6 +670,7 @@ class MainNavigation(Navigation): 'view_providers', 'no_cookie.view_template_version_preview', 'who_can_use_notify', + 'who_its_for', } @@ -978,6 +980,7 @@ class CaseworkNavigation(Navigation): 'view_template_versions', 'whitelist', 'who_can_use_notify', + 'who_its_for', } @@ -1288,4 +1291,5 @@ class OrgNavigation(Navigation): 'view_template_versions', 'whitelist', 'who_can_use_notify', + 'who_its_for', } diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index 3c4355412..ea6f4b54a 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -147,6 +147,7 @@ def test_guidance_pages_link_to_service_pages_when_signed_in( ('old_using_notify', 'using_notify'), ('delivery_and_failure', 'message_status'), ('callbacks', 'documentation'), + ('who_its_for', 'who_can_use_notify'), ]) def test_old_static_pages_redirect( client, From 4761b117b922c6f84d77573bf0b8156be15ebda5 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 21 May 2020 12:05:03 +0100 Subject: [PATCH 17/17] =?UTF-8?q?Use=20features=20nav=20on=20=E2=80=98Who?= =?UTF-8?q?=20can=20use=20Notify=E2=80=99=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This page sits in the features section now, so it should have the same navigation as the other pages in that section. --- app/main/views/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index 918b6573c..4ed477e70 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -330,7 +330,7 @@ def who_its_for(): def who_can_use_notify(): return render_template( 'views/guidance/who-can-use-notify.html', - navigation_links=using_notify_nav(), + navigation_links=features_nav(), )