diff --git a/app/templates/views/broadcast/new-broadcast.html b/app/templates/views/broadcast/new-broadcast.html index b41fd3b5b..73d8badfd 100644 --- a/app/templates/views/broadcast/new-broadcast.html +++ b/app/templates/views/broadcast/new-broadcast.html @@ -8,9 +8,11 @@ New alert {% endblock %} -{% block maincolumn_content %} - +{% block backLink %} {{ govukBackLink({ "href": url_for('.broadcast_dashboard', service_id=current_service.id) }) }} +{% endblock %} + +{% block maincolumn_content %} {% call form_wrapper(class="govuk-!-margin-top-3") %} {{ form.content( diff --git a/app/templates/views/broadcast/view-message.html b/app/templates/views/broadcast/view-message.html index 87919ce59..7381609df 100644 --- a/app/templates/views/broadcast/view-message.html +++ b/app/templates/views/broadcast/view-message.html @@ -37,9 +37,11 @@ {% endif %} {% endblock %} -{% block maincolumn_content %} - +{% block backLink %} {{ govukBackLink({ "href": back_link }) }} +{% endblock %} + +{% block maincolumn_content %} {% if broadcast_message.status == 'pending-approval' %} {% if broadcast_message.created_by and broadcast_message.created_by == current_user diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html index e1d61a0f5..d8084654d 100644 --- a/app/templates/views/check/column-errors.html +++ b/app/templates/views/check/column-errors.html @@ -9,9 +9,11 @@ Error {% endblock %} -{% block maincolumn_content %} - +{% block backLink %} {{ govukBackLink({ "href": back_link }) }} +{% endblock %} + +{% block maincolumn_content %}
{% call banner_wrapper(type='dangerous') %} diff --git a/app/templates/views/check/row-errors.html b/app/templates/views/check/row-errors.html index 166692edd..2f28ab991 100644 --- a/app/templates/views/check/row-errors.html +++ b/app/templates/views/check/row-errors.html @@ -9,9 +9,11 @@ Error {% endblock %} -{% block maincolumn_content %} - +{% block backLink %} {{ govukBackLink({ "href": back_link }) }} +{% endblock %} + +{% block maincolumn_content %}
{% call banner_wrapper(type='dangerous') %} diff --git a/app/templates/views/conversations/conversation.html b/app/templates/views/conversations/conversation.html index ff9de9fcd..1b3cf0b6f 100644 --- a/app/templates/views/conversations/conversation.html +++ b/app/templates/views/conversations/conversation.html @@ -7,12 +7,14 @@ Received text message {% endblock %} +{% block backLink %} + {{ govukBackLink({ "href": url_for("main.inbox", service_id=current_service.id) }) }} +{% endblock %} + {% block maincolumn_content %}
- {{ govukBackLink({ "href": url_for("main.inbox", service_id=current_service.id) }) }} -

{{ user_number }} diff --git a/app/templates/views/service-settings/service-set-broadcast-channel.html b/app/templates/views/service-settings/service-set-broadcast-channel.html index b8a07b1d1..526426f3d 100644 --- a/app/templates/views/service-settings/service-set-broadcast-channel.html +++ b/app/templates/views/service-settings/service-set-broadcast-channel.html @@ -7,14 +7,14 @@ Emergency alerts settings {% endblock %} +{% block backLink %} + {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }} +{% endblock %} + {% block maincolumn_content %}
- {{ govukBackLink({ - "text": "Back", - "href": url_for('.service_settings', service_id=current_service.id) - }) }} {% call form_wrapper() %} {{ form.channel(param_extensions={ 'fieldset': { diff --git a/app/templates/views/service-settings/set-service-setting.html b/app/templates/views/service-settings/set-service-setting.html index ce81df5ee..5d902094c 100644 --- a/app/templates/views/service-settings/set-service-setting.html +++ b/app/templates/views/service-settings/set-service-setting.html @@ -7,14 +7,14 @@ {{ title }} {% endblock %} +{% block backLink %} + {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }} +{% endblock %} + {% block maincolumn_content %}
- {{ govukBackLink({ - "text": "Back", - "href": url_for('.service_settings', service_id=current_service.id) - }) }} {% call form_wrapper() %} {{ form.enabled(param_extensions={ "fieldset": { diff --git a/app/templates/views/templates/set-sender.html b/app/templates/views/templates/set-sender.html index 4739a6a50..324918493 100644 --- a/app/templates/views/templates/set-sender.html +++ b/app/templates/views/templates/set-sender.html @@ -7,9 +7,11 @@ {{ sender_context.title }} {% endblock %} -{% block maincolumn_content %} - +{% block backLink %} {{ govukBackLink({ "href": url_for('.view_template', service_id=current_service.id, template_id=template_id) }) }} +{% endblock %} + +{% block maincolumn_content %}
{% call form_wrapper() %} diff --git a/app/templates/views/templates/set-template-sender.html b/app/templates/views/templates/set-template-sender.html index 697bdb67f..18aecdc3a 100644 --- a/app/templates/views/templates/set-template-sender.html +++ b/app/templates/views/templates/set-template-sender.html @@ -9,9 +9,11 @@ {{ page_title }} {% endblock %} -{% block maincolumn_content %} - +{% block backLink %} {{ govukBackLink({ "href": url_for('.view_template', service_id=current_service.id, template_id=template_id) }) }} +{% endblock %} + +{% block maincolumn_content %}
{% call form_wrapper() %} diff --git a/app/templates/views/two-factor-webauthn.html b/app/templates/views/two-factor-webauthn.html index 729e7f07e..0221e553e 100644 --- a/app/templates/views/two-factor-webauthn.html +++ b/app/templates/views/two-factor-webauthn.html @@ -15,9 +15,12 @@ {{ page_title }} {% endblock %} +{% block backLink %} + {{ govukBackLink({ "href": url_for('.user_profile') }) }} +{% endblock %} + {% block maincolumn_content %} - {{ govukBackLink({ "href": url_for('.user_profile') }) }}
{{ page_header(page_title) }} diff --git a/app/templates/views/uploads/contact-list/column-errors.html b/app/templates/views/uploads/contact-list/column-errors.html index 171bc8ee6..d3831908e 100644 --- a/app/templates/views/uploads/contact-list/column-errors.html +++ b/app/templates/views/uploads/contact-list/column-errors.html @@ -9,9 +9,11 @@ Error {% endblock %} -{% block maincolumn_content %} - +{% block backLink %} {{ govukBackLink({ "href": url_for('main.upload_contact_list', service_id=current_service.id) }) }} +{% endblock %} + +{% block maincolumn_content %}
{% call banner_wrapper(type='dangerous') %} diff --git a/app/templates/views/uploads/contact-list/row-errors.html b/app/templates/views/uploads/contact-list/row-errors.html index 25fd995ea..aed033194 100644 --- a/app/templates/views/uploads/contact-list/row-errors.html +++ b/app/templates/views/uploads/contact-list/row-errors.html @@ -9,9 +9,11 @@ Error {% endblock %} -{% block maincolumn_content %} - +{% block backLink %} {{ govukBackLink({ "href": url_for('main.upload_contact_list', service_id=current_service.id) }) }} +{% endblock %} + +{% block maincolumn_content %}
{% call banner_wrapper(type='dangerous') %} diff --git a/app/templates/views/uploads/contact-list/too-many-columns.html b/app/templates/views/uploads/contact-list/too-many-columns.html index 72b254601..3101a600d 100644 --- a/app/templates/views/uploads/contact-list/too-many-columns.html +++ b/app/templates/views/uploads/contact-list/too-many-columns.html @@ -9,9 +9,11 @@ Error {% endblock %} -{% block maincolumn_content %} - +{% block backLink %} {{ govukBackLink({ "href": url_for('main.upload_contact_list', service_id=current_service.id) }) }} +{% endblock %} + +{% block maincolumn_content %}
{% call banner_wrapper(type='dangerous') %} diff --git a/app/templates/views/uploads/preview.html b/app/templates/views/uploads/preview.html index 1c74f6635..52a8afe45 100644 --- a/app/templates/views/uploads/preview.html +++ b/app/templates/views/uploads/preview.html @@ -9,8 +9,11 @@ {{ original_filename }} {% endblock %} -{% block maincolumn_content %} +{% block backLink %} {{ govukBackLink({ "href": url_for('main.upload_letter', service_id=current_service.id) }) }} +{% endblock %} + +{% block maincolumn_content %} {% if status == 'invalid' and message %} {% include "partials/check/letter-validation-failed-banner.html" %} diff --git a/app/templates/views/user-profile/disable-platform-admin-view.html b/app/templates/views/user-profile/disable-platform-admin-view.html index 10888fd0f..ba08d3301 100644 --- a/app/templates/views/user-profile/disable-platform-admin-view.html +++ b/app/templates/views/user-profile/disable-platform-admin-view.html @@ -9,11 +9,14 @@ {{ page_title }} {% endblock %} +{% block backLink %} + {{ govukBackLink({ "href": url_for('.user_profile') }) }} +{% endblock %} + {% block maincolumn_content %}
- {{ govukBackLink({ "href": url_for('.user_profile') }) }} {% call form_wrapper(class="govuk-!-margin-top-3") %} {{ form.enabled(param_extensions={ diff --git a/app/templates/views/user-profile/security-keys.html b/app/templates/views/user-profile/security-keys.html index 95799c710..e1a77aa50 100644 --- a/app/templates/views/user-profile/security-keys.html +++ b/app/templates/views/user-profile/security-keys.html @@ -17,6 +17,10 @@ {{ page_title }} {% endblock %} +{% block backLink %} + {{ govukBackLink({ "href": url_for('.user_profile') }) }} +{% endblock %} + {% block maincolumn_content %} {% set webauthn_button %} @@ -41,8 +45,6 @@ }) }} {% endset %} - - {{ govukBackLink({ "href": url_for('.user_profile') }) }}
{% if credentials %}