Merge branch 'main' of https://github.com/NHSDigital/prototype-gp-registration

Author: david-evans84-NHSD

app/views/live/continue-with-nhs-login.html

@@ -4,7 +4,7 @@
 
 {% extends 'layout.html' %}
 
-{% set heading = 'Would you like to continue with your NHS account?' %}
+{% set heading = 'Use your NHS account to apply' %}
 
 {% block pageTitle %}
 {{ heading }} - {{ data.presets[0].servicename }} - NHS
@@ -25,14 +25,19 @@
 
           <h1 class="nhsuk-heading-l">{{ heading }}</h1>
 
-          <p>This will be quicker as we can use the details from your NHS record to register.</p>
+          <p>Using your NHS account means you:</p>
+          <ul>
+            <li>answer fewer questions as you will not be asked for some of the information you have already shared with the NHS</li>
+            <li>may save time completing this application</li>
+          </ul>
+          <h2 class="nhsuk-heading-m">Would you like to use your NHS account?</h2>
+
           <div class="nhs-login">
             <p>You’ll have an account if you signed up for the <span class="nhsuk-u-font-weight-bold">NHS App</span> or other online health services that use NHS login.</p>
             <a href="nhs-login-email?use-login=true&login-level=p9" class="nhsuk-button nhsuk-button--blue nhsuk-u-margin-bottom-4" type="submit">
-              Continue with my NHS account</a>
+              Use NHS account</a>
         </div>
-          <p>Or, continue without</p>
-          <p><a href="what-is-your-name?use-login=false" class="nhsuk-button nhsuk-button--secondary">Continue without</a></p>
+          <p><a href="what-is-your-name?use-login=false" class="nhsuk-button nhsuk-button--secondary">Do not use account</a></p>
 
       </div>
     </div>

app/views/live/do-you-know-nhs-number-parent.html

@@ -35,28 +35,21 @@
               }
             }) %}
 
-            {{ hint({
-              "text": "This is a 10 digit number, like 485 777 3456.",
-              "classes": "nhsuk-u-margin-bottom-4"
-            }) }}
-
-            {{ hint({
-              "text": "You can find it on any letter the NHS has sent you, on a prescription or by logging in to a GP practice online service.",
-              "classes": "nhsuk-u-margin-bottom-4"
-            }) }}
+            <p>This is a 10 digit number, like 485 777 3456.</p>
+            <p>It can be found on any letter the NHS has sent you, on a prescription, in the NHS App or by asking your GP. It will be used to match you to your NHS record.</p>
 
             {{ radios({
               "idPrefix": "know-nhs-number-parent",
               "name": "know-nhs-number-parent",
               "items": [
                 {
                   "value": "Yes~/live/what-is-your-nhs-number-parent",
-                  "text": "Yes, I know my NHS number",
+                  "text": "Yes",
                   "checked": checked("know-nhs-number-parent", "Yes")
                 },
                 {
                   "value": "No~/live/carer-details",
-                  "text": "No, I do not know my NHS number",
+                  "text": "No",
                   "checked": checked("know-nhs-number-parent", "No")
                 }
               ]

app/views/live/do-you-know-nhs-number.html

@@ -7,16 +7,12 @@
 
 {% if (data['who-is-being-registered'] === "dependant") %}
   {% set heading = 'Do you know ' + data['name-first-name'] + '\'s NHS Number?' %}
-  {% set hint1 = 'This is a 10 digit number, like 485 777 3456.' %}
-  {% set hint2 = 'You can find it on any letter the NHS has sent them, on a prescription or by logging in to a GP practice online service.' %}
   {% set option1 = 'Yes, I know their NHS number' %}
-  {% set option2 = 'No, I do not know their NHS number' %}
+  {% set option2 = 'No, continue without' %}
 {% else %}
   {% set heading = 'Do you know your NHS Number?' %}
-  {% set hint1 = 'This is a 10 digit number, like 485 777 3456.' %}
-  {% set hint2 = 'You can find it on any letter the NHS has sent you, on a prescription or by logging in to a GP practice online service.' %}
   {% set option1 = 'Yes, I know my NHS number' %}
-  {% set option2 = 'No, I do not know my NHS number' %}
+  {% set option2 = 'No, continue without' %}
 {% endif %}
 
 {% block pageTitle %}
@@ -48,16 +44,13 @@
               }
             }) %}
 
-            {{ hint({
-              text: hint1,
-              "classes": "nhsuk-u-margin-bottom-4"
-            }) }}
-
-            {{ hint({
-              "text": hint2,
-              "classes": "nhsuk-u-margin-bottom-4"
-            }) }}
-
+            {% if (data['who-is-being-registered'] === "dependant") %}
+            <p>This is a 10 digit number, like 485 777 3456.</p>
+            <p>It can be found on any letter the NHS has sent them, on a prescription, in the NHS App or by asking their GP. It will be used to match them to their NHS record.</p>
+            {% else %}
+            <p>This is a 10 digit number, like 485 777 3456.</p>
+            <p>It can be found on any letter the NHS has sent you, on a prescription, in the NHS App or by asking your GP. It will be used to match you to your NHS record.</p>
+            {% endif %}
 
             {{ radios({
               "idPrefix": "know-nhs-number",

app/views/live/what-is-your-current-address.html

@@ -6,9 +6,9 @@
 {% extends 'layout.html' %}
 
 {% if (data['who-is-being-registered'] === "dependant") %}
-  {% set heading = "What is " + data['name-first-name'] + "'s current UK address?" %}
+  {% set heading = "What is " + data['name-first-name'] + "'s address?" %}
 {% else %}
-  {% set heading = 'What is your current UK address?' %}
+  {% set heading = 'What is your address?' %}
 {% endif %}
 
 {% block pageTitle %}