Merge pull request #3452 from alphagov/update-who-its-for-content

Update and move the 'who it's for' page

app/main/validators.py

@@ -45,7 +45,7 @@ class ValidGovEmail:
         message = '''
             Enter a public sector email address or
             <a class="govuk-link govuk-link--no-visited-state" href="{}">find out who can use Notify</a>
-        '''.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)
 

app/main/views/index.py

@@ -323,9 +323,14 @@ 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(
-        'views/guidance/who-its-for.html',
-        navigation_links=using_notify_nav(),
+        'views/guidance/who-can-use-notify.html',
+        navigation_links=features_nav(),
     )
 
 

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_can_use_notify",
+        },
         {
             "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",

app/navigation.py

@@ -350,6 +350,7 @@ class HeaderNavigation(Navigation):
         'no_cookie.view_template_version_preview',
         'view_template_versions',
         'whitelist',
+        'who_can_use_notify',
         'who_its_for',
     }
 
@@ -668,6 +669,7 @@ class MainNavigation(Navigation):
         'view_provider',
         'view_providers',
         'no_cookie.view_template_version_preview',
+        'who_can_use_notify',
         'who_its_for',
     }
 
@@ -977,6 +979,7 @@ class CaseworkNavigation(Navigation):
         'no_cookie.view_template_version_preview',
         'view_template_versions',
         'whitelist',
+        'who_can_use_notify',
         'who_its_for',
     }
 
@@ -1287,5 +1290,6 @@ class OrgNavigation(Navigation):
         'no_cookie.view_template_version_preview',
         'view_template_versions',
         'whitelist',
+        'who_can_use_notify',
         'who_its_for',
     }

app/templates/admin_template.html

@@ -181,6 +181,10 @@
             "href": url_for("main.roadmap"),
             "text": "Roadmap"
           },
+          {
+            "href": url_for("main.who_can_use_notify"),
+            "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"

app/templates/views/get-started.html

@@ -16,7 +16,7 @@
     <h2 class="get-started-list__heading">Check if GOV.UK Notify is right for you</h2>
     <p>Read about our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features') }}">features</a>, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.pricing') }}">pricing</a> and <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.roadmap') }}">roadmap</a>.</p>
     <p class="govuk-body">
-      Check <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.who_its_for') }}">whether your organisation can use Notify</a>.
+      Check <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.who_can_use_notify') }}">whether your organisation can use Notify</a>.
     </p>
   </li>
 

app/templates/views/guidance/who-can-use-notify.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'
   ) }}
 
   <p class="govuk-body">
@@ -22,9 +22,6 @@
     <li>the NHS and GP practices</li>
     <li>state-funded schools</li>
   </ul>
-  <p class="govuk-body">
-    Notify is not currently available to charities.
-  </p>
   <p class="govuk-body">
     If you work for one of these organisations but get an error when you try to create an account, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact support</a>.
   </p>
@@ -37,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.
   </p>
 
+  <h2 class="govuk-heading-m">Charities</h2>
+  <p class="govuk-body">
+    Notify is not currently available to charities.
+  </p>
+
   <h2 class="govuk-heading-m">Members of the public</h2>
   <p class="govuk-body">
     The GOV.UK Notify service is only for people who work in the government

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,
@@ -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,

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'
     )