darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-04 02:28:24 -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

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' %}