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

Merge branch 'main' of https://github.com/GSA/notifications-admin into notify-871

Browse Source
This commit is contained in:
Andrew Shumway
2023-12-06 12:26:51 -07:00
parent 9c658bf020 414352ea69
commit 97a8c04928
15 changed files with 148 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/views/edit-sms-template.html
View File

@@ -50,7 +50,7 @@
</div>
<div class="grid-row">
<div class="grid-col-12">
<div class="template-content-count">
<div class="template-content-count" bg-color="red">
<div data-module="update-status" data-target="template_content"
data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}"
aria-live="polite">
@@ -69,7 +69,7 @@
</p>
</div>
</div>
<div class="tablet:grid-col-9 mobile-lg:grid-col-12">
<h2 id="help" class="font-body-xl margin-top-2">How to customize your message</h2>
<div class="usa-accordion usa-accordion--bordered usa-accordion--multiselectable maxw-mobile-lg" data-allow-multiple>

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

@@ -219,7 +219,7 @@
<p>
You can send up to
{{ "{:,}".format(current_service.message_limit) }} messages
per day.
per year.
</p>
<p>
Problems or comments?

32
app/templates/views/templates/copy.html
View File

@@ -11,7 +11,7 @@
{% block maincolumn_content %}
<div class="">
<h1 class="font-body-2xl margin-bottom-3">{{ page_title }}</h1>
<h1 class="font-body-2xl margin-y-0">{{ page_title }}</h1>
{{ copy_folder_path(template_folder_path, current_service.id, from_service, current_user) }}
</div>
{% if not services_templates_and_folders.templates_to_show %}
@@ -28,32 +28,24 @@
<nav id="template-list">
<ul>
{% for item in services_templates_and_folders %}
<li class="template-list-item {% if item.ancestors %}template-list-item-hidden-by-default{% endif %} {% if not item.ancestors %}template-list-item-without-ancestors{% endif %}">
{% for ancestor in item.ancestors %}
{% if ancestor.is_service %}
<a href="{{ url_for('.choose_template_to_copy', service_id=current_service.id, from_service=ancestor.service_id) }}" class="usa-link template-list-folder">
{% else %}
<a href="{{ url_for('.choose_template_to_copy', service_id=current_service.id, from_folder=ancestor.id) }}" class="usa-link template-list-folder">
{% endif %}
{{ ancestor.name }}
</a> <span class="message-name-separator"></span>
{% endfor %}
<li class="template-list-item margin-bottom-2 {% if item.ancestors %}template-list-item-hidden-by-default{% endif %} {% if not item.ancestors %}template-list-item-without-ancestors{% endif %}">
{% if item.is_service %}
<a href="{{ url_for('.choose_template_to_copy', service_id=current_service.id, from_service=item.service_id) }}" class="usa-link template-list-folder">
<span class="live-search-relevant">{{ item.name }}</span>
</a>
{% elif item.is_folder %}
<a href="{{ url_for('.choose_template_to_copy', service_id=current_service.id, from_service=item.service_id, from_folder=item.id) }}" class="usa-link template-list-folder">
<span class="live-search-relevant">{{ item.name }}</span>
</a>
{% else %}
{% for ancestor in item.ancestors %}
{% if ancestor.is_service %}
<a href="{{ url_for('.choose_template_to_copy', service_id=current_service.id, from_service=ancestor.service_id) }}" class="usa-link template-list-folder">
{% else %}
<a href="{{ url_for('.choose_template_to_copy', service_id=current_service.id, from_folder=ancestor.id) }}" class="usa-link template-list-folder">
{% endif %}
{{ ancestor.name }}
</a> <span class="message-name-separator"></span>
{% endfor %}
<a class="usa-link template-list-template" href="{{ url_for('.copy_template', service_id=current_service.id, template_id=item.id, from_service=item.service_id) }}">
<span class="live-search-relevant">{{ item.name }}</span>
</a>
{% endif %}
<p class="template-list-item-hint usa-hint usa-checkbox__label-description">
{{ item.hint }}
</p>
</li>
{% endfor %}
</ul>

10
app/templates/views/user-profile.html
View File

@@ -63,6 +63,16 @@
)
}}
{% endcall %}
{% call row() %}
{{ text_field('Preferred Timezone') }}
{{ optional_text_field(current_user.preferred_timezone) }}
{{ edit_field(
'Change',
url_for('.user_profile_preferred_timezone'),
suffix='preferred timezone'
)
}}
{% endcall %}
{% if current_user.platform_admin or session.get('disable_platform_admin_view') %}
{% call row(id='disable-platform-admin') %}