From 4262f0e34605361db942752288f96d48d6919d71 Mon Sep 17 00:00:00 2001 From: Ben Surgison Date: Fri, 20 Jan 2023 12:16:21 +0000 Subject: [PATCH] Move Common templates to the Common templates plugin --- CHANGELOG.md | 12 +- govuk-prototype-kit.config.json | 42 ----- known-plugins.json | 1 + lib/nunjucks/templates/blank-govuk.html | 10 -- lib/nunjucks/templates/blank-unbranded.html | 16 -- lib/nunjucks/templates/check-answers.html | 160 ------------------- lib/nunjucks/templates/confirmation.html | 32 ---- lib/nunjucks/templates/content.html | 27 ---- lib/nunjucks/templates/mainstream-guide.html | 157 ------------------ lib/nunjucks/templates/question.html | 33 ---- lib/nunjucks/templates/start.html | 92 ----------- 11 files changed, 10 insertions(+), 572 deletions(-) delete mode 100644 lib/nunjucks/templates/blank-govuk.html delete mode 100644 lib/nunjucks/templates/blank-unbranded.html delete mode 100644 lib/nunjucks/templates/check-answers.html delete mode 100644 lib/nunjucks/templates/confirmation.html delete mode 100644 lib/nunjucks/templates/content.html delete mode 100644 lib/nunjucks/templates/mainstream-guide.html delete mode 100644 lib/nunjucks/templates/question.html delete mode 100644 lib/nunjucks/templates/start.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 19859056bb..aa51e79c6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ ## Unreleased +### New features + +- [#1915: Move Task list template to Task list plugin](https://github.com/alphagov/govuk-prototype-kit/pull/1915) + The Task list template has been moved to the new + [Task list plugin](https://github.com/alphagov/govuk-prototype-kit-task-list) +- [#1923: Move Common templates to Common templates plugin](https://github.com/alphagov/govuk-prototype-kit/pull/1923) + The Common templates have been moved to the new + [Common templates plugin](https://github.com/alphagov/govuk-prototype-kit-common-templates) + ## 13.2.1 ### Fixes @@ -13,9 +22,6 @@ ### New features - [#1906: Improved messaging when creating a prototype](https://github.com/alphagov/govuk-prototype-kit/pull/1906) -- [#1915: Move Task list template to Task list plugin](https://github.com/alphagov/govuk-prototype-kit/pull/1915) - The Task list template has been moved to the new - [Task list plugin](https://github.com/alphagov/govuk-prototype-kit-task-list) ### Fixes diff --git a/govuk-prototype-kit.config.json b/govuk-prototype-kit.config.json index 005d612e62..c50875bce6 100644 --- a/govuk-prototype-kit.config.json +++ b/govuk-prototype-kit.config.json @@ -14,47 +14,5 @@ "importNunjucksMacrosInto": [ "/lib/nunjucks/govuk-prototype-kit/layouts/govuk-branded.html", "/lib/nunjucks/govuk-prototype-kit/layouts/unbranded.html" - ], - "templates": [ - { - "name": "Blank GOV.UK page", - "path": "/lib/nunjucks/templates/blank-govuk.html", - "type": "nunjucks" - }, - { - "name": "Blank unbranded page", - "path": "/lib/nunjucks/templates/blank-unbranded.html", - "type": "nunjucks" - }, - { - "name": "Start page", - "path": "/lib/nunjucks/templates/start.html", - "type": "nunjucks" - }, - { - "name": "Question page", - "path": "/lib/nunjucks/templates/question.html", - "type": "nunjucks" - }, - { - "name": "Content page", - "path": "/lib/nunjucks/templates/content.html", - "type": "nunjucks" - }, - { - "name": "Check answers page", - "path": "/lib/nunjucks/templates/check-answers.html", - "type": "nunjucks" - }, - { - "name": "Confirmation page", - "path": "/lib/nunjucks/templates/confirmation.html", - "type": "nunjucks" - }, - { - "name": "Mainstream guide page", - "path": "/lib/nunjucks/templates/mainstream-guide.html", - "type": "nunjucks" - } ] } diff --git a/known-plugins.json b/known-plugins.json index bdf93febc1..9338848df4 100644 --- a/known-plugins.json +++ b/known-plugins.json @@ -2,6 +2,7 @@ "plugins": { "available": [ "govuk-frontend", + "@govuk-prototype-kit/common-templates", "@govuk-prototype-kit/step-by-step", "@govuk-prototype-kit/task-list", "hmrc-frontend", diff --git a/lib/nunjucks/templates/blank-govuk.html b/lib/nunjucks/templates/blank-govuk.html deleted file mode 100644 index cc5c6bfad7..0000000000 --- a/lib/nunjucks/templates/blank-govuk.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "layouts/main.html" %} - -{% block pageTitle %} - GOV.UK page template – {{ serviceName }} – GOV.UK Prototype Kit -{% endblock %} - -{% block content %} - - -{% endblock %} diff --git a/lib/nunjucks/templates/blank-unbranded.html b/lib/nunjucks/templates/blank-unbranded.html deleted file mode 100644 index 4848ac81b3..0000000000 --- a/lib/nunjucks/templates/blank-unbranded.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "govuk-prototype-kit/layouts/unbranded.html" %} - -{% block pageTitle %} - Unbranded page template – {{ serviceName }} – GOV.UK Prototype Kit -{% endblock %} - -{% block content %} - -

- Unbranded page template -

-

- This page doesn't use New Transport or display the GOV.UK header and footer. -

- -{% endblock %} diff --git a/lib/nunjucks/templates/check-answers.html b/lib/nunjucks/templates/check-answers.html deleted file mode 100644 index 68243bc29e..0000000000 --- a/lib/nunjucks/templates/check-answers.html +++ /dev/null @@ -1,160 +0,0 @@ -{% extends "layouts/main.html" %} - -{% block pageTitle %} - Check your answers template – {{ serviceName }} – GOV.UK Prototype Kit -{% endblock %} - -{% block beforeContent %} - Back -{% endblock %} - -{% block content %} -
-
- -

Check your answers before sending your application

- -

Personal details

- -
-
-
- Name -
-
- Sarah Philips -
-
- - Change - name - -
-
-
-
- Date of birth -
-
- 5 January 1978 -
-
- - Change - date of birth - -
-
-
-
- Contact information -
-
- 72 Guild Street -
London -
SE23 6FH -
-
- - Change - contact information - -
-
-
-
- Contact details -
-
-

07700 900457

-

sarah.phillips@example.com

-
-
- - Change - contact details - -
-
-
- -

Application details

- -
-
-
- Previous application number -
-
- 502135326 -
-
- - Change - previous application number - -
-
-
-
- Licence type -
-
- For personal use -
-
- - Change - licence type - -
-
-
-
- Home address -
-
- 72 Guild Street -
London -
SE23 6FH -
-
- - Change - home address - -
-
-
-
- Licence period -
-
- Valid for 6 months -
-
- - Change - licence period - -
-
-
- -

Now send your application

- -

By submitting this application you are confirming that, to the best of your knowledge, the details you are providing are correct.

- -
- - - - - -
- -
-
-{% endblock %} diff --git a/lib/nunjucks/templates/confirmation.html b/lib/nunjucks/templates/confirmation.html deleted file mode 100644 index 1fe5c9117e..0000000000 --- a/lib/nunjucks/templates/confirmation.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "layouts/main.html" %} - -{% block pageTitle %} - Confirmation page template – {{ serviceName }} – GOV.UK Prototype Kit -{% endblock %} - -{% block content %} - -
-
- -
-

Application complete

-
- Your reference number
HDJ2123F -
-
- -

- We have sent you a confirmation email. -

- -

What happens next

-

We've sent your application to Hackney Electoral Register Office.

-

They will contact you either to confirm your registration, or to ask for more information.

-

What did you think of this service? (takes 30 seconds)

- - -
-
- -{% endblock %} diff --git a/lib/nunjucks/templates/content.html b/lib/nunjucks/templates/content.html deleted file mode 100644 index f59c62d954..0000000000 --- a/lib/nunjucks/templates/content.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "layouts/main.html" %} - -{% block pageTitle %} - Content page template – {{ serviceName }} – GOV.UK Prototype Kit -{% endblock %} - -{% block beforeContent %} - Back -{% endblock %} - -{% block content %} - -
-
- -

- Heading goes here -

- -

This is a paragraph of text. It explains in more detail what has happened and wraps across several lines.

- -

Read more about this topic.

- -
-
- -{% endblock %} diff --git a/lib/nunjucks/templates/mainstream-guide.html b/lib/nunjucks/templates/mainstream-guide.html deleted file mode 100644 index 0710851b6c..0000000000 --- a/lib/nunjucks/templates/mainstream-guide.html +++ /dev/null @@ -1,157 +0,0 @@ -{% extends "layouts/main.html" %} - -{% block pageTitle %} - Mainstream guide example -{% endblock %} - -{% block header %} - - {{ govukHeader() }} -{% endblock %} - -{% block beforeContent %} -
-
    -
  1. - Home -
    2. -
  2. - Section -
    3. -
  3. - Subsection -
    4. -
-
-{% endblock %} - -{% block content %} - -
-
- -

- Page title -

- - - -
- -
- -
-
- -

- Page content heading -

- -

Content goes here.

- - - -

- - View a printable version of the whole guide - -

- -
- -
- - - -
- - -
- - - - - - - - -{% endblock %} diff --git a/lib/nunjucks/templates/question.html b/lib/nunjucks/templates/question.html deleted file mode 100644 index eff109906e..0000000000 --- a/lib/nunjucks/templates/question.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "layouts/main.html" %} - -{% block pageTitle %} - Question page template – {{ serviceName }} – GOV.UK Prototype Kit -{% endblock %} - -{% block beforeContent %} - Back -{% endblock %} - -{% block content %} - -
-
- -

- Heading or question goes here -

- -
- -

[Insert question content here]

- -

[See the GOV.UK Design System for examples]

- - - -
- -
-
- -{% endblock %} diff --git a/lib/nunjucks/templates/start.html b/lib/nunjucks/templates/start.html deleted file mode 100644 index 28a44043ef..0000000000 --- a/lib/nunjucks/templates/start.html +++ /dev/null @@ -1,92 +0,0 @@ -{% extends "layouts/main.html" %} - -{% block pageTitle %} - Start page template – {{ serviceName }} – GOV.UK Prototype Kit -{% endblock %} - -{% block header %} - - {{ govukHeader() }} -{% endblock %} - -{% block beforeContent %} -
-
    -
  1. - Home -
    2. -
  2. - Section -
    3. -
  3. - Subsection -
    4. -
-
-{% endblock %} - -{% block content %} -
-
- -

- {% if serviceName %} {{ serviceName }} {% endif %} -

- -

Use this service to:

- -
    -
  • do something
    • -
  • update your name, address or other details
    • -
  • do something else
    • -
- -

Registering takes around 5 minutes.

- - - Start now - - - -

Before you start

- -

You can also register by post.

- -

The online service is also available in Welsh (ar gael yn Gymraeg).

- -

You can’t register for this service if you’re in the UK illegally.

- -
- -
- - - -
-
-{% endblock %}