Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vaccines update #127

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Vaccines update #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efd043f
change
johnrimmer2 Sep 25, 2024
dae69c8
'active' batches removed
johnrimmer2 Sep 26, 2024
d90e734
change
johnrimmer2 Oct 8, 2024
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
4 changes: 2 additions & 2 deletions app/views/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
label: "Contact us"
},
{
URL: "/license-agreement",
label: "License agreement"
URL: "/terms-of-use",
label: "Terms of use"
},
{
URL: "/prototype-admin/reset-data",
Expand Down
34 changes: 0 additions & 34 deletions app/views/license-agreement.html
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions app/views/license-agreement1.html
View file
Open in desktop

This file was deleted.

34 changes: 34 additions & 0 deletions app/views/terms-of-use.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{% extends 'layout.html' %}


{% block pageTitle %}
Terms of use
{% endblock %}

{% block header %}
{% include "includes/header-logged-in-organisation.html" %}
{% endblock %}


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

<h1 class="nhsuk-heading-xl">Terms of use</h1>

<h2 class="nhsuk-heading-s">To use this service, you must accept the licence agreement</h2>

<ul class="nhsuk-body-m">
<li>Only use the service to record NHS vaccinations</li>
<li>Always use your own log in details to access the service</li>
<li>Do not share your log in details with anyone</li>
</ul>

<a href="#" class="nhsuk-link">Read terms of use in full</a>

</div>
</div>


{% endblock %}

42 changes: 42 additions & 0 deletions app/views/terms-of-use1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{% extends 'layout.html' %}


{% block pageTitle %}
Terms of use
{% endblock %}

{% block header %}
{% include "includes/header-logged-in-organisation.html" %}
{% endblock %}


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

<h1 class="nhsuk-heading-xl">Terms of use</h1>

<h2 class="nhsuk-heading-s">To use this service, you must accept the licence agreement</h2>

<ul class="nhsuk-body-m">
<li>Only use the service to record NHS vaccinations</li>
<li>Always use your own log in details to access the service</li>
<li>Do not share your log in details with anyone</li>
</ul>

<a href="#" class="nhsuk-link">Read terms of use in full</a>

</div>
</div>

</br>
</br>

{% from 'button/macro.njk' import button %}

{{ button({
text: "Accept and continue"
}) }}

{% endblock %}

2 changes: 1 addition & 1 deletion app/views/vaccines/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ <h1 class="nhsuk-heading-xl">Vaccines</h1>
{{ thisVaccine.batches | length }}
</td>
<td class="nhsuk-table__cell ">
<div class="nhsuk-u-margin-bottom-1"><a href="/vaccines/{{ thisVaccine.id }}" class="nhsuk-link">View product</a></div>
<div class="nhsuk-u-margin-bottom-1"><a href="/vaccines/{{ thisVaccine.id }}" class="nhsuk-link">View</a></div>
</td>
<td class="nhsuk-table__cell ">
<div><a href="/vaccines/{{ thisVaccine.id }}/add" class="nhsuk-link">Add batch</a></div>
Expand Down