Committing before merge

This commit is contained in:
Jonathan Bobel
2023-08-30 11:07:38 -04:00
parent 32083dff99
commit b1c6a768ec
123 changed files with 257 additions and 257 deletions

View File

@@ -1,5 +1,5 @@
{% from "components/form.html" import form_wrapper %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% macro banner(body, type=None, with_tick=False, delete_button=None, subhead=None, context=None, action=None, id=None, thing=None) %}
<div
@@ -24,7 +24,7 @@
{% if delete_button %}
{% call form_wrapper(action=action) %}
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
{{ govukButton({
{{ usaButton({
"text": "" if thing else delete_button,
"html": delete_button + "<span class=\"usa-sr-only\"> " + thing + "</span>" if thing else "",
"name": "delete",

View File

@@ -1,3 +1,3 @@
{% macro govukBackLink(params) %}
{% macro usaBackLink(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,3 +1,3 @@
{% macro govukButton(params) %}
{% macro usaButton(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,3 +1,3 @@
{% macro govukCheckboxes(params) %}
{% macro usaCheckboxes(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,3 +1,3 @@
{% macro govukDetails(params) %}
{% macro usaDetails(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,10 +1,10 @@
<details {%- if params.id %} id="{{params.id}}"{% endif %} class="govuk-details margin-bottom-1 {%- if params.classes %} {{ params.classes }}{% endif %}" {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %} {{- " open" if params.open }}>
<summary class="govuk-details__summary">
<span class="govuk-details__summary-text">
<summary class="usa-details__summary">
<span class="usa-details__summary-text">
{{ params.summaryHtml | safe if params.summaryHtml else params.summaryText }}
</span>
</summary>
<div class="govuk-details__text">
<div class="usa-details__text">
{{ params.html | safe if params.html else params.text }}
</div>
</details>

View File

@@ -1,3 +1,3 @@
{% macro govukErrorMessage(params) %}
{% macro usaErrorMessage(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,4 +1,4 @@
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% macro file_upload(
field,
@@ -39,6 +39,6 @@
{% endif %}
<label class="file-upload-filename" for="{{ field.name }}"></label>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
{{ govukButton({ "text": "Submit", "classes": "file-upload-submit" }) }}
{{ usaButton({ "text": "Submit", "classes": "file-upload-submit" }) }}
</form>
{% endmacro %}

View File

@@ -1,4 +1,4 @@
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% macro page_footer(
button_text=None,
@@ -27,7 +27,7 @@
}) %}
{% endif %}
{{ govukButton(button_data) }}
{{ usaButton(button_data) }}
{% endif %}
{% if delete_link %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/table.html" import mapping_table, row, text_field, edit_field, optional_text_field with context %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Callbacks
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.api_integration', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.api_integration', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Callbacks for delivery receipts
@@ -10,7 +10,7 @@
{% block backLink %}
{{ govukBackLink({ "href": url_for(back_link, service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for(back_link, service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Callbacks for received text messages
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.api_callbacks', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.api_callbacks', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -5,14 +5,14 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/list-entry.html" import list_entry %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Guest list
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.api_integration', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.api_integration', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,15 +1,15 @@
{% extends "withnav_template.html" %}
{% from "components/table.html" import list_table, field, hidden_field_heading %}
{% from "components/page-header.html" import page_header %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/button/macro.njk" import usaButton %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
API keys
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.api_integration', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.api_integration', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}
@@ -57,7 +57,7 @@
</div>
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Create an API key",
"href": url_for('.create_api_key', service_id=current_service.id),

View File

@@ -3,14 +3,14 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/banner.html" import banner_wrapper %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Create an API key
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.api_keys', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.api_keys', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,14 +3,14 @@
{% 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/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Error
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": back_link }) }}
{{ usaBackLink({ "href": back_link }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,9 +2,9 @@
{% from "components/banner.html" import banner_wrapper %}
{% 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/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% from "components/components/skip-link/macro.njk" import govukSkipLink %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% set file_contents_header_id = 'file-preview' %}
@@ -14,7 +14,7 @@
{% block backLink %}
{{ govukBackLink({ "href": back_link }) }}
{{ usaBackLink({ "href": back_link }) }}
{% endblock %}
{% block maincolumn_content %}
@@ -44,7 +44,7 @@
{% set button_text %}
Send {{ count_of_recipients|message_count(template.template_type) }}
{% endset %}
{{ govukButton({ "text": button_text }) }}
{{ usaButton({ "text": button_text }) }}
</form>
</div>

View File

@@ -3,14 +3,14 @@
{% from "components/radios.html" import radio_select %}
{% from "components/table.html" import mapping_table, row, field, text_field, index_field, hidden_field_heading %}
{% from "components/file-upload.html" import file_upload %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Error
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": back_link }) }}
{{ usaBackLink({ "href": back_link }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,5 +1,5 @@
{% extends "withoutnav_template.html" %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% macro service_list(
heading,
@@ -108,7 +108,7 @@
</div>
<div class="govuk-grid-column-three-quarters">
{% endif %}
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Add a new service",
"href": url_for('.add_service'),

View File

@@ -1,5 +1,5 @@
{% from "components/ajax-block.html" import ajax_block %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% extends "withnav_template.html" %}
@@ -8,7 +8,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for("main.inbox", service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for("main.inbox", service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,7 +1,7 @@
{% extends "withnav_template.html" %}
{% from "components/ajax-block.html" import ajax_block %}
{% from "components/page-header.html" import page_header %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Received text messages
@@ -9,7 +9,7 @@
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_dashboard', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_dashboard', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ heading_action }} email template
{% endblock %}
{% block backLink %}
{{ govukBackLink({
{{ usaBackLink({
"href": url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
}) }}
{% endblock %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ heading_action }} text message template
{% endblock %}
{% block backLink %}
{{ govukBackLink({
{{ usaBackLink({
"href": url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id) if template_folder_id else url_for('main.choose_template', service_id=current_service.id)
}) }}
{% endblock %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/banner.html" import banner %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ user.name or user.email_localpart }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.manage_users', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.manage_users', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ '{} email branding'.format('Update' if email_branding else 'Create')}}
@@ -11,7 +11,7 @@
{% block backLink %}
{{ govukBackLink({ "href": url_for('.email_branding') }) }}
{{ usaBackLink({ "href": url_for('.email_branding') }) }}
{% endblock %}
{% block platform_admin_content %}

View File

@@ -1,7 +1,7 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/live-search.html" import live_search %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% set page_title = "Email branding" %}
@@ -25,7 +25,7 @@
</ul>
</nav>
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "New brand",
"href": url_for('.create_email_branding'),

View File

@@ -1,5 +1,5 @@
{% extends "withoutnav_template.html" %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block per_page_title %}
Resend email link
@@ -13,7 +13,7 @@
<p>Emails sometimes take a few minutes to arrive. If you do not receive an email link, Notify can send you a new one.</p>
<p>
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Resend email link",
"href": url_for('main.resend_email_link', next=redirect_url)

View File

@@ -1,7 +1,7 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block per_page_title %}
Find services by name
@@ -22,7 +22,7 @@
"label": {"text": "Find services by name, partial name, or service ID"}
}) }}
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
{{ govukButton({
{{ usaButton({
"text": "Search",
"classes": "usa-button search-form__button"
}) }}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block per_page_title %}
Set auth type for {{ user.name }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.user_information', user_id=user.id) }) }}
{{ usaBackLink({ "href": url_for('main.user_information', user_id=user.id) }) }}
{% endblock %}
{% block platform_admin_content %}

View File

@@ -1,7 +1,7 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block per_page_title %}
Find users by email
@@ -22,7 +22,7 @@
"label": {"text": "Find users by email, or by partial email"}
}) }}
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
{{ govukButton({
{{ usaButton({
"text": "Search",
"classes": "search-form__button"
}) }}

View File

@@ -1,7 +1,7 @@
{% extends "content_template.html" %}
{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
{% from "components/sub-navigation.html" import sub_navigation %}
{% from "components/components/details/macro.njk" import govukDetails %}
{% from "components/components/details/macro.njk" import usaDetails %}
{% block per_page_title %}
Get started

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Invite a team member
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.manage_users', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.manage_users', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,7 +3,7 @@
{% from "components/ajax-block.html" import ajax_block %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ job.original_file_name }}

View File

@@ -1,6 +1,6 @@
{% from "components/previous-next-navigation.html" import previous_next_navigation %}
{% extends "withnav_template.html" %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block service_page_title %}
Uploads

View File

@@ -1,7 +1,7 @@
{% extends "withnav_template.html" %}
{% from "components/tick-cross.html" import tick_cross %}
{% from "components/live-search.html" import live_search %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block service_page_title %}
Team members
@@ -86,7 +86,7 @@
{% if current_user.has_permissions('manage_service') %}
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Invite a team member",
"href": url_for('.invite_user', service_id=current_service.id),

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block per_page_title %}
Confirm change of email address
@@ -10,7 +10,7 @@
{% block backLink %}
{{ govukBackLink({ "href": url_for('.edit_user_email', service_id=service_id, user_id=user.id) }) }}
{{ usaBackLink({ "href": url_for('.edit_user_email', service_id=service_id, user_id=user.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block per_page_title %}
Confirm change of mobile number
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.edit_user_mobile_number', service_id=service_id, user_id=user.id) }) }}
{{ usaBackLink({ "href": url_for('.edit_user_mobile_number', service_id=service_id, user_id=user.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block per_page_title %}
Change team members email address
@@ -10,7 +10,7 @@
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id) }) }}
{{ usaBackLink({ "href": url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block per_page_title %}
Change team members mobile number
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id) }) }}
{{ usaBackLink({ "href": url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% set page_title = (
(99|message_count_label(message_type, suffix='')) | capitalize

View File

@@ -1,15 +1,15 @@
{% extends "withnav_template.html" %}
{% from "components/banner.html" import banner_wrapper %}
{% from "components/page-header.html" import page_header %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block service_page_title %}
{{ "Error" if error else "Preview of {}".format(template.name) }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": back_link }) }}
{{ usaBackLink({ "href": back_link }) }}
{% endblock %}
{% block maincolumn_content %}
@@ -55,7 +55,7 @@
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
{% if not error %}
{% set button_text %}Send 1 {{ 1|message_count_label(template.template_type, suffix='') }}{% endset %}
{{ govukButton({ "text": button_text }) }}
{{ usaButton({ "text": button_text }) }}
{% endif %}
</form>
</div>

View File

@@ -3,7 +3,7 @@
{% from "components/ajax-block.html" import ajax_block %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ 1|message_count_label(template.template_type, suffix='') | capitalize }}
@@ -11,7 +11,7 @@
{% block backLink %}
{% if back_link %}
{{ govukBackLink({ "href": back_link }) }}
{{ usaBackLink({ "href": back_link }) }}
{% endif %}
{% endblock %}

View File

@@ -4,11 +4,11 @@
{% from "components/radios.html" import radio, conditional_radio_panel %}
{% from "components/select-input.html" import select_wrapper %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/live-search.html" import live_search %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block per_page_title %}
{{ page_title }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,6 +1,6 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/live-search.html" import live_search %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block per_page_title %}
Organizations
@@ -30,7 +30,7 @@
</nav>
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "New organization",
"href": url_for('main.add_organization'),

View File

@@ -3,14 +3,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/list-entry.html" import list_entry %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block org_page_title %}
Known email domains
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{{ usaBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
{% from "components/textbox.html" import textbox %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block org_page_title %}
Edit request to go live notes
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{{ usaBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block org_page_title %}
Change organization name
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{{ usaBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/textbox.html" import textbox %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block org_page_title %}
Edit organization billing details
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{{ usaBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/textbox.html" import textbox %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block org_page_title %}
Edit organization notes
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{{ usaBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block org_page_title %}
Organization sector
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{{ usaBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,6 +1,6 @@
{% extends "org_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% from "components/branding-preview.html" import email_branding_preview %}
{% block org_page_title %}
@@ -17,7 +17,7 @@
<div class="form-group">
{{ form.hidden_tag() }}
<div class="page-footer">
{{ govukButton({ "text": "Save" }) }}
{{ usaButton({ "text": "Save" }) }}
</div>
</div>
{% endcall %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/live-search.html" import live_search %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% set page_title = "Default email branding" %}
@@ -12,7 +12,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{{ usaBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,7 +2,7 @@
{% from "components/table.html" import list_table, row, field, hidden_field_heading %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/live-search.html" import live_search %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block org_page_title %}
Team members
@@ -64,7 +64,7 @@
</div>
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Invite team member",
"href": url_for('.invite_org_user', org_id=current_org.id),

View File

@@ -3,14 +3,14 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Invite a team member
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.manage_org_users', org_id=current_org.id) }) }}
{{ usaBackLink({ "href": url_for('.manage_org_users', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,8 +2,8 @@
{% from "components/big-number.html" import big_number_simple %}
{% from "components/status-box.html" import status_box %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/details/macro.njk" import govukDetails %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/details/macro.njk" import usaDetails %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block per_page_title %}
Summary
@@ -20,11 +20,11 @@
{{ form.start_date(param_extensions={"hint": {"text":"Enter start date in format YYYY-MM-DD"}}) }}
{{ form.end_date(param_extensions={"hint": {"text":"Enter end date in format YYYY-MM-DD"}}) }}
</br>
{{ govukButton({ "text": "Filter", "classes": "margin-y-2" }) }}
{{ usaButton({ "text": "Filter", "classes": "margin-y-2" }) }}
{% endcall %}
{% endset %}
{{ govukDetails({
{{ usaDetails({
"summaryText": "Apply filters",
"html": details_content,
"open": form.errors | convert_to_boolean

View File

@@ -3,8 +3,8 @@
{% from "components/big-number.html" import big_number, big_number_with_status %}
{% from "components/table.html" import mapping_table, field, stats_fields, row_group, row, right_aligned_field_heading, hidden_field_heading, text_field %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/details/macro.njk" import govukDetails %}
{% from "components/components/button/macro.njk" import usaButton %}
{% from "components/components/details/macro.njk" import usaDetails %}
{% macro services_table(services, caption) %}
{% call(item, row_number) mapping_table(
@@ -67,11 +67,11 @@
{{ form.start_date(param_extensions={"hint": {"text": "Enter start date in format YYYY-MM-DD"}}) }}
{{ form.end_date(param_extensions={"hint": {"text": "Enter end date in format YYYY-MM-DD"}}) }}
{{ form.include_from_test_key }}
{{ govukButton({ "text": "Filter", "classes": "margin-y-2" }) }}
{{ usaButton({ "text": "Filter", "classes": "margin-y-2" }) }}
{% endcall %}
{% endset %}
{{ govukDetails({
{{ usaDetails({
"summaryText": "Apply filters",
"html": details_content
}) }}

View File

@@ -1,7 +1,7 @@
{% from "components/content-metadata.html" import content_metadata %}
{% from "components/table.html" import mapping_table, row, text_field, field, row_heading %}
{% from "components/live-search.html" import live_search %}
{% from "components/components/details/macro.njk" import govukDetails %}
{% from "components/components/details/macro.njk" import usaDetails %}
{% extends "content_template.html" %}
@@ -169,7 +169,7 @@ Notify.gov team.
{% endcall %}
</div>
{% endset %}
{{ govukDetails({
{{ usaDetails({
"summaryText": "Accented characters that affect text message charges",
"html": accentedChars
}) }}
@@ -229,7 +229,7 @@ Notify.gov team.
</div>
{% endset %}
{{ govukDetails({
{{ usaDetails({
"summaryText": "International text message rates",
"id": "sms-pricing-details",
"html": smsIntRates

View File

@@ -2,14 +2,14 @@
{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block per_page_title %}
{{ provider_versions[0].display_name }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.view_providers') }) }}
{{ usaBackLink({ "href": url_for('main.view_providers') }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ page_title }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": back_link }) }}
{{ usaBackLink({ "href": back_link }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/file-upload.html" import file_upload %}
{% from "components/table.html" import list_table, text_field, index_field, index_field_heading %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Upload a list of {{ 999|recipient_count_label(template.template_type) }}
@@ -11,7 +11,7 @@
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.send_one_off', service_id=current_service.id, template_id=template.id) }) }}
{{ usaBackLink({ "href": url_for('main.send_one_off', service_id=current_service.id, template_id=template.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
@@ -9,7 +9,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({
{{ usaBackLink({
"href": url_for('.email_branding_request', service_id=current_service.id)
}) }}
{% endblock %}

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
{% from "components/branding-preview.html" import email_branding_preview %}
@@ -10,7 +10,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({
{{ usaBackLink({
"href": url_for('.email_branding_request', service_id=current_service.id)
}) }}
{% endblock %}

View File

@@ -5,7 +5,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% from "components/branding-preview.html" import email_branding_preview %}
{% block service_page_title %}
@@ -13,7 +13,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({
{{ usaBackLink({
"href": url_for('.service_settings', service_id=current_service.id)
}) }}
{% endblock %}

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
@@ -9,7 +9,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({
{{ usaBackLink({
"href": url_for('.email_branding_request', service_id=current_service.id)
}) }}
{% endblock %}

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/textbox.html" import textbox %}
{% from "components/components/textarea/macro.njk" import govukTextarea %}
@@ -16,7 +16,7 @@
{% endif %}
{% block backLink %}
{{ govukBackLink({"href": back_url}) }}
{{ usaBackLink({"href": back_url}) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ heading }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/table.html" import mapping_table, row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block service_page_title %}
Data retention
@@ -15,7 +15,7 @@
</h1>
</div>
<div class="govuk-grid-column-one-third">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Add data retention",
"href": url_for('.add_data_retention', service_id=current_service.id),

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Set data retention
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.add_data_retention', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.add_data_retention', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Set data retention
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.edit_data_retention', service_id=current_service.id, data_retention_id=data_retention_id) }) }}
{{ usaBackLink({ "href": url_for('.edit_data_retention', service_id=current_service.id, data_retention_id=data_retention_id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% from "components/textbox.html" import textbox %}
{% block service_page_title %}
@@ -12,7 +12,7 @@
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/textbox.html" import textbox %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Edit service notes
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,7 +1,7 @@
{% from "components/banner.html" import banner, banner_wrapper %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
<div class="ajax-block-container">
{% if verification_status == "pending" %}
@@ -18,7 +18,7 @@
{% elif verification_status == "success" %}
{{ banner("{} is ready to use".format(reply_to_email_address), type='default', with_tick=True) }}
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Continue",
"href": url_for('.service_email_reply_to', service_id=service_id)

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Add reply-to email address
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_email_reply_to', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_email_reply_to', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Change reply-to email address
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_email_reply_to', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_email_reply_to', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/ajax-block.html" import ajax_block %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ verb }} email reply-to address
@@ -16,7 +16,7 @@
{% set back_link_href = url_for('.service_add_email_reply_to', service_id=service_id) %}
{% endif %}
{{ govukBackLink({ "href": back_link_href }) }}
{{ usaBackLink({ "href": back_link_href }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,15 +2,15 @@
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
{% from "components/page-header.html" import page_header %}
{% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/button/macro.njk" import usaButton %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Reply-to email addresses
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}
@@ -57,7 +57,7 @@
<div class="govuk-grid-column-full">
{% if current_user.has_permissions('manage_service') %}
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Add reply-to email address",
"href": url_for('.service_add_email_reply_to', service_id=current_service.id),

View File

@@ -3,14 +3,14 @@
{% from "components/form.html" import form_wrapper %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Tell us how many messages you expect to send
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/live-search.html" import live_search %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% set page_title = "Link service to organization" %}
@@ -12,7 +12,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Change your service name
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Change your service name
@@ -11,7 +11,7 @@
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% from "components/branding-preview.html" import email_branding_preview %}
{% block service_page_title %}
@@ -17,7 +17,7 @@
<div class="form-group">
{{ form.hidden_tag() }}
<div class="page-footer">
{{ govukButton({ "text": "Save" }) }}
{{ usaButton({ "text": "Save" }) }}
</div>
</div>
{% endcall %}

View File

@@ -3,14 +3,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/task-list.html" import task_list_wrapper, task_list_item %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Before you request to go live
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -4,14 +4,14 @@
{% from "components/radios.html" import radio %}
{% from "components/select-input.html" import select_wrapper %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Send files by email
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,14 +1,14 @@
{% extends "withnav_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Sign-in method
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,12 +3,12 @@
{% from "components/page-footer.html" import page_footer, sticky_page_footer %}
{% from "components/live-search.html" import live_search %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% set page_title = "Set email branding" %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block service_page_title %}

View File

@@ -2,14 +2,14 @@
{% from "components/form.html" import form_wrapper %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Send emails
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Free text message allowance
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% set page_title = 'Set inbound number' %}
@@ -11,7 +11,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,14 +1,14 @@
{% extends "withnav_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Receive text messages
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Send international text messages
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Daily message limit
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Rate limit
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -1,14 +1,14 @@
{% extends "withnav_template.html" %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
{{ title }}
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/form.html" import form_wrapper %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Send text messages
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Start text messages with service name
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -2,14 +2,14 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Add text message sender
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_sms_senders', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_sms_senders', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Change text message sender
@@ -11,7 +11,7 @@
{% block backLink %}
{% if not request.args.get('from_template') %}
{{ govukBackLink({ "href": url_for('.service_sms_senders', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('.service_sms_senders', service_id=current_service.id) }) }}
{% endif %}
{% endblock %}

View File

@@ -2,15 +2,15 @@
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
{% from "components/page-header.html" import page_header %}
{% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context%}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/back-link/macro.njk" import govukBackLink %}
{% from "components/components/button/macro.njk" import usaButton %}
{% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %}
Text message senders
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{{ usaBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}
@@ -55,7 +55,7 @@
{% if current_user.has_permissions('manage_service') %}
<div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-full">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Add text message sender",
"href": url_for('.service_add_sms_sender', service_id=current_service.id)

View File

@@ -1,5 +1,5 @@
{% extends "fullwidth_template.html" %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% block meta %}
<meta name="description"
@@ -158,7 +158,7 @@ Notify.gov
Try Notify.gov now if you work in federal, state, or local government.
</p>
<div class="button-container">
{{ govukButton({
{{ usaButton({
"element": "a",
"text": "Create an account",
"classes": "product-page-button button-container__button govuk-!-margin-right-3",

Some files were not shown because too many files have changed in this diff Show More