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

Merge branch 'main' of https://github.com/GSA/notifications-admin into 718-clean-up-components-section

Browse Source 
# Conflicts:
#	app/templates/components/components/footer/_footer.scss
#	app/templates/components/components/hint/_hint.scss
#	app/templates/views/service-settings/data-retention.html
#	app/templates/views/service-settings/sms-senders.html
#	app/templates/views/two-factor-webauthn.html
#	app/templates/views/user-profile/security-keys.html
This commit is contained in:
Jonathan Bobel
2023-08-31 12:06:55 -04:00
parent 1881cd7c89 155ea99b36
commit c19083b04e
186 changed files with 3619 additions and 16898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/templates/views/organizations/organization/index.html
View File

@@ -16,8 +16,8 @@
{{ pill(years, selected_year, big_number_args={'smallest': True}) }}
</div>
<div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-one-half">
<div class="grid-row bottom-gutter">
<div class="grid-col-6">
<h2 class="heading-small">Emails</h2>
<div class="keyline-block">
{{ big_number(
@@ -27,7 +27,7 @@
) }}
</div>
</div>
<div class="govuk-grid-column-one-half">
<div class="grid-col-6">
<h2 class="heading-small">Text messages</h2>
<div class="keyline-block">
{{ big_number(
@@ -41,7 +41,7 @@
</div>
{% if search_form %}
<div class="govuk-!-margin-bottom-5">
<div>
{{ live_search(
target_selector='.organization-service',
show=True,
@@ -54,19 +54,19 @@
<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 organization-service">
<h3 class="govuk-!-font-weight-bold govuk-!-font-size-24 govuk-!-margin-bottom-3 govuk-!-margin-top-1 live-search-relevant">
<div class="keyline-block organization-service">
<h3 class="live-search-relevant">
<a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="usa-link browse-list-link">{{ service.service_name }}</a>
</h3>
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-half">
<div class="grid-row">
<div class="grid-col-6">
{{ big_number(
service.emails_sent,
label=service.emails_sent|message_count_label('email'),
smallest=True
) }}
</div>
<div class="govuk-grid-column-one-half">
<div class="grid-col-6">
{% if service.sms_cost %}
{{ big_number(
service.sms_cost,
@@ -85,16 +85,16 @@
</div>
</div>
{% endfor %}
<div class="keyline-block govuk-!-margin-top-2"></div>
<div class="keyline-block"></div>
{% if not services %}
<p class="govuk-body govuk-hint">
<p class="usa-body usa-hint">
{{ current_org.name }} has no live services on Notify.gov
</p>
<div class="keyline-block govuk-!-margin-top-2"></div>
<div class="keyline-block"></div>
{% else %}
<div class="js-stick-at-bottom-when-scrolling">
<p class="govuk-!-margin-bottom-1">
<a href="{{ download_link }}" download="download" class="usa-link govuk-!-font-weight-bold">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
<p>
<a href="{{ download_link }}" download="download" class="usa-link">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
</p>
</div>
{% endif %}

4
app/templates/views/organizations/organization/settings/edit-domains.html
View File

@@ -15,8 +15,8 @@
{% block maincolumn_content %}
{{ page_header("Known email domains") }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
<div class="grid-row">
<div class="grid-col-10">
<p>
If a user’s email addresses ends with one of these domains then
any services they create will be associated with this organization.

4
app/templates/views/organizations/organization/settings/edit-go-live-notes.html
View File

@@ -15,8 +15,8 @@
{% block maincolumn_content %}
{{ page_header("Edit request to go live notes") }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
<div class="grid-row">
<div class="grid-col-10">
<p>
Text entered here will be displayed in the Zendesk ticket when a service
belonging to this organization requests to go live.

4
app/templates/views/organizations/organization/settings/preview-email-branding.html
View File

@@ -10,8 +10,8 @@
{% block maincolumn_content %}
<h1 class="font-body-2xl margin-bottom-3">Preview email branding</h1>
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<div class="grid-row">
<div class="grid-col-12">
{{ email_branding_preview(form.branding_style.data) }}
{% call form_wrapper(action=action) %}
<div class="form-group">

10
app/templates/views/organizations/organization/settings/set-email-branding.html
View File

@@ -19,14 +19,14 @@
{{ page_header(page_title) }}
{% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-full preview-pane">
<div class="grid-row">
<div class="grid-col-12 preview-pane">
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<div class="grid-row">
<div class="grid-col-12">
{{ live_search(
target_selector='.govuk-radios__item',
target_selector='.usa-radio',
show=True,
form=search_form,
label='Search branding styles by name',

6
app/templates/views/organizations/organization/users/index.html
View File

@@ -32,8 +32,8 @@
<div class="user-list">
{% for user in users %}
<div class="user-list-item">
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">
<div class="grid-row">
<div class="grid-col-9">
<h2 class="user-list-item-heading">
{%- if user.name -%}
<span class="heading-small">{{ user.name }}</span>&ensp;
@@ -51,7 +51,7 @@
</span>
</h2>
</div>
<div class="govuk-grid-column-one-quarter">
<div class="grid-col-3">
{% if user.status == 'pending' %}
<a class="usa-link 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' %}