darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 05:59: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

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

@@ -1,6 +1,6 @@
{% from "components/banner.html" import banner_wrapper %}
<div class="grid-col-12 template-container">
<div class="grid-col-12 template-container margin-bottom-4">
{{ template|string }}
</div>
<div class="grid-col-12">

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

@@ -1,4 +1,4 @@
<div class="govuk-grid-column-full">
<div class="grid-col-12">
<h2 class="message-name">{{ template.name }}</h2>
<p class="hint">
{% if template.get_raw('version', 1) > 1 %}
@@ -11,6 +11,6 @@
</p>
</div>
<div class="govuk-grid-column-full">
<div class="grid-col-12">
{{ template|string }}
</div>

9
app/templates/views/templates/_template_list.html
View File

@@ -21,8 +21,7 @@
{% endif %}
</p>
{% else %}
<nav id="template-list"
class="{{ 'govuk-!-margin-top-1' if (not show_template_nav and not show_search_box) else 'govuk-!-margin-top-6' }}">
<nav id="template-list">
{% set checkboxes_data = [] %}
{% if not current_user.has_permissions('manage_templates') %}
@@ -52,10 +51,10 @@
</a>
{% else %}
<a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}"
class="usa-link usa-template-list-template">
class="usa-link template-list-template">
<span class="live-search-relevant">
{%- if current_service.api_keys -%}
<span class="govuk-!-display-none">{{ item.id }} </span>
<span class="display-none">{{ item.id }} </span>
{%- endif -%}
{{- format_item_name(item.name) -}}
</span>
@@ -95,7 +94,7 @@
<li
class="template-list-item {%- if item.ancestors %} template-list-item-hidden-by-default {%- else %} template-list-item-without-ancestors{%- endif %}">
{{ item_link_content }}
<p class="template-list-item-hint govuk-!-margin-bottom-4">
<p class="template-list-item-hint">
{{ item.hint }}
</p>
</li>

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

@@ -13,8 +13,8 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
<div class="grid-row">
<div class="grid-col-10">
{{ page_header('{} are disabled'.format(notification_type.capitalize())) }}
<p>
Sending {{ 999|message_count_label(notification_type, suffix='') }} has been disabled for your service.

4
app/templates/views/templates/breaking-change.html
View File

@@ -17,8 +17,8 @@
{% block maincolumn_content %}
{{ page_header('Confirm changes') }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
<div class="grid-row">
<div class="grid-col-10">
{% if template_change.placeholders_removed %}
<p>
You removed {{ list_of_placeholders(template_change.placeholders_removed) }}

2
app/templates/views/templates/choose-reply.html
View File

@@ -51,7 +51,7 @@
<span class="live-search-relevant">{{ item.name }}</span>
</a>
{% else %}
<a class="usa-link usa-template-list-template" href="{{ url_for('.conversation_reply_with_template', service_id=current_service.id, template_id=item.id, notification_id=notification_id) }}">
<a class="usa-link template-list-template" href="{{ url_for('.conversation_reply_with_template', service_id=current_service.id, template_id=item.id, notification_id=notification_id) }}">
<span class="live-search-relevant">{{ item.name }}</span>
</a>
{% endif %}

6
app/templates/views/templates/choose.html
View File

@@ -32,8 +32,8 @@
{% else %}
<div class="govuk-grid-row">
<div class="{% if current_user.has_permissions('manage_templates') %} govuk-grid-column-five-sixths {% else %} govuk-grid-column-full {% endif %}">
<div class="grid-row">
<div class="{% if current_user.has_permissions('manage_templates') %} grid-col-10 {% else %} grid-col-12 {% endif %}">
<div class="usa-alert usa-alert--info usa-alert--slim">
<div class="usa-alert__body">
<p class="usa-alert__text">
@@ -49,7 +49,7 @@
) }}
</div>
{% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
<div class="govuk-grid-column-one-sixth">
<div class="grid-col-2">
<a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="usa-link folder-heading-manage-link">Manage<span class="usa-sr-only"> this folder</span></a>
</div>
{% endif %}

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

@@ -6,7 +6,7 @@
{% block maincolumn_content %}
<h1 class="font-body-2xl margin-bottom-3">Previous versions</h1>
<div class="govuk-grid-row">
<div class="grid-row">
{% for template in versions %}
{% with show_title=True %}
{% include 'views/templates/_template_history.html' %}

4
app/templates/views/templates/manage-template-folder.html
View File

@@ -9,8 +9,8 @@
{% block maincolumn_content %}
<div class="govuk-grid-row bottom-gutter-1-2">
<div class="govuk-grid-column-full">
<div class="grid-row bottom-gutter-1-2">
<div class="grid-col-12">
{{ folder_path(
folders=template_folder_path,
service_id=current_service.id,

9
app/templates/views/templates/set-sender.html
View File

@@ -13,19 +13,18 @@
{% block maincolumn_content %}
<div class="govuk-grid-row govuk-!-margin-top-3">
<div class="grid-row">
{% call form_wrapper() %}
{{ form.sender(param_extensions={
'fieldset': {
'legend': {
'isPageHeading': True,
'text': sender_context.title,
'classes': 'govuk-fieldset__legend--l govuk-grid-column-full'
'text': sender_context.title
}
},
'classes': 'govuk-grid-column-three-quarters'
'classes': 'grid-col-9'
}) }}
<div class="govuk-grid-column-three-quarters">
<div class="grid-col-9">
{{ page_footer('Continue') }}
</div>
{% endcall %}

9
app/templates/views/templates/set-template-sender.html
View File

@@ -15,19 +15,18 @@
{% block maincolumn_content %}
<div class="govuk-grid-row govuk-!-margin-top-3">
<div class="grid-row">
{% call form_wrapper() %}
{{ form.sender(param_extensions={
'fieldset': {
'legend': {
'isPageHeading': True,
'text': page_title,
'classes': 'govuk-fieldset__legend--l govuk-grid-column-full'
'text': page_title
}
},
'classes': 'govuk-grid-column-three-quarters'
'classes': 'grid-col-9'
}) }}
<div class="govuk-grid-column-three-quarters">
<div class="grid-col-9">
{{ page_footer('Continue') }}
<a class="usa-link" href="{{ url_for('.service_add_letter_contact', service_id=current_service.id, from_template=template_id) }}">Add new sender</a>
</div>

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

@@ -10,7 +10,7 @@
<h1 class="font-body-2xl margin-bottom-3">{{ template.name }}</h1>
<div class="govuk-grid-row">
<div class="grid-row">
{% with show_title=False %}
{% include 'views/templates/_template_history.html' %}
{% endwith %}