darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge from main

Browse Source
This commit is contained in:
Kenneth Kehl
2023-07-13 08:15:34 -07:00
parent c165589d4c 13d0e46b52
commit 00edf5d023
107 changed files with 1471 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/templates/org_nav.html
View File

@@ -1,11 +1,11 @@
<nav class="navigation">
<ul>
<li><a class="govuk-link govuk-link--no-visited-state{{ org_navigation.is_selected('dashboard') }}" href="{{ url_for('.organisation_dashboard', org_id=current_org.id) }}">Usage</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ org_navigation.is_selected('dashboard') }}" href="{{ url_for('.organization_dashboard', org_id=current_org.id) }}">Usage</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ org_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_org_users', org_id=current_org.id) }}">Team members</a></li>
{% if current_user.platform_admin %}
<li><a class="govuk-link govuk-link--no-visited-state{{ org_navigation.is_selected('settings') }}" href="{{ url_for('.organisation_settings', org_id=current_org.id) }}">Settings</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ org_navigation.is_selected('trial-services') }}" href="{{ url_for('.organisation_trial_mode_services', org_id=current_org.id) }}">Trial mode services</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ org_navigation.is_selected('billing') }}" href="{{ url_for('.organisation_billing', org_id=current_org.id) }}">Billing</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ org_navigation.is_selected('settings') }}" href="{{ url_for('.organization_settings', org_id=current_org.id) }}">Settings</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ org_navigation.is_selected('trial-services') }}" href="{{ url_for('.organization_trial_mode_services', org_id=current_org.id) }}">Trial mode services</a></li>
<li><a class="govuk-link govuk-link--no-visited-state{{ org_navigation.is_selected('billing') }}" href="{{ url_for('.organization_billing', org_id=current_org.id) }}">Billing</a></li>
{% endif %}
</ul>
</nav>

2
app/templates/org_template.html
View File

@@ -8,7 +8,7 @@
<div class="grid-container">
<div class="navigation-service">
{% if current_user.platform_admin %}
<a href="{{ url_for('.organisations') }}" class="govuk-link govuk-link--no-visited-state navigation-organisation-link">Organizations</a>
<a href="{{ url_for('.organizations') }}" class="govuk-link govuk-link--no-visited-state navigation-organization-link">Organizations</a>
{% endif %}
<div class="navigation-service-name govuk-!-font-weight-bold">
{{ current_org.name }}

6
app/templates/service_navigation.html
View File

@@ -8,10 +8,10 @@
{% endmacro %}
<div class="navigation-service margin-top-2 display-flex flex-align-end flex-justify">
{% if current_service.organisation_id %}
{% if current_service.organization_id %}
{% if current_user.platform_admin or
(current_user.belongs_to_organisation(current_service.organisation_id) and current_service.live) %}
<a href="{{ url_for('.organisation_dashboard', org_id=current_service.organisation_id) }}" class="govuk-link govuk-link--no-visited-state navigation-organisation-link">{{ current_service.organisation_name }}</a>
(current_user.belongs_to_organization(current_service.organization_id) and current_service.live) %}
<a href="{{ url_for('.organization_dashboard', org_id=current_service.organization_id) }}" class="govuk-link govuk-link--no-visited-state navigation-organization-link">{{ current_service.organization_name }}</a>
{% endif %}
{% endif %}
{{ navigation_service_name(current_service) }}

4
app/templates/support-tickets/branding-request.txt
View File

@@ -1,5 +1,5 @@
Organisation: {% if current_service.organisation -%}
{{ current_service.organisation.name }}
Organization: {% if current_service.organization -%}
{{ current_service.organization.name }}
{%- else -%}
Can’t tell (domain is {{ current_user.email_domain }})
{%- endif %}

16
app/templates/support-tickets/go-live-request.txt
View File

@@ -1,21 +1,21 @@
{% set service = current_service -%}
{% set organisation = service.organisation -%}
{% set organization = service.organization -%}
{% set user = current_user -%}
Service: {{ service.name }}
{{ url_for('main.service_dashboard', service_id=service.id, _external=True) }}
---
Organisation type: {{ service.organisation_type_label }}
{%- if organisation.name %} (organisation is {{ organisation.name }})
Organization type: {{ service.organization_type_label }}
{%- if organization.name %} (organization is {{ organization.name }})
{%- else %} (domain is {{ user.email_domain }})
{%- endif %}.
{%- if organisation.request_to_go_live_notes %} {{ organisation.request_to_go_live_notes }}{% endif %}
{%- if organisation.agreement_signed_by %}
Agreement signed by: {{ organisation.agreement_signed_by.email_address }}
{%- if organization.request_to_go_live_notes %} {{ organization.request_to_go_live_notes }}{% endif %}
{%- if organization.agreement_signed_by %}
Agreement signed by: {{ organization.agreement_signed_by.email_address }}
{% endif -%}
{%- if organisation.agreement_signed_on_behalf_of_email_address -%}
Agreement signed on behalf of: {{ organisation.agreement_signed_on_behalf_of_email_address }}
{%- if organization.agreement_signed_on_behalf_of_email_address -%}
Agreement signed on behalf of: {{ organization.agreement_signed_on_behalf_of_email_address }}
{%- endif %}
Emails in next year: {{ service.volume_email|format_thousands }}

6
app/templates/views/add-service-local.html
View File

@@ -16,9 +16,9 @@
<p class="usa-body">Give your service a name that tells users what your messages are about, as well as who they’re from. For example:</p>
<ul class="govuk-list govuk-list--bullet">
<li>School admissions – {{ current_user.default_organisation.name }}</li>
<li>Electoral services – {{ current_user.default_organisation.name }}</li>
<li>Blue Badge – {{ current_user.default_organisation.name }}</li>
<li>School admissions – {{ current_user.default_organization.name }}</li>
<li>Electoral services – {{ current_user.default_organization.name }}</li>
<li>Blue Badge – {{ current_user.default_organization.name }}</li>
</ul>
<p>You should only use an acronym or initialism if your users are already familiar with it.</p>

4
app/templates/views/add-service.html
View File

@@ -18,8 +18,8 @@
{{ form.name(param_extensions={"hint": {"text": "You can change this later"}}) }}
{% if not default_organisation_type %}
{{ form.organisation_type }}
{% if not default_organization_type %}
{{ form.organization_type }}
{% endif %}
{{ page_footer('Add service') }}

2
app/templates/views/cancelled-invitation.html
View File

@@ -10,7 +10,7 @@
{{ from_user }} decided to cancel this invitation.
</p>
<p>
If you need access to {{ service_name or organisation_name }}, you’ll have to ask them to invite you again.
If you need access to {{ service_name or organization_name }}, you’ll have to ask them to invite you again.
</p>
</div>
</div>

20
app/templates/views/choose-account.html
View File

@@ -4,10 +4,10 @@
{% macro service_list(
heading,
show_heading,
organisations=[],
organizations=[],
services=[]
) %}
{% if show_heading and (services or organisations) %}
{% if show_heading and (services or organizations) %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-quarter">
<h2>
@@ -19,9 +19,9 @@
{% else %}
<ul>
{% endif %}
{% for org in organisations|sort %}
{% for org in organizations|sort %}
<li class="browse-list-item">
<a href="{{ url_for('.organisation_dashboard', org_id=org.id) }}" class="usa-link">{{ org.name }}</a>
<a href="{{ url_for('.organization_dashboard', org_id=org.id) }}" class="usa-link">{{ org.name }}</a>
<p class="browse-list-hint">
{{ org.count_of_live_services }}
live service{% if org.count_of_live_services != 1 %}s{% endif %}
@@ -33,7 +33,7 @@
<a href="{{ url_for('.service_dashboard', service_id=service.id) }}" class="usa-link">{{ service.name }}</a>
</li>
{% endfor %}
{% if show_heading and (services or organisations) %}
{% if show_heading and (services or organizations) %}
</ul>
</div>
</div>
@@ -64,9 +64,9 @@
</div>
<ul class="govuk-grid-column-three-quarters">
<li class="browse-list-item">
<a href="{{ url_for('.organisations') }}" class="usa-link">All organisations</a>
<a href="{{ url_for('.organizations') }}" class="usa-link">All organizations</a>
<p class="browse-list-hint">
{{ org_count|format_thousands }} organisations, {{ live_service_count|format_thousands }} live services
{{ org_count|format_thousands }} organizations, {{ live_service_count|format_thousands }} live services
</p>
</li>
</ul>
@@ -74,11 +74,11 @@
<div class="keyline-block"></div>
{% endif %}
{% if current_user.organisations %}
{% if current_user.organizations %}
{{ service_list(
heading='Live services',
show_heading=current_user.trial_mode_services or current_user.platform_admin,
organisations=current_user.organisations,
organizations=current_user.organizations,
services=current_user.live_services
) }}
{% else %}
@@ -92,7 +92,7 @@
{% if current_user.trial_mode_services %}
{{ service_list(
heading='Trial mode services',
show_heading=(current_user.organisations or current_user.live_services or current_user.platform_admin),
show_heading=(current_user.organizations or current_user.live_services or current_user.platform_admin),
services=current_user.trial_mode_services
) }}
{% endif %}

4
app/templates/views/organisations/add-gp-organisation.html → app/templates/views/organizations/add-gp-organization.html
View File

@@ -15,10 +15,10 @@
{% call form_wrapper() %}
{% call select_wrapper(form.same_as_service_name) %}
{% for option in form.same_as_service_name %}
{{ radio(option, data_target='custom-organisation-name' if option.data == False else '') }}
{{ radio(option, data_target='custom-organization-name' if option.data == False else '') }}
{% endfor %}
{% endcall %}
{% call conditional_radio_panel('custom-organisation-name') %}
{% call conditional_radio_panel('custom-organization-name') %}
{{ form.name }}
{% endcall %}
{{ page_footer('Continue') }}

4
app/templates/views/organisations/add-nhs-local-organisation.html → app/templates/views/organizations/add-nhs-local-organization.html
View File

@@ -17,7 +17,7 @@
{{ page_header(page_title) }}
{% call form_wrapper() %}
<p>
{{ form.organisations.label.text }}
{{ form.organizations.label.text }}
</p>
{{ live_search(
target_selector='.govuk-radios__item',
@@ -26,7 +26,7 @@
label='Search by name',
autofocus=True)
}}
{{ form.organisations }}
{{ form.organizations }}
{{ sticky_page_footer('Continue') }}
{% endcall %}
{% endblock %}

4
app/templates/views/organisations/add-organisation.html → app/templates/views/organizations/add-organization.html
View File

@@ -10,7 +10,7 @@
{% block main %}
<div class="govuk-width-container">
<div class="navigation-service">
<a href="{{ url_for('.organisations') }}" class="govuk-link govuk-link--no-visited-state navigation-service-back-to">All organizations</a>
<a href="{{ url_for('.organizations') }}" class="govuk-link govuk-link--no-visited-state navigation-service-back-to">All organizations</a>
<a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>
</div>
@@ -25,7 +25,7 @@
{{ page_header('New organization') }}
{% call form_wrapper() %}
{{ form.name }}
{{ form.organisation_type }}
{{ form.organization_type }}
{{ page_footer('Save') }}
{% endcall %}
{% endblock %}

6
app/templates/views/organisations/index.html → app/templates/views/organizations/index.html
View File

@@ -14,9 +14,9 @@
<nav class="browse-list">
<ul>
{% for org in organisations|sort %}
{% for org in organizations|sort %}
<li class="browse-list-item">
<a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state">{{ org.name }}</a>
<a href="{{ url_for('main.organization_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state">{{ org.name }}</a>
{% if not org.active %}
<span class="table-field-status-default heading-medium">- archived</span>
{% endif %}
@@ -33,7 +33,7 @@
{{ govukButton({
"element": "a",
"text": "New organization",
"href": url_for('main.add_organisation'),
"href": url_for('main.add_organization'),
"classes": "govuk-button--secondary"
}) }}
</div>

0
app/templates/views/organisations/organisation/billing.html → app/templates/views/organizations/organization/billing.html
View File

4
app/templates/views/organisations/organisation/index.html → app/templates/views/organizations/organization/index.html
View File

@@ -43,7 +43,7 @@
{% if search_form %}
<div class="govuk-!-margin-bottom-5">
{{ live_search(
target_selector='.organisation-service',
target_selector='.organization-service',
show=True,
form=search_form,
label='Search by service'
@@ -54,7 +54,7 @@
<h2 class="heading-small {% if search_form %}visually-hidden{% endif %}">By service</h2>
{% for service in services %}
<div class="keyline-block govuk-!-margin-top-2 organisation-service">
<div class="keyline-block govuk-!-margin-top-2 organization-service">
<h3 class="govuk-!-font-weight-bold govuk-!-font-size-24 govuk-!-margin-bottom-3 govuk-!-margin-top-1 live-search-relevant">
<a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service.service_name }}</a>
</h3>

2
app/templates/views/organisations/organisation/settings/edit-domains.html → app/templates/views/organizations/organization/settings/edit-domains.html
View File

@@ -10,7 +10,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

2
app/templates/views/organisations/organisation/settings/edit-go-live-notes.html → app/templates/views/organizations/organization/settings/edit-go-live-notes.html
View File

@@ -10,7 +10,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

2
app/templates/views/organisations/organisation/settings/edit-name.html → app/templates/views/organizations/organization/settings/edit-name.html
View File

@@ -9,7 +9,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

2
app/templates/views/organisations/organisation/settings/edit-organisation-billing-details.html → app/templates/views/organizations/organization/settings/edit-organization-billing-details.html
View File

@@ -10,7 +10,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

2
app/templates/views/organisations/organisation/settings/edit-organisation-notes.html → app/templates/views/organizations/organization/settings/edit-organization-notes.html
View File

@@ -10,7 +10,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

4
app/templates/views/organisations/organisation/settings/edit-type.html → app/templates/views/organizations/organization/settings/edit-type.html
View File

@@ -9,13 +9,13 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header("Organization sector") }}
{% call form_wrapper() %}
{{ form.organisation_type }}
{{ form.organization_type }}
{{ page_footer('Save') }}
{% endcall %}
{% endblock %}

16
app/templates/views/organisations/organisation/settings/index.html → app/templates/views/organizations/organization/settings/index.html
View File

@@ -19,17 +19,17 @@
{{ text_field(current_org.name) }}
{{ edit_field(
'Change',
url_for('.edit_organisation_name', org_id=current_org.id),
url_for('.edit_organization_name', org_id=current_org.id),
suffix='organization name'
)
}}
{% endcall %}
{% call row() %}
{{ text_field('Sector') }}
{{ optional_text_field(current_org.organisation_type_label) }}
{{ optional_text_field(current_org.organization_type_label) }}
{{ edit_field(
'Change',
url_for('.edit_organisation_type', org_id=current_org.id),
url_for('.edit_organization_type', org_id=current_org.id),
suffix='sector for the organization'
)
}}
@@ -39,7 +39,7 @@
{{ optional_text_field(current_org.request_to_go_live_notes, default='None') }}
{{ edit_field(
'Change',
url_for('.edit_organisation_go_live_notes', org_id=current_org.id),
url_for('.edit_organization_go_live_notes', org_id=current_org.id),
suffix='go live notes for the organization'
)
}}
@@ -50,7 +50,7 @@
{{ optional_text_field(current_org.billing_details, default="None", wrap=True) }}
{{ edit_field(
'Change',
url_for('.edit_organisation_billing_details', org_id=current_org.id),
url_for('.edit_organization_billing_details', org_id=current_org.id),
suffix='billing details for the organization'
)
}}
@@ -61,7 +61,7 @@
{{ optional_text_field(current_org.notes, default="None", wrap=True) }}
{{ edit_field(
'Change',
url_for('.edit_organisation_notes', org_id=current_org.id),
url_for('.edit_organization_notes', org_id=current_org.id),
suffix='the notes for the organization'
)
}}
@@ -72,7 +72,7 @@
{{ text_field(current_org.email_branding_name) }}
{{ edit_field(
'Change',
url_for('.edit_organisation_email_branding', org_id=current_org.id),
url_for('.edit_organization_email_branding', org_id=current_org.id),
suffix='default email branding for the organization'
)
}}
@@ -82,7 +82,7 @@
{{ optional_text_field(current_org.domains or None, default='None') }}
{{ edit_field(
'Change',
url_for('.edit_organisation_domains', org_id=current_org.id),
url_for('.edit_organization_domains', org_id=current_org.id),
suffix='known email domains for the organization'
)
}}

0
app/templates/views/organisations/organisation/settings/preview-email-branding.html → app/templates/views/organizations/organization/settings/preview-email-branding.html
View File

2
app/templates/views/organisations/organisation/settings/set-email-branding.html → app/templates/views/organizations/organization/settings/set-email-branding.html
View File

@@ -12,7 +12,7 @@
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
{{ govukBackLink({ "href": url_for('.organization_settings', org_id=current_org.id) }) }}
{% endblock %}
{% block maincolumn_content %}

0
app/templates/views/organisations/organisation/trial-mode-services.html → app/templates/views/organizations/organization/trial-mode-services.html
View File

4
app/templates/views/organisations/organisation/users/index.html → app/templates/views/organizations/organization/users/index.html
View File

@@ -15,7 +15,7 @@
'Are you sure you want to remove {}?'.format(user_to_remove.name),
type='dangerous',
delete_button='Yes, remove',
action=url_for('.remove_user_from_organisation', org_id=current_org.id, user_id=user_to_remove.id)
action=url_for('.remove_user_from_organization', org_id=current_org.id, user_id=user_to_remove.id)
) }}
{% endif %}
@@ -55,7 +55,7 @@
{% if user.status == 'pending' %}
<a class="govuk-link govuk-link--no-visited-state user-list-edit-link" href="{{ url_for('.cancel_invited_org_user', org_id=current_org.id, invited_user_id=user.id)}}">Cancel invitation<span class="usa-sr-only"> for {{ user.email_address }}</span></a>
{% elif user.status != 'cancelled' %}
<a class="govuk-link govuk-link--destructive user-list-edit-link" href="{{ url_for('.edit_organisation_user', org_id=current_org.id, user_id=user.id)}}">Remove<span class="usa-sr-only"> {{ user.name }} {{ user.email_address }}</span></a>
<a class="govuk-link govuk-link--destructive user-list-edit-link" href="{{ url_for('.edit_organization_user', org_id=current_org.id, user_id=user.id)}}">Remove<span class="usa-sr-only"> {{ user.name }} {{ user.email_address }}</span></a>
{% endif %}
</div>
</div>

0
app/templates/views/organisations/organisation/users/invite-org-user.html → app/templates/views/organizations/organization/users/invite-org-user.html
View File

8
app/templates/views/performance.html
View File

@@ -110,19 +110,19 @@
<div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-one-half">
<span class="usa-sr-only">There are</span>
<div class="product-page-big-number">{{ count_of_live_services_and_organisations.organisations|format_thousands }}</div>
<div class="product-page-big-number">{{ count_of_live_services_and_organizations.organizations|format_thousands }}</div>
organizations
</div>
<div class="govuk-grid-column-one-half">
<span class="usa-sr-only">and</span>
<div class="product-page-big-number">{{ count_of_live_services_and_organisations.services|format_thousands }}</div>
<div class="product-page-big-number">{{ count_of_live_services_and_organizations.services|format_thousands }}</div>
services
<span class="usa-sr-only">using Notify.</span>
</div>
</div>
<div class="dashboard-table">
{% call(item, row_number) list_table(
organisations_using_notify,
organizations_using_notify,
caption='Organizations using Notify',
caption_visible=False,
field_headings=[
@@ -131,7 +131,7 @@
empty_message='No data to show'
) %}
{% call field() %}
{{ item.organisation_name }}
{{ item.organization_name }}
{% endcall %}
{% call field() %}
{{ item.count_of_live_services }}

2
app/templates/views/platform-admin/_base_template.html
View File

@@ -16,7 +16,7 @@
('Summary', url_for('main.platform_admin')),
('Live services', url_for('main.live_services')),
('Trial mode services', url_for('main.trial_services')),
('Organizations', url_for('main.organisations')),
('Organizations', url_for('main.organizations')),
('Providers', url_for('main.view_providers')),
('Reports', url_for('main.platform_admin_reports')),
('Email branding', url_for('main.email_branding')),

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

@@ -60,7 +60,7 @@
<p>We design, build and run our systems to make sure that your data is as safe as possible at any stage, both while it’s
processed and when it’s stored.</p>
<!-- <p>Your personal data will be processed both in the UK and the European Economic Area (EEA). Your data receives the same level of protection in the EEA as it does in the UK through the safeguard of <a class="govuk-link govuk-link--no-visited-state" href="https://ico.org.uk/for-organisations/dp-at-the-end-of-the-transition-period/data-protection-and-the-eu-in-detail/adequacy/">Adequacy Decisions</a>.</p> -->
<!-- <p>Your personal data will be processed both in the UK and the European Economic Area (EEA). Your data receives the same level of protection in the EEA as it does in the UK through the safeguard of <a class="govuk-link govuk-link--no-visited-state" href="https://ico.org.uk/for-organizations/dp-at-the-end-of-the-transition-period/data-protection-and-the-eu-in-detail/adequacy/">Adequacy Decisions</a>.</p> -->
<h2 class="font-body-lg" id="how-we-protect-your-data">How we protect your data and keep it secure</h2>

2
app/templates/views/register-from-org-invite.html
View File

@@ -26,7 +26,7 @@ Create an account
"autocomplete": "new-password"
}) }}
{{ page_footer("Continue") }}
{{form.organisation}}
{{form.organization}}
{{form.email_address}}
{% endcall %}
</div>

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

@@ -72,6 +72,6 @@
<h2 class="font-body-lg" id="classifications-and-security-vetting">Classifications and security vetting</h2>
<p>You can use Notify to send messages classified as ‘OFFICIAL’ or ‘OFFICIAL-SENSITIVE’ under the <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/government/publications/government-security-classifications">Government Security Classifications</a> policy.</p>
<p>Notify does not process data classified as ‘SECRET’ or ‘TOP SECRET’.</p>
<p>The Notify team has Security Check (SC) level clearance from <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/government/organisations/united-kingdom-security-vetting">United Kingdom Security Vetting</a> (UKSV).</p> -->
<p>The Notify team has Security Check (SC) level clearance from <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/government/organizations/united-kingdom-security-vetting">United Kingdom Security Vetting</a> (UKSV).</p> -->
{% endblock %}

14
app/templates/views/service-settings.html
View File

@@ -240,7 +240,7 @@
{% call row() %}
{{ text_field('Live')}}
{% if current_service.trial_mode and not current_service.organisation_id %}
{% if current_service.trial_mode and not current_service.organization_id %}
{{ text_field('No (organization must be set first)') }}
{{ text_field('') }}
{% else %}
@@ -269,20 +269,20 @@
{% call row() %}
{{ text_field('Organization')}}
{% call field() %}
{% if current_service.organisation_id %}
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.organisation_dashboard', org_id=current_service.organisation_id) }}">
{{ current_service.organisation_name }}
{% if current_service.organization_id %}
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.organization_dashboard', org_id=current_service.organization_id) }}">
{{ current_service.organization_name }}
</a>
{% else %}
<span class="table-field-status-default">Not set</span>
{% endif %}
{% if current_service.organisation_type %}
{% if current_service.organization_type %}
<div class="hint">
{{ current_service.organisation_type_label }}
{{ current_service.organization_type_label }}
</div>
{% endif %}
{% endcall %}
{{ edit_field('Change', url_for('.link_service_to_organisation', service_id=current_service.id), suffix='organization for service') }}
{{ edit_field('Change', url_for('.link_service_to_organization', service_id=current_service.id), suffix='organization for service') }}
{% endcall %}
{% call row() %}

2
app/templates/views/service-settings/branding/email-branding-govuk-org.html
View File

@@ -23,7 +23,7 @@
<p>
You cannot use U.S. Notify branding if your organization is
<a class="govuk-link govuk-link--no-visited-state"
href="https://www.gov.uk/government/publications/govuk-proposition/govuk-proposition#organisations-independent-from-government">independent
href="https://www.gov.uk/government/publications/govuk-proposition/govuk-proposition#organizations-independent-from-government">independent
from government</a>.
</p>

2
app/templates/views/service-settings/branding/email-branding-govuk.html
View File

@@ -32,7 +32,7 @@
<p>
You cannot use U.S. Notify branding if your organization is
<a class="govuk-link govuk-link--no-visited-state"
href="https://www.gov.uk/government/publications/govuk-proposition/govuk-proposition#organisations-independent-from-government">independent
href="https://www.gov.uk/government/publications/govuk-proposition/govuk-proposition#organizations-independent-from-government">independent
from government</a>.
</p>

2
app/templates/views/service-settings/branding/email-branding-organisation.html → app/templates/views/service-settings/branding/email-branding-organization.html
View File

@@ -18,7 +18,7 @@
{{ page_header('When you request new branding') }}
<p>We’ll check if we already have the {{organisation}} logo.</p>
<p>We’ll check if we already have the {{organization}} logo.</p>
<p>If we do, we’ll let you know when your new branding is ready to use.</p>

4
app/templates/views/service-settings/link-service-to-organisation.html → app/templates/views/service-settings/link-service-to-organization.html
View File

@@ -25,8 +25,8 @@
autofocus=True
) }}
{% call form_wrapper() %}
{% if has_organisations %}
{{ form.organisations }}
{% if has_organizations %}
{{ form.organizations }}
{{ sticky_page_footer('Save') }}
{% else %}
<p class="hint"> No organizations </p>

6
app/templates/views/service-settings/name-local.html
View File

@@ -18,9 +18,9 @@
<p class="govuk-body">Your service name should tell users what the message is about as well as who it’s from. For example:</p>
<ul class="govuk-list govuk-list--bullet">
<li>School admissions - {{ current_service.organisation.name or current_user.default_organisation.name }}</li>
<li>Electoral services - {{ current_service.organisation.name or current_user.default_organisation.name }}</li>
<li>Blue Badge - {{ current_service.organisation.name or current_user.default_organisation.name }}</li>
<li>School admissions - {{ current_service.organization.name or current_user.default_organization.name }}</li>
<li>Electoral services - {{ current_service.organization.name or current_user.default_organization.name }}</li>
<li>Blue Badge - {{ current_service.organization.name or current_user.default_organization.name }}</li>
</ul>
<p>You should only use an acronym or initialism if your users are already familiar with it.</p>

4
app/templates/views/signedout.html
View File

@@ -112,7 +112,7 @@ U.S. Notify
<div class="grid-row">
<div class="tablet:grid-col-6 display-flex flex-justify-center flex-align-center flex-column">
<span class="usa-sr-only">There are</span>
<div class="large-number">{{ counts.organisations|format_thousands }}</div>
<div class="large-number">{{ counts.organizations|format_thousands }}</div>
<p class="font-body-lg margin-bottom-0">Organizations</p>
</div>
<div class="tablet:grid-col-6 display-flex flex-justify-center flex-align-center flex-column">
@@ -246,7 +246,7 @@ U.S. Notify
<div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-one-half">
<span class="usa-sr-only">There are</span>
<div class="product-page-big-number">{{ counts.organisations|format_thousands }}</div>
<div class="product-page-big-number">{{ counts.organizations|format_thousands }}</div>
<span>organizations</span>
</div>
<div class="govuk-grid-column-one-half">