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

@@ -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 %}