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

Merge pull request #2076 from GSA/2056-template-creation-flow-voiceover-gets-stuck-in-a-loop

Browse Source 
Template voiceover gets stuck in a loop #2056
This commit is contained in:
Jonathan Bobel
2024-11-08 10:13:32 -05:00
committed by GitHub
parent fe00050e1f 66d18ced10
commit 3afffde6cb
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,22 +38,28 @@
{% for item in template_list %} {% for item in template_list %}
{% set item_link_content %} {% set item_link_content %}
{% if item.is_folder %} {% if item.is_folder %}
<a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=item.id) }}" <a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=item.id) }}"
class="usa-link template-list-folder"> class="usa-link template-list-folder"
<span class="live-search-relevant">{{- format_item_name(item.name) -}}</span> tabindex="0"
</a> role="link"
{% elif not item.ancestors %} aria-label="{{ item.name }}">
<a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}" <span class="live-search-relevant">{{- format_item_name(item.name) -}}</span>
class="usa-link template-list-template"> </a>
<span class="live-search-relevant"> {% elif not item.ancestors %}
{%- if current_service.api_keys -%} <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}"
<span class="display-none">{{ item.id }} </span> class="usa-link template-list-template"
{%- endif -%} tabindex="0"
{{- format_item_name(item.name) -}} role="link"
</span> aria-label="{{ item.name }}">
</a> <span class="live-search-relevant">
{% endif %} {%- if current_service.api_keys -%}
<span class="display-none">{{ item.id }} </span>
{%- endif -%}
{{- format_item_name(item.name) -}}
</span>
</a>
{% endif %}
{% endset %} {% endset %}
{% set label_content %} {% set label_content %}
@@ -82,6 +88,8 @@
"id": "templates-or-folder-" ~ item.id, "id": "templates-or-folder-" ~ item.id,
"classes": "template-list-item template-list-item-with-checkbox {}".format( "classes": "template-list-item template-list-item-with-checkbox {}".format(
"template-list-item-hidden-by-default" if item.ancestors else "template-list-item-without-ancestors"), "template-list-item-hidden-by-default" if item.ancestors else "template-list-item-without-ancestors"),
"attributes": { "role": "checkbox", "aria-describedby": item.id ~ "-item-hint" },
"after": item_link_content ~ item_meta "after": item_link_content ~ item_meta
} %} } %}
{% set _ = checkboxes_data.append(checkbox_config) %} {% set _ = checkboxes_data.append(checkbox_config) %}

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

@@ -33,7 +33,7 @@
{% else %} {% else %}
<div class="grid-row"> <div class="grid-row flex-column">
<div class="{% if current_user.has_permissions('manage_templates') %} grid-col-10 {% else %} grid-col-12 {% endif %}"> <div class="{% if current_user.has_permissions('manage_templates') %} grid-col-10 {% else %} grid-col-12 {% endif %}">
<div class="usa-alert usa-alert--slim usa-alert--info"> <div class="usa-alert usa-alert--slim usa-alert--info">
<div class="usa-alert__body"> <div class="usa-alert__body">
@@ -51,7 +51,7 @@
</div> </div>
{% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %} {% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
<div class="grid-col-2"> <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> <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 this folder<span class="usa-sr-only">Manage this folder</span></a>
</div> </div>
{% endif %} {% endif %}
</div> </div>