Updated advice about allowed emails (#582)

Updated:

- Add user page in the Manage user section of the main service
- Both the Add user and Add another user pages in the regional service

Changes:

- Changed the text below the H1
- Change the label of the email field
- Changed the error message for allowed emails (this only applies to
page in the main service as we haven't done error msgs for the regional
service)

Author: Anna-Sutton

app/routes/user-admin.js

@@ -173,9 +173,9 @@ module.exports = (router) => {
     }
 
     if (!email || email === '') {
-      emailError = 'Enter an NHS-approved email address'
+      emailError = 'Enter an email address'
     } else if (!(email.endsWith('nhs.net') || email.endsWith('.nhs.uk'))) {
-      emailError = 'Email address must be NHS-approved'
+      emailError = 'Enter an allowed email address'
     } else if (existingUserWithSameEmail && existingUserWithSameEmail.status !== 'Deactivated') {
       emailError = 'This email address has already been added'
     }

app/views/regions/add-another-email.html

@@ -16,13 +16,15 @@
 
       <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
-      <p>Choose another user at {{ organisation.name }}.</p>
+      <p>Choose a user at {{ organisation.name }}.</p>
 
-      <p>They must have an NHS-approved email address. See the <a href="https://digital.nhs.uk/services/care-identity-service/applications-and-services/apply-for-care-id/care-identity-email-domain-allow-list" target="_blank">list of approved email domains (opens in new tab)</a>.</p>
+      <p>They must have an nhs.net email or another allowed email address. See <a href="https://digital.nhs.uk/services/care-identity-service/applications-and-services/apply-for-care-id/care-identity-email-domain-allow-list" target="_blank">examples of allowed email addresses (opens in new tab)</a>.</p>
 
-      <p>They will receive an email with details of how to access the service.</p>
+      <p>If the email address is not allowed, use a different email or <a href="/contact-us" target="_blank">contact us</a>.</p>
+      
+      <p>The user will receive a welcome email with details of how to access the service.</p>
 
-      <p>It's their responsibility to add users and set up vaccination sites for their organisation.</p>
+      <p>It’s their responsibility to add users and vaccines for their organisation.</p>
 
       <form action="/regions/organisations/{{ organisation.id }}/add-email-check" method="post" novalidate>
 
@@ -48,7 +50,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
         {{ input({
           "label": {
-            "text": "NHS-approved email address"
+            "text": "Email address"
           },
           value: data.email,
           type: "email",

app/views/regions/add-email.html

@@ -19,11 +19,13 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
       <p>Choose a user at {{ organisation.name }}.</p>
 
-      <p>They must have an NHS-approved email address. See the <a href="https://digital.nhs.uk/services/care-identity-service/applications-and-services/apply-for-care-id/care-identity-email-domain-allow-list" target="_blank">list of approved email domains (opens in new tab)</a>.</p>
+      <p>They must have an nhs.net email or another allowed email address. See <a href="https://digital.nhs.uk/services/care-identity-service/applications-and-services/apply-for-care-id/care-identity-email-domain-allow-list" target="_blank">examples of allowed email addresses (opens in new tab)</a>.</p>
 
-      <p>They will receive an email with details of how to access the service.</p>
+      <p>If the email address is not allowed, use a different email or <a href="/contact-us" target="_blank">contact us</a>.</p>
+      
+      <p>The user will receive a welcome email with details of how to access the service.</p>
 
-      <p>It’s their responsibility to add users and set up vaccination sites for their organisation.</p>
+      <p>It’s their responsibility to add users and vaccines for their organisation.</p>
 
       <form action="/regions/check-and-send" method="post" novalidate>
 
@@ -49,7 +51,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
         {{ input({
           "label": {
-            "text": "NHS-approved email address"
+            "text": "Email address"
           },
           value: data.email,
           type: "email",

app/views/user-admin/add-user.html

@@ -43,7 +43,9 @@
       {% endif %}
 
       <h1 class="nhsuks-heading-xl">Add user</h1>
-      <p>Users must have an NHS-approved email address. See the <a href="https://digital.nhs.uk/services/care-identity-service/applications-and-services/apply-for-care-id/care-identity-email-domain-allow-list" target="_blank">list of approved email domains (opens in new tab)</a>.</p>
+      <p>Users must have an nhs.net email or another allowed email address. See <a href="https://digital.nhs.uk/services/care-identity-service/applications-and-services/apply-for-care-id/care-identity-email-domain-allow-list" target="_blank">examples of allowed email addresses (opens in new tab)</a>.</p>
+
+      <p>If the email address is not allowed, use a different email or <a href="/contact-us" target="_blank">contact us</a>.</p>
 
       <form action="/user-admin/check-answers" method="post" novalidate="true">
 
@@ -75,7 +77,7 @@ <h1 class="nhsuks-heading-xl">Add user</h1>
 
         {{ input({
           "label": {
-            "text": "NHS-approved email address"
+            "text": "Email address"
           },
           "id": "email",
           "name": "email",