darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-12 17:34:16 -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

8
app/templates/components/message-count-label.html
View File

@@ -2,14 +2,6 @@
{{ count|message_count_noun(template_type) }} {{ suffix }}
{%- endmacro %}
{% macro recipient_count_label(count, template_type) -%}
{{ count|recipient_count_label(template_type) }}
{%- endmacro %}
{% macro recipient_count(count, template_type, prefix='') -%}
{{ count|format_thousands }} {{ prefix }} {{ count|recipient_count_label(template_type) }}
{% endmacro %}
{% macro iteration_count(count) -%}
{{ count|iteration_count }}
{% endmacro %}

5
app/templates/partials/check/too-many-messages.html
View File

@@ -1,5 +1,3 @@
{% from "components/message-count-label.html" import recipient_count_label %}
<h1 class='banner-title' data-module="track-error" data-error-type="Trial mode: too many recipients" data-error-label="{{ upload_id }}">
{% if original_file_name %}
Too many recipients
@@ -20,7 +18,6 @@
You can still send {{ remaining_messages|format_thousands }} messages today, but
{% endif %}
‘{{ original_file_name }}’ contains
{{ count_of_recipients|format_thousands }}
{{ recipient_count_label(count_of_recipients, template.template_type) }}.
{{ count_of_recipients|recipient_count(template.template_type) }}.
</p>
{% endif %}

7
app/templates/views/dashboard/_jobs.html
View File

@@ -1,6 +1,6 @@
{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
{% from "components/big-number.html" import big_number -%}
{% from "components/message-count-label.html" import message_count_label, recipient_count_label, iteration_count -%}
{% from "components/message-count-label.html" import message_count_label, iteration_count -%}
<div class='dashboard-table ajax-block-container'>
{% call(item, row_number) list_table(
@@ -86,10 +86,7 @@
{{ big_number(
item.row_count,
smallest=True,
label="saved {}".format(recipient_count_label(
item.row_count,
item.template_type
))
label="saved {}".format(item.row_count|recipient_count_label(item.template_type))
) }}
{% elif item.pdf_letter %}
<p class="govuk-body letter-recipient-summary">

2
app/templates/views/notifications.html
View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/ajax-block.html" import ajax_block %}
{% 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/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}

8
app/templates/views/send-contact-list.html
View File

@@ -1,7 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/big-number.html" import big_number -%}
{% from "components/list.html" import list_of_placeholders %}
{% from "components/message-count-label.html" import recipient_count_label %}
{% from "components/page-header.html" import page_header %}
{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
@@ -56,10 +55,7 @@
{{ big_number(
item.row_count,
smallest=True,
label=recipient_count_label(
item.row_count,
item.template_type
)
label=item.row_count|recipient_count_label(item.template_type),
) }}
{% endcall %}
{% endcall %}
@@ -68,7 +64,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
<p class="govuk-body">
You have not saved any lists of {{ recipient_count_label(99, template.template_type) }} yet.
You have not saved any lists of {{ 99|recipient_count_label(template.template_type) }} yet.
</p>
<p class="govuk-body">
To upload and save an emergency contact list, go to the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.uploads', service_id=current_service.id) }}">uploads</a> page.

3
app/templates/views/send-one-off-letter-address.html
View File

@@ -1,7 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/message-count-label.html" import recipient_count_label %}
{% from "components/textbox.html" import textbox %}
{% from "components/form.html" import form_wrapper %}
@@ -34,7 +33,7 @@
</div>
<p class="govuk-body">
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.send_messages', service_id=current_service.id, template_id=template.id) }}">
Upload a list of {{ recipient_count_label(999, template.template_type) }}
Upload a list of {{ 999|recipient_count_label(template.template_type) }}
</a>
</p>
{{ page_footer('Continue') }}

3
app/templates/views/send-test.html
View File

@@ -1,7 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/message-count-label.html" import recipient_count_label %}
{% from "components/form.html" import form_wrapper %}
{% block service_page_title %}
@@ -27,7 +26,7 @@
{% if skip_link or link_to_upload %}
<div class="govuk-grid-column-full">
{% if link_to_upload %}
<a class="govuk-link govuk-link--no-visited-state govuk-!-margin-right-3" href="{{ url_for('.send_messages', service_id=current_service.id, template_id=template.id) }}">Upload a list of {{ recipient_count_label(999, template.template_type) }}</a>
<a class="govuk-link govuk-link--no-visited-state govuk-!-margin-right-3" href="{{ url_for('.send_messages', service_id=current_service.id, template_id=template.id) }}">Upload a list of {{ 999|recipient_count_label(template.template_type) }}</a>
{% if current_service.contact_lists %}
<a class="govuk-link govuk-link--no-visited-state govuk-!-margin-right-3" href="{{ url_for('.choose_from_contact_list', service_id=current_service.id, template_id=template.id) }}">Use an emergency list</a>
{% endif %}

5
app/templates/views/send.html
View File

@@ -2,17 +2,16 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/file-upload.html" import file_upload %}
{% from "components/message-count-label.html" import recipient_count_label %}
{% from "components/table.html" import list_table, text_field, index_field, index_field_heading %}
{% block service_page_title %}
Upload a list of {{ recipient_count_label(999, template.template_type) }}
Upload a list of {{ 999|recipient_count_label(template.template_type) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
'Upload a list of {}'.format(recipient_count_label(999, template.template_type)),
'Upload a list of {}'.format(999|recipient_count_label(template.template_type)),
back_link=url_for('main.send_one_off', service_id=current_service.id, template_id=template.id)
) }}

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">