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

a few more organisation edits

Browse Source
This commit is contained in:
stvnrlly
2023-01-05 21:33:15 -05:00
parent b00fea05bc
commit 59d4f09d01
19 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/forms.py
View File

@@ -1134,7 +1134,7 @@ class RenameServiceForm(StripWhitespaceForm):
class RenameOrganisationForm(StripWhitespaceForm):
name = GovukTextInputField(
u'Organisation name',
u'Organization name',
validators=[
DataRequired(message='Cannot be empty'),
MustContainAlphanumericCharacters(),
@@ -1886,7 +1886,7 @@ class AdminSetOrganisationForm(StripWhitespaceForm):
self.organisations.choices = kwargs['choices']
organisations = GovukRadiosField(
'Select an organisation',
'Select an organization',
validators=[
DataRequired()
]

2
app/main/views/performance.py
View File

@@ -18,7 +18,7 @@ def performance():
stats['organisations_using_notify'] = sorted(
[
{
'organisation_name': organisation_name or 'No organisation',
'organisation_name': organisation_name or 'No organization',
'count_of_live_services': len(list(group)),
}
for organisation_name, group in groupby(

4
app/main/views/platform_admin.py
View File

@@ -193,8 +193,8 @@ def live_services_csv():
column_names = OrderedDict([
('service_id', 'Service ID'),
('organisation_name', 'Organisation'),
('organisation_type', 'Organisation type'),
('organisation_name', 'Organization'),
('organisation_type', 'Organization type'),
('service_name', 'Service name'),
('consent_to_research', 'Consent to research'),
('contact_name', 'Main contact'),

2
app/templates/org_template.html
View File

@@ -8,7 +8,7 @@
<div class="govuk-width-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">Organisations</a>
<a href="{{ url_for('.organisations') }}" class="govuk-link govuk-link--no-visited-state navigation-organisation-link">Organizations</a>
{% endif %}
<div class="navigation-service-name govuk-!-font-weight-bold">
{{ current_org.name }}

6
app/templates/views/organisations/add-organisation.html
View File

@@ -4,13 +4,13 @@
{% from "components/form.html" import form_wrapper %}
{% block per_page_title %}
New organisation
New organization
{% endblock %}
{% 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 organisations</a>
<a href="{{ url_for('.organisations') }}" 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>
@@ -22,7 +22,7 @@
<main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" >
{% block beforeContent %}{% endblock %}
{% block content %}
{{ page_header('New organisation') }}
{{ page_header('New organization') }}
{% call form_wrapper() %}
{{ form.name }}
{{ form.organisation_type }}

4
app/templates/views/organisations/index.html
View File

@@ -3,12 +3,12 @@
{% from "components/uk_components/button/macro.njk" import govukButton %}
{% block per_page_title %}
Organisations
Organizations
{% endblock %}
{% block platform_admin_content %}
<h1 class="heading-medium">Organisations</h1>
<h1 class="heading-medium">Organizations</h1>
{{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }}

4
app/templates/views/organisations/organisation/settings/edit-crown-status.html
View File

@@ -5,7 +5,7 @@
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% block org_page_title %}
Crown organisation
Crown organization
{% endblock %}
{% block backLink %}
@@ -13,7 +13,7 @@
{% endblock %}
{% block maincolumn_content %}
{{ page_header("Crown organisation") }}
{{ page_header("Crown organization") }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
{% call form_wrapper() %}

4
app/templates/views/organisations/organisation/settings/edit-name.html
View File

@@ -5,7 +5,7 @@
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% block org_page_title %}
Change organisation name
Change organization name
{% endblock %}
{% block backLink %}
@@ -14,7 +14,7 @@
{% block maincolumn_content %}
{{ page_header('Change organisation name') }}
{{ page_header('Change organization name') }}
{% call form_wrapper() %}
{{ form.name }}

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

@@ -5,7 +5,7 @@
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% block org_page_title %}
Organisation sector
Organization sector
{% endblock %}
{% block backLink %}
@@ -13,7 +13,7 @@
{% endblock %}
{% block maincolumn_content %}
{{ page_header("Organisation sector") }}
{{ page_header("Organization sector") }}
{% call form_wrapper() %}
{{ form.organisation_type }}
{{ page_footer('Save') }}

20
app/templates/views/organisations/organisation/settings/index.html
View File

@@ -20,7 +20,7 @@
{{ edit_field(
'Change',
url_for('.edit_organisation_name', org_id=current_org.id),
suffix='organisation name'
suffix='organization name'
)
}}
{% endcall %}
@@ -30,12 +30,12 @@
{{ edit_field(
'Change',
url_for('.edit_organisation_type', org_id=current_org.id),
suffix='sector for the organisation'
suffix='sector for the organization'
)
}}
{% endcall %}
{% call row() %}
{{ text_field('Crown organisation') }}
{{ text_field('Crown organization') }}
{{ optional_text_field(
{
True: 'Yes',
@@ -46,7 +46,7 @@
{{ edit_field(
'Change',
url_for('.edit_organisation_crown_status', org_id=current_org.id),
suffix='organisation crown status'
suffix='organization crown status'
)
}}
{% endcall %}
@@ -62,7 +62,7 @@
{{ edit_field(
'Change',
url_for('.edit_organisation_agreement', org_id=current_org.id),
suffix='data sharing and financial agreement for the organisation'
suffix='data sharing and financial agreement for the organization'
)
}}
{% endcall %}
@@ -72,7 +72,7 @@
{{ edit_field(
'Change',
url_for('.edit_organisation_go_live_notes', org_id=current_org.id),
suffix='go live notes for the organisation'
suffix='go live notes for the organization'
)
}}
{% endcall %}
@@ -83,7 +83,7 @@
{{ edit_field(
'Change',
url_for('.edit_organisation_billing_details', org_id=current_org.id),
suffix='billing details for the organisation'
suffix='billing details for the organization'
)
}}
{% endcall %}
@@ -94,7 +94,7 @@
{{ edit_field(
'Change',
url_for('.edit_organisation_notes', org_id=current_org.id),
suffix='the notes for the organisation'
suffix='the notes for the organization'
)
}}
{% endcall %}
@@ -105,7 +105,7 @@
{{ edit_field(
'Change',
url_for('.edit_organisation_email_branding', org_id=current_org.id),
suffix='default email branding for the organisation'
suffix='default email branding for the organization'
)
}}
{% endcall %}
@@ -115,7 +115,7 @@
{{ edit_field(
'Change',
url_for('.edit_organisation_domains', org_id=current_org.id),
suffix='known email domains for the organisation'
suffix='known email domains for the organization'
)
}}
{% endcall %}

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

@@ -105,13 +105,13 @@
</div>
<h2 class="govuk-heading-m">
Organisations using Notify
Organizations using Notify
</h2>
<div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-one-half">
<span class="govuk-visually-hidden">There are</span>
<div class="product-page-big-number">{{ count_of_live_services_and_organisations.organisations|format_thousands }}</div>
organisations
organizations
</div>
<div class="govuk-grid-column-one-half">
<span class="govuk-visually-hidden">and</span>
@@ -123,10 +123,10 @@
<div class="dashboard-table">
{% call(item, row_number) list_table(
organisations_using_notify,
caption='Organisations using Notify',
caption='Organizations using Notify',
caption_visible=False,
field_headings=[
'Organisation', 'Number of live services'
'Organization', 'Number of live services'
],
empty_message='No data to show'
) %}

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')),
('Organisations', url_for('main.organisations')),
('Organizations', url_for('main.organisations')),
('Providers', url_for('main.view_providers')),
('Reports', url_for('main.platform_admin_reports')),
('Email branding', url_for('main.email_branding')),

2
app/templates/views/pricing/billing-details.html
View File

@@ -12,7 +12,7 @@
{{ page_header('Billing details') }}
<p class="govuk-body">
You can use the information on this page to add the Cabinet Office as a supplier. Your organisation may need to do this before you can raise a purchase order (PO).
You can use the information on this page to add the Cabinet Office as a supplier. Your organization may need to do this before you can raise a purchase order (PO).
</p>
<p class="govuk-body">

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

@@ -15,7 +15,7 @@ Create an account
{{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }}
{{ form.email_address(
param_extensions={
"hint": {"text": "Must be from a public sector organisation"},
"hint": {"text": "Must be from a public sector organization"},
"classes": "govuk-!-width-three-quarters",
"autocomplete": "email"
},

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

@@ -291,7 +291,7 @@
</div>
{% endif %}
{% endcall %}
{{ edit_field('Change', url_for('.link_service_to_organisation', service_id=current_service.id), suffix='organisation for service') }}
{{ edit_field('Change', url_for('.link_service_to_organisation', service_id=current_service.id), suffix='organization for service') }}
{% endcall %}
{% call row() %}