darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-02 17:48:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace message count macros with formatters

Browse Source 
We prefer formatters now. Removing uses of the aliasing macro lets
remove it entirely.
This commit is contained in:
Chris Hill-Scott
2021-01-06 13:41:16 +00:00
parent 0327ece7ad
commit 24b579418f
34 changed files with 36 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/templates/views/notifications/check.html
View File

@@ -1,6 +1,5 @@
{% 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 page_header %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% from "components/button/macro.njk" import govukButton %}
@@ -77,7 +76,7 @@
)}}" class='page-footer'>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
{% if not error %}
{% set button_text %}Send 1 {{ message_count_label(1, template.template_type, suffix='') }}{% endset %}
{% set button_text %}Send 1 {{ 1|message_count_label(template.template_type, suffix='') }}{% endset %}
{{ govukButton({ "text": button_text }) }}
{% endif %}
{% if template.template_type == 'letter' %}

5
app/templates/views/notifications/notification.html
View File

@@ -1,18 +1,17 @@
{% extends "withnav_template.html" %}
{% from "components/banner.html" import banner %}
{% from "components/ajax-block.html" import ajax_block %}
{% from "components/message-count-label.html" import message_count_label %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% block service_page_title %}
{{ message_count_label(1, template.template_type, suffix='') | capitalize }}
{{ 1|message_count_label(template.template_type, suffix='') | capitalize }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
message_count_label(1, template.template_type, suffix='') | capitalize,
1|message_count_label(template.template_type, suffix='') | capitalize,
back_link=back_link
) }}
<p class="govuk-body">