Replace all existing back-links with component

Includes:
- all existing macros
- all imports for the existing macros
This commit is contained in:
Tom Byers
2019-11-29 09:02:16 +00:00
parent ff53b9f34f
commit e5bc33be84
5 changed files with 16 additions and 20 deletions

View File

@@ -1,19 +1,14 @@
{% from "components/back-link/macro.njk" import govukBackLink %}
{% macro page_header(
h1,
back_link=None
) %}
{% if back_link %}
{{ govuk_back_link(back_link) }}
{{ govukBackLink({ "href": back_link }) }}
{% endif %}
<h1 class="heading-large">{{ h1 }}</h1>
{% endmacro %}
{% macro govuk_back_link(back_link) %}
<a class="govuk-back-link" href="{{ back_link }}">Back</a>
{% endmacro %}

View File

@@ -3,7 +3,7 @@
{% from "components/radios.html" import radio_select %}
{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %}
{% from "components/file-upload.html" import file_upload %}
{% from "components/page-header.html" import govuk_back_link %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% from "components/message-count-label.html" import message_count_label %}
{% set file_contents_header_id = 'file-preview' %}
@@ -19,7 +19,7 @@
{% block maincolumn_content %}
{{ govuk_back_link(back_link) }}
{{ govukBackLink({ "href": back_link }) }}
<div class="bottom-gutter-1-2">
{% call banner_wrapper(type='dangerous') %}

View File

@@ -3,7 +3,7 @@
{% from "components/radios.html" import radio_select %}
{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %}
{% from "components/file-upload.html" import file_upload %}
{% from "components/page-header.html" import govuk_back_link %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% from "components/message-count-label.html" import message_count_label %}
{% set file_contents_header_id = 'file-preview' %}
@@ -19,7 +19,7 @@
{% block maincolumn_content %}
{{ govuk_back_link(back_link) }}
{{ govukBackLink({ "href": back_link }) }}
<div class="bottom-gutter-1-2">
{% call banner_wrapper(type='dangerous') %}

View File

@@ -1,7 +1,8 @@
{% extends "withnav_template.html" %}
{% from "components/banner.html" import banner_wrapper %}
{% from "components/message-count-label.html" import message_count_label %}
{% from "components/page-header.html" import govuk_back_link, page_header %}
{% from "components/page-header.html" import page_header %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
{{ "Error" if error else "Preview of {}".format(template.name) }}
@@ -9,7 +10,7 @@
{% block maincolumn_content %}
{% if template.template_type == 'letter' and current_service.trial_mode %}
{{ govuk_back_link(back_link) }}
{{ govukBackLink({ "href": back_link }) }}
{% set error = 'trial-mode-letters' %}
<div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %}
@@ -21,7 +22,7 @@
{% endcall %}
</div>
{% elif error == 'not-allowed-to-send-to' %}
{{ govuk_back_link(back_link) }}
{{ govukBackLink({ "href": back_link }) }}
<div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %}
{% with
@@ -35,7 +36,7 @@
{% endcall %}
</div>
{% elif error == 'too-many-messages' %}
{{ govuk_back_link(back_link) }}
{{ govukBackLink({ "href": back_link }) }}
<div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %}
{% include "partials/check/too-many-messages.html" %}
@@ -43,7 +44,7 @@
</div>
{% elif error == 'message-too-long' %}
{# the only row_errors we can get when sending one off messages is that the message is too long #}
{{ govuk_back_link(back_link) }}
{{ govukBackLink({ "href": back_link }) }}
<div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %}
{% include "partials/check/message-too-long.html" %}
@@ -51,7 +52,7 @@
</div>
{% elif letter_too_long %}
{% set error = 'letter-too-long' %}
{{ govuk_back_link(back_link) }}
{{ govukBackLink({ "href": back_link }) }}
<div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %}
{% include "partials/check/letter-too-long.html" %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/radios.html" import radios %}
{% from "components/page-header.html" import govuk_back_link %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% from "components/file-upload.html" import file_upload %}
{% block service_page_title %}
@@ -11,7 +11,7 @@
{% endblock %}
{% block maincolumn_content %}
{{ govuk_back_link(url_for('main.upload_letter', service_id=current_service.id)) }}
{{ govukBackLink({ "href": url_for('main.upload_letter', service_id=current_service.id) }) }}
{% if status == 'invalid' and message %}
{% include "partials/check/letter-validation-failed-banner.html" %}