Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions app/views/appointments/check-answers-series.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'layouts/ravs-plus-layout-1-oh.html' %}
{% extends 'layouts/ravs-plus-layout-1-maternity.html' %}

{% set currentSection = "plus" %}

Expand All @@ -8,11 +8,17 @@
}) }}
{% endblock %}

{% set pageTitle = "Check your answers" %}

{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}

{% block content %}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">

<h1 class="nhsuk-heading-l">Check your answers</h1>
<h1 class="nhsuk-heading-l">{{ pageTitle }}</h1>
<form action="" method="post">
<dl class="nhsuk-summary-list">

Expand Down
10 changes: 8 additions & 2 deletions app/views/appointments/check-answers-single.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'layouts/ravs-plus-layout-1-oh.html' %}
{% extends 'layouts/ravs-plus-layout-1-maternity.html' %}

{% set currentSection = "plus" %}

Expand All @@ -8,11 +8,17 @@
}) }}
{% endblock %}

{% set pageTitle = "Check your answers" %}

{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}

{% block content %}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">

<h1 class="nhsuk-heading-l">Check your answers</h1>
<h1 class="nhsuk-heading-l">{{ pageTitle }}</h1>
<form action="" method="post">
<dl class="nhsuk-summary-list">

Expand Down
8 changes: 6 additions & 2 deletions app/views/appointments/clinic-closures-add.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'layouts/ravs-plus-layout-1-oh.html' %}
{% extends 'layouts/ravs-plus-layout-1-maternity.html' %}

{% set currentSection = "plus" %}

Expand All @@ -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') %}
Expand Down
11 changes: 8 additions & 3 deletions app/views/appointments/clinic-closures-playback.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'layouts/ravs-plus-layout-1-oh.html' %}
{% extends 'layouts/ravs-plus-layout-1-maternity.html' %}

{% set currentSection = "plus" %}

Expand All @@ -8,12 +8,17 @@
}) }}
{% endblock %}

{% set pageName = "Clinic closures" %}
{% set pageTitle = "Clinic closures" %}

{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}


{% block content %}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
<h1 class="nhsuk-heading-l">{{ pageName }}</h1>
<h1 class="nhsuk-heading-l">{{ pageTitle }}</h1>
<h2 class="nhsuk-heading-m">There is 1 clinic closure</h2>

<dl class="nhsuk-summary-list nhsuk-u-margin-bottom-3">
Expand Down
10 changes: 7 additions & 3 deletions app/views/appointments/clinic-closures.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'layouts/ravs-plus-layout-1-oh.html' %}
{% extends 'layouts/ravs-plus-layout-1-maternity.html' %}

{% set currentSection = "plus" %}

Expand All @@ -8,12 +8,16 @@
}) }}
{% endblock %}

{% set pageName = "Clinic closures" %}
{% set pageTitle = "Clinic closures" %}

{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}

{% block content %}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
<h1 class="nhsuk-heading-l">{{ pageName }}</h1>
<h1 class="nhsuk-heading-l">{{ pageTitle }}</h1>

<form action="" method="post">
<input type="hidden" name="newSession[type]" value="Clinic series">
Expand Down
10 changes: 7 additions & 3 deletions app/views/appointments/clinic-times.html
Original file line number Diff line number Diff line change
@@ -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 %}
Expand All @@ -16,10 +16,14 @@
}) }}
{% endblock %}

{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}

{% block content %}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
<h1 class="nhsuk-heading-l">{{ pageName }}</h1>
<h1 class="nhsuk-heading-l">{{ pageTitle }}</h1>

<form action="" method="post">
{{ dateInput({
Expand Down
2 changes: 1 addition & 1 deletion app/views/appointments/create-and-manage-clinics.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'layouts/ravs-plus-layout-1-oh.html' %}
{% extends 'layouts/ravs-plus-layout-1-maternity.html' %}

{% set currentSection = "plus" %}

Expand Down
11 changes: 7 additions & 4 deletions app/views/appointments/days.html
Original file line number Diff line number Diff line change
@@ -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 %}

Expand All @@ -12,8 +12,11 @@
}) }}
{% endblock %}

{% block content %}
{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}

{% block content %}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
Expand All @@ -28,7 +31,7 @@
},
fieldset: {
legend: {
text: pageName,
text: pageTitle,
isPageHeading: true,
classes: "nhsuk-fieldset__legend--l"
}
Expand Down
10 changes: 7 additions & 3 deletions app/views/appointments/details-series.html
Original file line number Diff line number Diff line change
@@ -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 %}

Expand All @@ -12,10 +12,14 @@
}) }}
{% endblock %}

{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}

{% block content %}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
<h1 class="nhsuk-heading-l">{{ pageName }}</h1>
<h1 class="nhsuk-heading-l">{{ pageTitle }}</h1>

<form action="" method="post">
{% if not hideDateFields %}
Expand Down
10 changes: 7 additions & 3 deletions app/views/appointments/details-single.html
Original file line number Diff line number Diff line change
@@ -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 %}

Expand All @@ -12,6 +12,10 @@
}) }}
{% endblock %}

{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}

{% block content %}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
Expand All @@ -22,7 +26,7 @@
namePrefix: "newSession[singleDate]",
fieldset: {
legend: {
text: pageName,
text: pageTitle,
isPageHeading: true,
classes: "nhsuk-fieldset__legend--l"
}
Expand Down
6 changes: 3 additions & 3 deletions app/views/appointments/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">

<span class="nhsuk-caption-l">Release xx</span>
<span class="nhsuk-caption-l">Release TBC</span>
<h1 class="nhsuk-heading-l">Clinics / sessions</h1>
<h2 class="nhsuk-heading-m nhsuk-u-margin-bottom-2">Description</h2>
<p class="nhsuk-body">
[To be added]
Rough designs for integrating MYA's clinic features into RAVS+.
</p>

<h2 class="nhsuk-heading-m nhsuk-u-margin-bottom-4">
Entry point
</h2>
<ul>
<li><a href="landing">Staff vaccinations landing</a></li>
<li><a href="landing">Landing</a></li>
</ul>

<h2 class="nhsuk-heading-m nhsuk-u-margin-bottom-4">
Expand Down
14 changes: 8 additions & 6 deletions app/views/appointments/landing.html
Original file line number Diff line number Diff line change
@@ -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 %}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
<h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-4">
Staff vaccinations
Maternity
</h1>
<p class="nhsuk-body">View, filter and export vaccination information for your organisation's staff.</p>
<p class="nhsuk-body">View, filter and export vaccination information for your pregnant&nbsp;patients.</p>
</div>
</div>

Expand All @@ -26,7 +28,7 @@ <h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-4">
<h2 class="nhsuk-card__heading nhsuk-heading-m">
<a class="nhsuk-card__link" href="#/">Add patients</a>
</h2>
<p class="nhsuk-card__description">Add or replace a list of patients</p>
<p class="nhsuk-card__description">Add or replace a list of pregnant patients</p>
<svg class="nhsuk-icon nhsuk-icon--chevron-right-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" focusable="false" aria-hidden="true">
<path d="M12 2a10 10 0 1 1 0 20 10 10 0 0 1 0-20Zm-.3 5.8a1 1 0 1 0-1.5 1.4l2.9 2.8-2.9 2.8a1 1 0 0 0 1.5 1.4l3.5-3.5c.4-.4.4-1 0-1.4Z" />
</svg>
Expand All @@ -42,7 +44,7 @@ <h2 class="nhsuk-card__heading nhsuk-heading-m">
<h2 class="nhsuk-card__heading nhsuk-heading-m">
<a class="nhsuk-card__link" href="#/">Patients</a>
</h2>
<p class="nhsuk-card__description">View current list of patients</p>
<p class="nhsuk-card__description">View current list of pregnant patients</p>
<svg class="nhsuk-icon nhsuk-icon--chevron-right-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" focusable="false" aria-hidden="true">
<path d="M12 2a10 10 0 1 1 0 20 10 10 0 0 1 0-20Zm-.3 5.8a1 1 0 1 0-1.5 1.4l2.9 2.8-2.9 2.8a1 1 0 0 0 1.5 1.4l3.5-3.5c.4-.4.4-1 0-1.4Z" />
</svg>
Expand Down
6 changes: 5 additions & 1 deletion app/views/appointments/manage-site.html
Original file line number Diff line number Diff line change
@@ -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 %}
<style>
.card-list {
Expand Down
11 changes: 7 additions & 4 deletions app/views/appointments/services.html
Original file line number Diff line number Diff line change
@@ -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 services will you offer?" %}{% endif %}
{% if not pageTitle %}{% set pageTitle = "Which services will you offer?" %}{% endif %}
{% if not backUrl %}{% set backUrl = '/site/' + site_id + '/clinics/appointments-calculator' %}{% endif %}
{% if not formAction %}{% set formAction = '/site/' + site_id + '/clinics/clinic-closures' %}{% endif %}

Expand All @@ -12,8 +12,11 @@
}) }}
{% endblock %}

{% block content %}
{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}

{% block content %}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
Expand All @@ -23,7 +26,7 @@
<input type="hidden" name="newSession[type]" value="Clinic series">

<div class="nhsuk-form-group {{ 'nhsuk-form-group--error' if error }}">
<h1 class="nhsuk-heading-l">{{ pageName }}</h1>
<h1 class="nhsuk-heading-l">{{ pageTitle }}</h1>
{% if error %}
<p id="services-error" class="nhsuk-error-message">
<span class="nhsuk-u-visually-hidden">Error:</span> Select a service
Expand Down
2 changes: 1 addition & 1 deletion app/views/appointments/sites.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'layouts/ravs-plus-layout-1-oh.html' %}
{% extends 'layouts/ravs-plus-layout-1-maternity.html' %}

{% set currentSection = "plus" %}

Expand Down
10 changes: 7 additions & 3 deletions app/views/appointments/success-series.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{% extends 'layouts/ravs-plus-layout-1-oh.html' %}
{% extends 'layouts/ravs-plus-layout-1-maternity.html' %}

{% set currentSection = "plus" %}

{% set pageName = 'Clinic series created' %}
{% set pageTitle = 'Clinic series created' %}

{% block pageTitle %}
{{ pageTitle }} - Record a vaccination - NHS
{% endblock %}

{% block content %}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
{{ panel({
titleText: pageName
titleText: pageTitle
}) }}

<h2 class="nhsuk-heading-m">What would you like to do next?</h2>
Expand Down
Loading