darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-15 07:18:58 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
3ffeec6fbbf9533dd6f5aef03cdd36ee4646bfc3
notifications-admin/app/templates/views/manage-users.html

78 lines
2.8 KiB
HTML
Raw Normal View History

Added main nav to logged in pages
2015-12-14 16:53:07 +00:00
{% extends "withnav_template.html" %}
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
{% from "components/table.html" import list_table, row, field, boolean_field, hidden_field_heading %}
Rename `submit_form` component to `page_footer` Submit form was - a confusing name in itself - not descriptive, because it also has an optional ‘back’ link This commit also puts this component in as many pages as possible, stripping out any hard-coded buttons and links. It replaces any usage of buttons for ‘back’, because these are links, not buttons (ie they don’t change any data).
2016-01-07 20:11:22 +00:00
{% from "components/page-footer.html" import page_footer %}
Added the shell manage users page [ci skip]
2015-11-30 16:15:51 +00:00
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
{% set table_options = {
'field_headings': [
Set permissions with checkboxes, not yes/no inputs The yes/no pattern didn’t work too well, because: - it didn’t read naturally as a question and answer - often users left them completely unclicked if they didn’t want to set the permission (rather than clicking no) This commit changes both the invite and edit user pages to use checkboxes to set permissions. If also rewords these pages to read more naturally, and explain what the permissions mean. This meant changing some of the view logic around invites and persmissions, and I ended up refactoring a bunch of it because I found it hard to understand what was going on.
2016-03-22 13:18:06 +00:00
'Name', 'Send messages', 'Modify service', 'Access API keys', hidden_field_heading('Link to change')
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
],
'field_headings_visible': True,
'caption_visible': True
} %}
Added the shell manage users page [ci skip]
2015-11-30 16:15:51 +00:00
{% block page_title %}
Make page titles consistent This commit modifies the HTML `<title>` tags for all the pages. It makes two main changes: - make the title tag match the `<h1>` of the page, for better or worse - put the service name after the page title, seperated by an en dash, as per GOV.UK
2016-02-08 09:23:51 +00:00
Manage users – GOV.UK Notify
Added the shell manage users page [ci skip]
2015-11-30 16:15:51 +00:00
{% endblock %}
Added main nav to logged in pages
2015-12-14 16:53:07 +00:00
{% block maincolumn_content %}
Added the shell manage users page [ci skip]
2015-11-30 16:15:51 +00:00
Move ‘new thing’ buttons alongside heading On the send messages and manage team pages we have big green buttons for adding/inviting a new template or team member. On the add template page it was at the bottom, and often got missed. On the manage team page it was at the top, but maybe too prominent because it’s big and green. This commit tries putting it in the top right of the page instead (except when the template page is empty, in which case it’s unchanged).
2016-03-11 07:47:46 +00:00
<div class="grid-row">
<div class="column-two-thirds">
<h1 class="heading-large">
Remove the verbs from the navigation Because ‘Send text messages’ isn’t very helpful if you’re looking to edit a template. It also helps front-load the navigation, ie ‘Team’ is the first word, rather than the more generic ‘Manage’.
2016-04-01 10:42:23 +01:00
Team members
Move ‘new thing’ buttons alongside heading On the send messages and manage team pages we have big green buttons for adding/inviting a new template or team member. On the add template page it was at the bottom, and often got missed. On the manage team page it was at the top, but maybe too prominent because it’s big and green. This commit tries putting it in the top right of the page instead (except when the template page is empty, in which case it’s unchanged).
2016-03-11 07:47:46 +00:00
</h1>
</div>
Added invite user button for platform admins on any service
2016-06-03 11:10:38 +01:00
{% if current_user.has_permissions(['manage_users'], admin_override=True) %}
Manage team, now has a view only version of the page which requires no permissions.
2016-03-21 15:25:19 +00:00
<div class="column-one-third">
Added current_service to flask context and template context. Fix all tests and conflicts. Removed comment line.
2016-04-04 16:53:52 +01:00
<a href="{{ url_for('.invite_user', service_id=current_service.id) }}" class="button align-with-heading">Invite team member</a>
Manage team, now has a view only version of the page which requires no permissions.
2016-03-21 15:25:19 +00:00
</div>
{% endif %}
Move ‘new thing’ buttons alongside heading On the send messages and manage team pages we have big green buttons for adding/inviting a new template or team member. On the add template page it was at the bottom, and often got missed. On the manage team page it was at the top, but maybe too prominent because it’s big and green. This commit tries putting it in the top right of the page instead (except when the template page is empty, in which case it’s unchanged).
2016-03-11 07:47:46 +00:00
</div>
Fix users page for research For the lab sessions, users should just see themselves as the only user, not all the fake users (it might confuse them).
2016-02-22 12:07:09 +00:00
Add row numbers to tables When a table is showing the contents of a CSV file, it should look something like a spreadsheet. The minimally skeuomorphic way to do this is by adding row numbers. This commit doesn’t - make the row numbers monospace (it’s barely noticeable and doesn’t reflect what actual spreadsheets do) - make the first column heading ‘Row’ (again, doesn’t reflect how actual spreadsheets work, and takes up more valuable space)
2016-04-05 11:16:29 +01:00
{% call(item, row_number) list_table(
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
users, caption='Active', **table_options
) %}
{% call field() %}
Get users for service to show on the manage team page. Calls api endpoint /service/<service_id>/users to retrieve all users associated with the service
2016-02-23 17:51:09 +00:00
{{ item.name }}
Indicate which user is you on manage team
2016-04-06 13:38:10 +01:00
{%- if item.email_address == current_user.email_address -%}
&ensp;<span class="hint">(you)</span>
{% endif %}
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
{% endcall %}
Completion of the platform admin user story.
2016-03-18 16:20:37 +00:00
{{ boolean_field(item.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'])) }}
{{ boolean_field(item.has_permissions(permissions=['manage_users', 'manage_templates', 'manage_settings'])) }}
Remove access_developer_docs permission, it doesn't make sense to need it. Add view_activity permission when the permissions are being editted.
2016-03-29 17:33:12 +01:00
{{ boolean_field(item.has_permissions(permissions=['manage_api_keys'])) }}
Fix up front end so you can navigate to the edit page.
2016-03-03 15:43:53 +00:00
{% call field(align='right') %}
Manage team, now has a view only version of the page which requires no permissions.
2016-03-21 15:25:19 +00:00
{% if current_user.has_permissions(['manage_users']) %}
{% if current_user.id != item.id %}
Added current_service to flask context and template context. Fix all tests and conflicts. Removed comment line.
2016-04-04 16:53:52 +01:00
<a href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=item.id)}}">Edit</a>
Manage team, now has a view only version of the page which requires no permissions.
2016-03-21 15:25:19 +00:00
{% endif %}
Fix up front end so you can navigate to the edit page.
2016-03-03 15:43:53 +00:00
{% endif %}
{% endcall %}
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
{% endcall %}
Add manage users page
2016-02-03 17:08:58 +00:00
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
{% if invited_users %}
Add row numbers to tables When a table is showing the contents of a CSV file, it should look something like a spreadsheet. The minimally skeuomorphic way to do this is by adding row numbers. This commit doesn’t - make the row numbers monospace (it’s barely noticeable and doesn’t reflect what actual spreadsheets do) - make the first column heading ‘Row’ (again, doesn’t reflect how actual spreadsheets work, and takes up more valuable space)
2016-04-05 11:16:29 +01:00
{% call(item, row_number) list_table(
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
invited_users, caption='Invited', **table_options
) %}
{% call field() %}
Manage user pages now surfaces invited users fetched from api.
2016-02-26 15:33:17 +00:00
{{ item.email_address }}
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
{% endcall %}
Completion of the platform admin user story.
2016-03-18 16:20:37 +00:00
{{ boolean_field(item.has_permissions(permissions=['send_texts', 'send_emails', 'send_letters'])) }}
{{ boolean_field(item.has_permissions(permissions=['manage_users', 'manage_templates', 'manage_settings'])) }}
Remove access_developer_docs permission, it doesn't make sense to need it. Add view_activity permission when the permissions are being editted.
2016-03-29 17:33:12 +01:00
{{ boolean_field(item.has_permissions(permissions=['manage_api_keys'])) }}
Show status of invited user on manage team page.
2016-03-02 09:28:33 +00:00
{% if item.status == 'pending' %}
{% call field(align='right') %}
With the addition of has_permissions on the dashboard, jobs, and manage_users pages a platform admin user or a users with no permissions on the service could no longer see the page. A new permission has been added, view_activity, to resolve this issue. Another pull request in notifications-admin will be required to update all users with a default permission of view_activity.
2016-03-29 13:23:36 +01:00
{% if current_user.has_permissions(['manage_users']) %}
Added current_service to flask context and template context. Fix all tests and conflicts. Removed comment line.
2016-04-04 16:53:52 +01:00
<a href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=item.id)}}">Cancel invitation</a>
With the addition of has_permissions on the dashboard, jobs, and manage_users pages a platform admin user or a users with no permissions on the service could no longer see the page. A new permission has been added, view_activity, to resolve this issue. Another pull request in notifications-admin will be required to update all users with a default permission of view_activity.
2016-03-29 13:23:36 +01:00
{% endif %}
Show status of invited user on manage team page.
2016-03-02 09:28:33 +00:00
{% endcall %}
{% else %}
{% call field() %}
{{ item.status }}
{% endcall %}
{% endif %}
Add pages to invite, edit, and delete users This takes the original prototype version of this page, and, using the same fake data (ie nothing is wired up): - adds an invite users page - adds an edit (and delete) user page Both these pages allow the user to set another user’s permissions. This commit adds images for the ticks and crosses, so we have control over their appearance.
2016-02-19 15:02:13 +00:00
{% endcall %}
{% endif %}
Added the shell manage users page [ci skip]
2015-11-30 16:15:51 +00:00
{% endblock %}
Reference in New Issue Copy Permalink