Updating to latest content

Author: michaelNetCompany

app/views/live/nominate-pharmacy.html

@@ -5,14 +5,8 @@
 
 {% extends 'layout.html' %}
 
-{% if (data['who-is-being-registered'] === "dependant") %}
-  {% set heading = 'Would ' + data['name-first-name'] + ' like to choose a pharmacy for their prescriptions?' %}
-{% else %}
-  {% set heading = 'Would you like to choose a pharmacy for your prescriptions?'  %}
-{% endif %}
-
 {% block pageTitle %}
-  {{ heading }} - {{ data.presets[0].servicename }} - NHS
+Where you get your prescription items - {{ data.presets[0].servicename }} - NHS
 {% endblock %}
 
 {% if (data['ethnicity'] === "Asian or Asian British") %}
@@ -29,18 +23,6 @@
   {% set link = 'what-is-your-ethnicity' %}
 {% endif %}
 
-{% if (data['user-auth'] === "p9") %}
-  {% set hintText = 'Choosing a pharmacy now means your GP surgery will send all future prescriptions directly to this new pharmacy.' %}
-{% else %}
-  {% set hintText = 'Choosing a pharmacy means your GP surgery will send prescriptions directly to this pharmacy.' %}
-{% endif %}
-
-{% if (data['user-auth'] === "p9") %}
-  {% set yesLink = 'Yes~nominate-pharmacy-warning' %}
-{% else %}
-  {% set yesLink = 'Yes~nominate-online-or-street' %}
-{% endif %}
-
 {% block outerContent %}
   {{ backLink({
     "href": link,
@@ -58,23 +40,29 @@
 
             {% include 'live/includes/step.html' %}
 
+            <h1 class="nhsuk-fieldset__legend--l">Where you get your prescription items</h1>
+            <p>Trinity Court Surgery (Demo GP Practice) is a dispensing surgery. This means you may be eligible to get your prescription items such as medicines or medical appliances direct from this GP surgery.</p>
+            <p>If you select 'Yes' you must answer the questions you are asked as best you can. If you are eligible the GP surgery may discuss this additional service with you.</p>
+            
+            <div class="nhsuk-inset-text">
+              <span class="nhsuk-u-visually-hidden">Information: </span>
+               <p>If you select 'No' and choose a pharmacy you will not be able change your mind later.</p>
+            </div>
+
             {{ radios({
               "idPrefix": "nominate-pharmacy",
               "name": "nominate-pharmacy",
               "fieldset": {
                 "legend": {
-                  "text": heading,
-                  "classes": "nhsuk-fieldset__legend--l",
-                  "isPageHeading": "true"
+                  "text": "Do you want to check if you are eligible?",
+                  "classes": "nhsuk-fieldset__legend--m",
+                  "isPageHeading": "false"
                 }
               },
-              "hint": {
-                "text": hintText
-              },
               "items": [
                 {
-                  "value": yesLink,
-                  "text": "Yes, choose a pharmacy",
+                  "value": "Yes~nominate-online-or-street",
+                  "text": "Yes",
                   checked: checked("nominate-pharmacy", "Yes")
                 },
                 {

app/views/live/what-is-your-current-address-manual.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 %}

app/views/live/what-is-your-sex.html

@@ -8,10 +8,8 @@
 
 {% if (data['who-is-being-registered'] === "dependant") %}
   {% set heading = 'What is ' + data['name-first-name'] + "'s sex as recorded on their NHS record?" %}
-  {% set hint1 = 'This information will be used to match them to their healthcare record' %}
 {% else %}
   {% set heading = 'What is your sex as recorded on your NHS record?' %}
-  {% set hint1 = 'This information will be used to match you to your healthcare record' %}
 {% endif %}
 
 {% block pageTitle %}
@@ -43,10 +41,11 @@
               }
             }) %}
 
-            {{ hint({
-              text: hint1,
-              "classes": "nhsuk-u-margin-bottom-4"
-            }) }}
+            {% if (data['who-is-being-registered'] === "dependant") %}
+            <p>This information will be used to match them to their healthcare record.</p>
+            {% else %}
+            <p>This information will be used to match you to your healthcare record.</p>
+            {% endif %}
 
             {{ radios({
               "idPrefix": "gender",