diff --git a/app/views/appointments/check-answers-series.html b/app/views/appointments/check-answers-series.html index 232665e..82340b7 100644 --- a/app/views/appointments/check-answers-series.html +++ b/app/views/appointments/check-answers-series.html @@ -1,4 +1,4 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} @@ -8,11 +8,17 @@ }) }} {% endblock %} +{% set pageTitle = "Check your answers" %} + +{% block pageTitle %} + {{ pageTitle }} - Record a vaccination - NHS +{% endblock %} + {% block content %}
-

Check your answers

+

{{ pageTitle }}

diff --git a/app/views/appointments/check-answers-single.html b/app/views/appointments/check-answers-single.html index 8086b5d..05ff67d 100644 --- a/app/views/appointments/check-answers-single.html +++ b/app/views/appointments/check-answers-single.html @@ -1,4 +1,4 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} @@ -8,11 +8,17 @@ }) }} {% endblock %} +{% set pageTitle = "Check your answers" %} + +{% block pageTitle %} + {{ pageTitle }} - Record a vaccination - NHS +{% endblock %} + {% block content %}
-

Check your answers

+

{{ pageTitle }}

diff --git a/app/views/appointments/clinic-closures-add.html b/app/views/appointments/clinic-closures-add.html index d4653a9..24df898 100644 --- a/app/views/appointments/clinic-closures-add.html +++ b/app/views/appointments/clinic-closures-add.html @@ -1,4 +1,4 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} @@ -8,11 +8,15 @@ }) }} {% endblock %} -{% if not pageName %}{% set pageName = "Clinic closures" %}{% endif %} +{% if not pageTitle %}{% set pageTitle = "Clinic closures" %}{% endif %} {% if not backUrl %}{% set backUrl = '/site/' + site_id + '/clinics/services' %}{% endif %} {% if not formAction %}{% set formAction = '/site/' + site_id + '/clinics/clinic-closures' %}{% endif %} {% if not addClosureHref %}{% set addClosureHref = formAction + '/add' %}{% endif %} +{% block pageTitle %} + {{ pageTitle }} - Record a vaccination - NHS +{% endblock %} + {% macro closureText(closure) %} {% set closureStart = closure.startDate | formatDate('d MMM yyyy') %} {% set closureEnd = closure.endDate | formatDate('d MMM yyyy') %} diff --git a/app/views/appointments/clinic-closures-playback.html b/app/views/appointments/clinic-closures-playback.html index e17130e..89df123 100644 --- a/app/views/appointments/clinic-closures-playback.html +++ b/app/views/appointments/clinic-closures-playback.html @@ -1,4 +1,4 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} @@ -8,12 +8,17 @@ }) }} {% endblock %} -{% set pageName = "Clinic closures" %} +{% set pageTitle = "Clinic closures" %} + +{% block pageTitle %} + {{ pageTitle }} - Record a vaccination - NHS +{% endblock %} + {% block content %}
-

{{ pageName }}

+

{{ pageTitle }}

There is 1 clinic closure

diff --git a/app/views/appointments/clinic-closures.html b/app/views/appointments/clinic-closures.html index 777b425..dbf23fa 100644 --- a/app/views/appointments/clinic-closures.html +++ b/app/views/appointments/clinic-closures.html @@ -1,4 +1,4 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} @@ -8,12 +8,16 @@ }) }} {% endblock %} -{% set pageName = "Clinic closures" %} +{% set pageTitle = "Clinic closures" %} + +{% block pageTitle %} + {{ pageTitle }} - Record a vaccination - NHS +{% endblock %} {% block content %}
-

{{ pageName }}

+

{{ pageTitle }}

diff --git a/app/views/appointments/clinic-times.html b/app/views/appointments/clinic-times.html index b063fc2..39adc84 100644 --- a/app/views/appointments/clinic-times.html +++ b/app/views/appointments/clinic-times.html @@ -1,8 +1,8 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} -{% set pageName = "Times and capacity" %} +{% set pageTitle = "Times and capacity" %} {% if not backUrl %}{% set backUrl = '/site/' + site_id + '/clinics/days' %}{% endif %} {% if not formAction %}{% set formAction = '/site/' + site_id + '/clinics/appointments-calculator' %}{% endif %} {% if not includeCapacityFields %}{% set includeCapacityFields = false %}{% endif %} @@ -16,10 +16,14 @@ }) }} {% endblock %} +{% block pageTitle %} + {{ pageTitle }} - Record a vaccination - NHS +{% endblock %} + {% block content %}
-

{{ pageName }}

+

{{ pageTitle }}

{{ dateInput({ diff --git a/app/views/appointments/create-and-manage-clinics.html b/app/views/appointments/create-and-manage-clinics.html index 2c985f2..6122402 100644 --- a/app/views/appointments/create-and-manage-clinics.html +++ b/app/views/appointments/create-and-manage-clinics.html @@ -1,4 +1,4 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} diff --git a/app/views/appointments/days.html b/app/views/appointments/days.html index 91ff50d..7c19810 100644 --- a/app/views/appointments/days.html +++ b/app/views/appointments/days.html @@ -1,8 +1,8 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} -{% if not pageName %}{% set pageName = "Which days will this clinic series run on?" %}{% endif %} +{% if not pageTitle %}{% set pageTitle = "Which days will this clinic series run on?" %}{% endif %} {% if not backUrl %}{% set backUrl = '/site/' + site_id + '/clinics/details' %}{% endif %} {% if not formAction %}{% set formAction = '/site/' + site_id + '/clinics/clinic-times' %}{% endif %} @@ -12,8 +12,11 @@ }) }} {% endblock %} -{% block content %} +{% block pageTitle %} + {{ pageTitle }} - Record a vaccination - NHS +{% endblock %} +{% block content %}
@@ -28,7 +31,7 @@ }, fieldset: { legend: { - text: pageName, + text: pageTitle, isPageHeading: true, classes: "nhsuk-fieldset__legend--l" } diff --git a/app/views/appointments/details-series.html b/app/views/appointments/details-series.html index ca4a38e..15f1b34 100644 --- a/app/views/appointments/details-series.html +++ b/app/views/appointments/details-series.html @@ -1,8 +1,8 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} -{% if not pageName %}{% set pageName = "Dates" %}{% endif %} +{% if not pageTitle %}{% set pageTitle = "Dates" %}{% endif %} {% if not backUrl %}{% set backUrl = '/site/' + site_id + '/clinics/type-of-clinc' %}{% endif %} {% if not formAction %}{% set formAction = '/site/' + site_id + '/clinics/days' %}{% endif %} @@ -12,10 +12,14 @@ }) }} {% endblock %} +{% block pageTitle %} + {{ pageTitle }} - Record a vaccination - NHS +{% endblock %} + {% block content %}
-

{{ pageName }}

+

{{ pageTitle }}

{% if not hideDateFields %} diff --git a/app/views/appointments/details-single.html b/app/views/appointments/details-single.html index 037cfb8..1554a44 100644 --- a/app/views/appointments/details-single.html +++ b/app/views/appointments/details-single.html @@ -1,8 +1,8 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} -{% if not pageName %}{% set pageName = "Date" %}{% endif %} +{% if not pageTitle %}{% set pageTitle = "Date" %}{% endif %} {% if not backUrl %}{% set backUrl = '/site/' + site_id + '/clinics/type-of-clinc' %}{% endif %} {% if not formAction %}{% set formAction = '/site/' + site_id + '/clinics/clinic-times' %}{% endif %} @@ -12,6 +12,10 @@ }) }} {% endblock %} +{% block pageTitle %} + {{ pageTitle }} - Record a vaccination - NHS +{% endblock %} + {% block content %}
@@ -22,7 +26,7 @@ namePrefix: "newSession[singleDate]", fieldset: { legend: { - text: pageName, + text: pageTitle, isPageHeading: true, classes: "nhsuk-fieldset__legend--l" } diff --git a/app/views/appointments/home.html b/app/views/appointments/home.html index a55f125..d018278 100644 --- a/app/views/appointments/home.html +++ b/app/views/appointments/home.html @@ -12,18 +12,18 @@
- Release xx + Release TBC

Clinics / sessions

Description

- [To be added] + Rough designs for integrating MYA's clinic features into RAVS+.

Entry point

diff --git a/app/views/appointments/landing.html b/app/views/appointments/landing.html index 10738e1..be02b06 100644 --- a/app/views/appointments/landing.html +++ b/app/views/appointments/landing.html @@ -1,18 +1,20 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} +{% set pageTitle = 'Maternity' %} + {% block pageTitle %} - Staff vaccinations + {{ pageTitle }} - Record a vaccination - NHS {% endblock %} {% block content %}

- Staff vaccinations + Maternity

-

View, filter and export vaccination information for your organisation's staff.

+

View, filter and export vaccination information for your pregnant patients.

@@ -26,7 +28,7 @@

Add patients

-

Add or replace a list of patients

+

Add or replace a list of pregnant patients

@@ -42,7 +44,7 @@

Patients

-

View current list of patients

+

View current list of pregnant patients

diff --git a/app/views/appointments/manage-site.html b/app/views/appointments/manage-site.html index 228b52f..e9f80fa 100644 --- a/app/views/appointments/manage-site.html +++ b/app/views/appointments/manage-site.html @@ -1,9 +1,13 @@ -{% extends 'layouts/ravs-plus-layout-1-oh.html' %} +{% extends 'layouts/ravs-plus-layout-1-maternity.html' %} {% set currentSection = "plus" %} {% set pageName = "Manage site" %} +{% block pageTitle %} + {{ pageName }} - Record a vaccination - NHS +{% endblock %} + {% block content %}