From bf3f6d7d3eb657c04f5bac7e5b829485502bfa91 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 22 Feb 2016 12:07:09 +0000 Subject: [PATCH] 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). --- app/assets/images/cross.png | Bin 971 -> 0 bytes .../stylesheets/components/page-footer.scss | 2 +- app/main/views/manage_users.py | 53 ++---------------- app/templates/views/manage-templates.html | 53 ------------------ app/templates/views/manage-users.html | 9 ++- 5 files changed, 9 insertions(+), 108 deletions(-) delete mode 100644 app/assets/images/cross.png delete mode 100644 app/templates/views/manage-templates.html diff --git a/app/assets/images/cross.png b/app/assets/images/cross.png deleted file mode 100644 index fab3b895c6253a371bb79c98e4a0d74de6faee07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 971 zcmV;+12p`JP)C0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyCs0gOMfvOOzdA?1IY+l5G4a&a@zd7v z)YrZ@M7}md#!gzrOOUfKSR&0000DbW%=J|NsC0|NsC0|NsC006pj;h5!Hq zAxT6*RCwC#+sksRKn#T8PTP(z@cz$xT&YwF!)VmfAkK!YvPkiNi`Zr)gZV%I-~^n2 z6L11ffd41o&!iI1>mGpb%k-5J;A^^E#{uvDloGuAlOTZ7&j^0{f&fxKF8J;H0%-lH z;IHorAogQ|Mc)(ju6kYeBZ7~Q#^s4EERW17X4aKGxs76NUwY{q1K#t$^@94J!qNaz9WfAhbK8DgmM16V?a_ z{jRt|Kt#?3`wNKJ$!Ko@5j`93DT{id(#7X80kvz-RRW5a7RSGjX#b&JS^Tr; z`D4283J9OS^w~P9`toeOtS<^s*B7Vzg?&kY%D%K;DD4XZ)b@o9M{(a3pt|qwSjzj3 z0QG%m%X2`#E5H%`?w;w8en)^~`khVJL48wzqx$Bq?XbQfz;S(J+jn5UDZr8a=DzXJ zenWu4{^Kzyz*wJ1Zn})6Rc8M)D8OicRIvR0nLPi71y2KTyQKPI!R2QC4}=8E^M6S2 z(O}tuAlw&`+zK9cH_C~Z{7(-0kiwYb$|O=APJb=_HFu&PeVb#?5=IwZ`}{L z0%kW|jehfv$PqBRXKMA^_k>*mvs<2K-?%I82$1SNs@%#Dh}bpB4WIn0d&BN?(|kzXi-a=0l;c>>6PQX6_1^_-|%}Fz(lac@c002ovPDHLkV1ljd@W=oF diff --git a/app/assets/stylesheets/components/page-footer.scss b/app/assets/stylesheets/components/page-footer.scss index 7dfe8ece0..f38a0e6ea 100644 --- a/app/assets/stylesheets/components/page-footer.scss +++ b/app/assets/stylesheets/components/page-footer.scss @@ -12,7 +12,7 @@ &-delete-link { line-height: 40px; - padding: 0 0 0 5px; + padding: 1px 0 0 15px; a { diff --git a/app/main/views/manage_users.py b/app/main/views/manage_users.py index 54be424d2..df609ee8f 100644 --- a/app/main/views/manage_users.py +++ b/app/main/views/manage_users.py @@ -15,55 +15,13 @@ from app.main.forms import InviteUserForm from app.main.dao.services_dao import get_service_by_id_or_404 from app import user_api_client - fake_users = [ { - 'name': 'Henry Hadlow', - 'email_localpart': 'henry.hadlow', - 'permission_send_messages': True, - 'permission_manage_service': False, - 'permission_manage_api_keys': False, - 'active': True - }, - - { - 'name': 'Pete Herlihy', - 'email_localpart': 'pete.herlihy', - 'permission_send_messages': False, - 'permission_manage_service': False, - 'permission_manage_api_keys': False, - 'active': True - }, - { - 'name': 'Chris Hill-Scott', - 'email_localpart': 'chris.hill-scott', + 'name': '', 'permission_send_messages': True, 'permission_manage_service': True, 'permission_manage_api_keys': True, 'active': True - }, - { - 'name': 'Martyn Inglis', - 'email_localpart': 'martyn.inglis', - 'permission_send_messages': True, - 'permission_manage_service': True, - 'permission_manage_api_keys': True, - 'active': True - }, - { - 'email_localpart': 'caley.smolska', - 'permission_send_messages': True, - 'permission_manage_service': False, - 'permission_manage_api_keys': False, - 'active': False - }, - - { - 'email_localpart': 'ash.stephens', - 'permission_send_messages': False, - 'permission_manage_service': False, - 'permission_manage_api_keys': False, - 'active': False } ] @@ -74,12 +32,9 @@ def manage_users(service_id): return render_template( 'views/manage-users.html', service_id=service_id, - users=[ - dict(id=user_id, **user) for (user_id, user) in enumerate(fake_users) if user['active'] - ], - invited_users=[ - dict(id=user_id, **user) for (user_id, user) in enumerate(fake_users) if not user['active'] - ] + users=fake_users, + current_user=current_user, + invited_users=[] ) diff --git a/app/templates/views/manage-templates.html b/app/templates/views/manage-templates.html deleted file mode 100644 index 346c87739..000000000 --- a/app/templates/views/manage-templates.html +++ /dev/null @@ -1,53 +0,0 @@ -{% extends "withnav_template.html" %} -{% from "components/sms-message.html" import sms_message %} -{% from "components/email-message.html" import email_message %} -{% from "components/browse-list.html" import browse_list %} - -{% block page_title %} -Manage templates – GOV.UK Notify -{% endblock %} - -{% block maincolumn_content %} - -

Manage templates

- - - {% if not has_jobs %} - {{ banner( - 'Send yourself a text message'.format( - url_for(".choose_sms_template", service_id=service_id) - )|safe, - subhead='Next step', - type="tip" - )}} - {% endif %} - -
-
- - {% for template in templates %} - {% if template.template_type == 'email' %} - {{ email_message( - template.get_field('subject'), - template.get_field('content'), - name=template.get_field('name'), - edit_link=url_for('.edit_service_template', service_id=service_id, template_id=template.id) - ) }} - {% else %} - {{ sms_message( - template.formatted_as_markup, - name=template.name, - id=template.id, - edit_link=url_for('.edit_service_template', service_id=service_id, template_id=template.id) - ) }} - {% endif %} - {% endfor %} - -

- Add new template -

- -
-
- -{% endblock %} diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index 4af05c7aa..c12fb8ddc 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -20,22 +20,21 @@ Manage users – GOV.UK Notify Manage team + Invite a team member + {% call(item) list_table( users, caption='Active', **table_options ) %} {% call field() %} - {{ item.name }} + {{ current_user.name }} {% endcall %} {{ boolean_field(item.permission_send_messages) }} {{ boolean_field(item.permission_manage_service) }} {{ boolean_field(item.permission_manage_api_keys) }} {% call field(align='right') %} - Change + Change {% endcall %} {% endcall %} -

- Add a new team member -

{% if invited_users %} {% call(item) list_table(