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

Replace recipient 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:02:09 +00:00
parent 462294c9d1
commit 4615c0ea3d
11 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/views/uploads/contact-list/column-errors.html
View File

@@ -4,7 +4,7 @@
{% 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/back-link/macro.njk" import govukBackLink %}
{% from "components/message-count-label.html" import message_count_label, recipient_count_label %}
{% from "components/message-count-label.html" import message_count_label %}
{% block service_page_title %}
Error
@@ -33,7 +33,7 @@
<h1 class='banner-title' data-module="track-error" data-error-type="Trial mode: bad recipients" data-error-label="{{ upload_id }}">
You cannot save
{{ 'this' if recipients|length == 1 else 'these' }}
{{ recipient_count_label(recipients|length, recipients.template_type) }}
{{ recipients|length|recipient_count_label(recipients.template_type) }}
</h1>
<p class="govuk-body">
In <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.trial_mode_new') }}">trial mode</a> you can only

6
app/templates/views/uploads/contact-list/contact-list.html
View File

@@ -4,7 +4,7 @@
{% from "components/radios.html" import radio_select %}
{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading, row, row_heading %}
{% from "components/page-header.html" import page_header %}
{% from "components/message-count-label.html" import message_count_label, recipient_count, recipient_count_label, iteration_count %}
{% from "components/message-count-label.html" import message_count_label, iteration_count %}
{% from "components/button/macro.njk" import govukButton %}
{% block service_page_title %}
@@ -101,7 +101,7 @@
{% endif %}
<h2 class="govuk-heading-m govuk-!-margin-bottom-2">
{{ recipient_count(contact_list.recipients|length, contact_list.template_type, prefix='saved') }}
{{ contact_list.recipients|length|format_thousands }} saved {{ contact_list.recipients|length|recipient_count_label(contact_list.template_type) }}
</h2>
{% set recipient_column = contact_list.recipients.column_headers[0] %}
@@ -109,7 +109,7 @@
<div class="body-copy-table">
{% call(item, row_number) list_table(
contact_list.recipients.displayed_rows,
caption=recipient_count_label(contact_list.recipients|length, contact_list.template_type)|capitalize,
caption=contact_list.recipients|length|recipient_count_label(contact_list.template_type)|capitalize,
caption_visible=False,
field_headings=[recipient_column],
field_headings_visible=False,

4
app/templates/views/uploads/contact-list/ok.html
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/page-header.html" import page_header %}
{% from "components/message-count-label.html" import message_count_label, recipient_count_label %}
{% from "components/message-count-label.html" import message_count_label %}
{% from "components/button/macro.njk" import govukButton %}
{% block service_page_title %}
@@ -18,7 +18,7 @@
) }}
<p class="govuk-body">
{{ recipients|length|format_thousands }} {{ recipient_count_label(recipients|length, recipients.template_type) }} found
{{ recipients|length|recipient_count(recipients.template_type) }} found
</p>
<div class="bottom-gutter-3-2">