diff --git a/app/templates/components/components/alert/README.md b/app/templates/components/components/alert/README.md deleted file mode 100644 index 8e601db74..000000000 --- a/app/templates/components/components/alert/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Error message - -## Installation - -See the [main README quick start guide](https://github.com/alphagov/govuk-frontend#quick-start) for how to install this component. - -## Guidance and Examples - -Find out when to use the error message component in your service in the [GOV.UK Design System](https://design-system.service.gov.uk/components/error-message). - -## Component options - -Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. - -See [options table](https://design-system.service.gov.uk/components/error-message/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/components/alert/macro-options.json b/app/templates/components/components/alert/macro-options.json deleted file mode 100644 index eddcab0d2..000000000 --- a/app/templates/components/components/alert/macro-options.json +++ /dev/null @@ -1,37 +0,0 @@ -[ - { - "name": "text", - "type": "string", - "required": true, - "description": "If `html` is set, this is not required. Text to use within the error message. If `html` is provided, the `text` argument will be ignored." - }, - { - "name": "html", - "type": "string", - "required": true, - "description": "If `text` is set, this is not required. HTML to use within the error message. If `html` is provided, the `text` argument will be ignored." - }, - { - "name": "id", - "type": "string", - "required": false, - "description": "Id attribute to add to the error message span tag." - }, - { - "name": "classes", - "type": "string", - "required": false, - "description": "Classes to add to the error message span tag." - }, - { - "name": "attributes", - "type": "object", - "required": false, - "description": "HTML attributes (for example data attributes) to add to the error message span tag" - }, - { - "name": "visuallyHiddenText", - "type": "string", - "description": "A visually hidden prefix used before the error message. Defaults to \"Error\"." - } -] \ No newline at end of file diff --git a/app/templates/components/components/alert/macro.njk b/app/templates/components/components/alert/macro.njk deleted file mode 100644 index 65a977566..000000000 --- a/app/templates/components/components/alert/macro.njk +++ /dev/null @@ -1,3 +0,0 @@ -{% macro usaAlert(params) %} - {%- include "./template.njk" -%} -{% endmacro %} diff --git a/app/templates/components/components/alert/template.njk b/app/templates/components/components/alert/template.njk deleted file mode 100644 index d89405e64..000000000 --- a/app/templates/components/components/alert/template.njk +++ /dev/null @@ -1,18 +0,0 @@ -{%- if params.slim %} -
-
-

- {{params.text}} -

-
-
-{% else %} -
-
- {{params.heading}} -

- {{params.text | safe }} -

-
-
-{% endif %} diff --git a/app/templates/views/check/row-errors.html b/app/templates/views/check/row-errors.html index aadbad7c2..9d9a2edc1 100644 --- a/app/templates/views/check/row-errors.html +++ b/app/templates/views/check/row-errors.html @@ -4,7 +4,6 @@ {% from "components/table.html" import mapping_table, row, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} {% from "components/components/back-link/macro.njk" import usaBackLink %} -{% from "components/components/alert/macro.njk" import usaAlert %} {% block service_page_title %} Error diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html index 47ddb2379..97eac73dc 100644 --- a/app/templates/views/edit-sms-template.html +++ b/app/templates/views/edit-sms-template.html @@ -4,7 +4,6 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} {% from "components/components/back-link/macro.njk" import usaBackLink %} -{% from "components/components/alert/macro.njk" import usaAlert %} {% block service_page_title %} {{ heading_action }} text message template diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 70d7cbca1..e1e99f527 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -4,7 +4,6 @@ {% from "components/form.html" import form_wrapper %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} -{% from "components/components/alert/macro.njk" import usaAlert %} {% extends "withnav_template.html" %} @@ -23,7 +22,7 @@

Every message starts with a template. You can change it later. - + {% if current_user.has_permissions('manage_templates') %} You need a template before you can {% else %} @@ -36,11 +35,13 @@

- {{ usaAlert({ - "text": "Every message starts with a template. To send, choose or create a template.", - "slim": true, - "type": "info", - }) }} +
+
+

+ Every message starts with a template. To send, choose or create a template. +

+
+
{{ folder_path( folders=template_folder_path, service_id=current_service.id,