diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index 4b938e0d4..de71d0184 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -31,67 +31,70 @@
- {% set folder_count = user.template_folders_for_service(current_service) | length %} - {% if folder_count == 0 %} - Cannot see any folders - {% elif folder_count != current_service.all_template_folders | length %} - Can see {{ folder_count }} folder{% if folder_count > 1 %}s{% endif %} + {% if user.status != 'cancelled' %} +
- Signs in with - {{ user.auth_type | format_auth_type(with_indefinite_article=True) }} -
- {% endif %} - {% if current_service.has_permission('email_auth') %} -- Signs in with - {{ user.auth_type | format_auth_type(with_indefinite_article=True) }} -
- {% endif %} - {% if current_user.has_permissions('manage_service') %} - {% if user.status == 'pending' %} - Cancel invitation for {{ user.email_address }} - {% elif user.status == 'expired' %} - Resend invite for {{ user.email_address }} - {% elif user.is_editable_by(current_user) %} - Change details for {{ user.name }} {{ user.email_address }} + {{ user.email_address }} {% endif %} + ++ {% set folder_count = user.template_folders_for_service(current_service) | length %} + {% if folder_count == 0 %} + Cannot see any folders + {% elif folder_count != current_service.all_template_folders | length %} + Can see {{ folder_count }} folder{% if folder_count > 1 %}s{% endif %} + {% else %} + Can see all folders + {% endif%} +
{% endif %} -+ Signs in with + {{ user.auth_type | format_auth_type(with_indefinite_article=True) }} +
+ {% endif %} + {% if current_service.has_permission('email_auth') %} ++ Signs in with + {{ user.auth_type | format_auth_type(with_indefinite_article=True) }} +
+ {% endif %} + {% if current_user.has_permissions('manage_service') %} + {% if user.status == 'pending' or user.status == 'expired' %} + Cancel invitation for {{ user.email_address }} + {% endif %} + {% if user.status == 'expired' %} + Resend invite for {{ user.email_address }} + {% elif user.is_editable_by(current_user) %} + Change details for {{ user.name }} {{ user.email_address }} + {% endif %} + {% endif %} +