diff --git a/app/views/errors/429.html b/app/views/errors/429.html deleted file mode 100644 index 658a2c2b..00000000 --- a/app/views/errors/429.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Sorry, the service is unavailable" %} - -{% block content %} -
-
-

{{ pageName }}

- -

You have made too many requests.

- -

You will be able to use the service later.

- -
-
-{% endblock %} diff --git a/app/views/errors/500.html b/app/views/errors/500.html index f1c6b8b2..6861a594 100644 --- a/app/views/errors/500.html +++ b/app/views/errors/500.html @@ -9,7 +9,7 @@

{{ pageName }}

Try again later.

-

If you urgently need to record a vaccination, download our paper form.

+

If you urgently need to record a vaccination, download our paper form.

diff --git a/app/views/errors/no-patient-details.html b/app/views/errors/no-patient-details.html new file mode 100644 index 00000000..d9dde92d --- /dev/null +++ b/app/views/errors/no-patient-details.html @@ -0,0 +1,28 @@ +{% extends 'layout.html' %} + +{% set pageName = "There is a temporary problem getting the patient's details" %} + + +{% block beforeContent %} + {{ backLink({ href: "/record-vaccinations/patient" }) }} +{% endblock %} + + +{% block content %} +
+
+

{{ pageName }}

+ +

Try again. Or if the problem persists and you urgently need to record a vaccination, download our paper form.

+ +{% from "button/macro.njk" import button %} + +{{ button({ + text: "Try again" +}) }} + +
+
+ + +{% endblock %} diff --git a/app/views/errors/no-patient-record.html b/app/views/errors/no-vaccination-history.html similarity index 60% rename from app/views/errors/no-patient-record.html rename to app/views/errors/no-vaccination-history.html index 70e019e5..610e5c6d 100644 --- a/app/views/errors/no-patient-record.html +++ b/app/views/errors/no-vaccination-history.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "There was a problem getting Jodie Brown's vaccination history" %} +{% set pageName = "There is a temporary problem getting Jodie Brown's vaccination history" %} {% block beforeContent %} @@ -19,18 +19,21 @@

{{ pageName }}

You will not be able to see the patient's vaccination history.

- +{% from "button/macro.njk" import button %} +{{ button({ + text: "Try again" +}) }} -    - +    +{% from "button/macro.njk" import button %} +{{ button({ + text: "Continue anyway", + classes: "nhsuk-button--secondary" +}) }} diff --git a/app/views/errors/partial-vaccination-history.html b/app/views/errors/partial-vaccination-history.html new file mode 100644 index 00000000..a0e0a9a5 --- /dev/null +++ b/app/views/errors/partial-vaccination-history.html @@ -0,0 +1,42 @@ +{% extends 'layout.html' %} + +{% set pageName = "There is a temporary problem getting Jodie Brown's vaccination history" %} + + +{% block beforeContent %} + {{ backLink({ href: "/record-vaccinations/patient" }) }} +{% endblock %} + +{% set currentSection = "vaccinate" %} + + +{% block content %} +
+
+

{{ pageName }}

+ + +

You may not see all the vaccination records that are usually shown in this service.

+ +{% from "button/macro.njk" import button %} + +{{ button({ + text: "Try again" +}) }} + +    + +{% from "button/macro.njk" import button %} + +{{ button({ + text: "Continue anyway", + classes: "nhsuk-button--secondary" +}) }} + + + +
+
+ + +{% endblock %} diff --git a/app/views/errors/PDS-service.html b/app/views/errors/rate-limit.html similarity index 61% rename from app/views/errors/PDS-service.html rename to app/views/errors/rate-limit.html index 5870db1f..6861a594 100644 --- a/app/views/errors/PDS-service.html +++ b/app/views/errors/rate-limit.html @@ -2,19 +2,14 @@ {% set pageName = "Sorry, there is a problem with the service" %} - -{% block beforeContent %} - {{ backLink({ href: "/record-vaccinations/patient" }) }} -{% endblock %} - - {% block content %}

{{ pageName }}

-

We could not get the patient's details. Try again later.

+

Try again later.

+

If you urgently need to record a vaccination, download our paper form.

diff --git a/app/views/errors/some-patient-record.html b/app/views/errors/some-patient-record.html deleted file mode 100644 index b106b6b0..00000000 --- a/app/views/errors/some-patient-record.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "There was a problem getting Jodie Brown's vaccination history" %} - - -{% block beforeContent %} - {{ backLink({ href: "/record-vaccinations/patient" }) }} -{% endblock %} - -{% set currentSection = "vaccinate" %} - - -{% block content %} -
-
-

{{ pageName }}

- - -

You will not be able to see the patient's full vaccination history.

- - - - - - -    - - - - -
-
- - -{% endblock %} diff --git a/app/views/index.html b/app/views/index.html index 38f8f84d..7a7205df 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -66,8 +66,11 @@

Error pages

Messaging