From 4faf44b5c51afdd82d2e7cc4a60ed7b12c0fc795 Mon Sep 17 00:00:00 2001
From: Pea Tyczynska <pea.tyczynska@digital.cabinet-office.gov.uk>
Date: Wed, 20 Feb 2019 17:34:58 +0000
Subject: [PATCH] Content changes following consultation with content and
 design pros :)

---
 app/templates/views/edit-user-permissions.html |  2 +-
 app/templates/views/manage-users.html          |  4 +---
 .../manage-users/confirm-edit-user-email.html  | 15 +++++++++------
 .../views/manage-users/edit-user-email.html    | 12 ++++++------
 tests/app/main/views/test_manage_users.py      | 18 +++++++++++-------
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/app/templates/views/edit-user-permissions.html b/app/templates/views/edit-user-permissions.html
index 4a59b6363..4bd585d96 100644
--- a/app/templates/views/edit-user-permissions.html
+++ b/app/templates/views/edit-user-permissions.html
@@ -14,7 +14,7 @@
   </h1>
 
   <p>
-    {{ user.email_address }}
+    {{ user.email_address }}&emsp;<a href="{{ url_for('.edit_user_email', service_id=current_service.id, user_id=user.id)}}">Change</a>
   </p>
 
   <div class="grid-row">
diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 4c65a08a8..645f67f1d 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -63,9 +63,7 @@
               {% if user.status == 'pending' %}
                 <a href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=user.id)}}">Cancel invitation</a>
               {% elif user.state == 'active' and current_user.id != user.id %}
-                <a href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id)}}">Edit permissions</a>
-                <br>
-                <a href="{{ url_for('.edit_user_email', service_id=current_service.id, user_id=user.id)}}">Edit user email</a>
+                <a href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id)}}">Edit team member</a>
               {% endif %}
             </li>
           {% endif %}
diff --git a/app/templates/views/manage-users/confirm-edit-user-email.html b/app/templates/views/manage-users/confirm-edit-user-email.html
index f852d5de8..322d470fe 100644
--- a/app/templates/views/manage-users/confirm-edit-user-email.html
+++ b/app/templates/views/manage-users/confirm-edit-user-email.html
@@ -1,20 +1,23 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
 {% block per_page_title %}
-  Confirm changes to user email
+  Confirm change of email address
 {% endblock %}
 
 {% block maincolumn_content %}
 
-<h1 class="heading-large">Confirm changes to user email</h1>
+<h1 class="heading-large">Confirm change of email address</h1>
 
 <div class="grid-row">
-  <div class="column-three-quarters">
-
+  <div class="column-whole">
   {% call form_wrapper() %}
-    <p> Email address for {{ user.name }} will be changed from "{{ user.email_address }}" to "{{ new_email }}".</p>
+    <p>New email address:</p>
+    <div class="panel panel-border-wide bottom-gutter">
+      <p>{{ new_email }}</p>
+    </div>
+    <p>We will send {{ user.name }} an email to tell them about the change.</p>
     {{ page_footer(
       'Confirm',
       destructive=destructive,
diff --git a/app/templates/views/manage-users/edit-user-email.html b/app/templates/views/manage-users/edit-user-email.html
index cc1074e3e..d1bdfeb91 100644
--- a/app/templates/views/manage-users/edit-user-email.html
+++ b/app/templates/views/manage-users/edit-user-email.html
@@ -1,24 +1,24 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
 {% block per_page_title %}
-  Edit user email address
+  Change team member’s email address
 {% endblock %}
 
 {% block maincolumn_content %}
 
-  <h1 class="heading-large">Edit user email address</h1>
-  <p id="user_name">for {{ user.name }}</p>
+  <h1 class="heading-large">Change team member’s email address</h1>
+  <p id="user_name">This will change the email address for {{ user.name }}.</p>
   <div class="grid-row">
     <div class="column-three-quarters">
       {% call form_wrapper() %}
         {{ textbox(form.email_address) }}
         {{ page_footer(
           'Save',
-          back_link=url_for('.manage_users', service_id=service_id),
-          back_link_text="Back to team members"
+          back_link=url_for('.edit_user_permissions', service_id=service_id, user_id=user.id),
+          back_link_text="Back"
         ) }}
       {% endcall %}
     </div>
diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py
index 7356da657..7bc21baaf 100644
--- a/tests/app/main/views/test_manage_users.py
+++ b/tests/app/main/views/test_manage_users.py
@@ -39,7 +39,7 @@ from tests.conftest import service_one as create_sample_service
             'Can’t Add and edit templates '
             'Can’t Manage settings, team and usage '
             'Can’t Manage API integration '
-            'Edit permissions Edit user email'
+            'Edit team member'
         )
     ),
     (
@@ -786,9 +786,10 @@ def test_edit_user_email_page(
         user_id=test_user.id
     )
 
-    assert page.find('h1').text == "Edit user email address"
-    assert page.select('p[id=user_name]')[0].text == "for " + user.name
+    assert page.find('h1').text == "Change team member’s email address"
+    assert page.select('p[id=user_name]')[0].text == "This will change the email address for {}.".format(user.name)
     assert page.select('input[type=email]')[0].attrs["value"] == user.email_address
+    assert page.select('button[type=submit]')[0].text == "Save"
 
 
 def test_edit_user_email_redirects_to_confirmation(
@@ -828,10 +829,13 @@ def test_confirm_edit_user_email_page(
         user_id=active_user_with_permissions.id
     ))
 
-    assert 'Confirm changes to user email' in response.get_data(as_text=True)
-    assert 'Email address for {} will be changed from "{}" to "{}".'.format(
-        active_user_with_permissions.name, active_user_with_permissions.email_address, new_email
-    ) in response.get_data(as_text=True)
+    assert 'Confirm change of email address' in response.get_data(as_text=True)
+    for text in [
+        'New email address:',
+        new_email,
+        'We will send {} an email to tell them about the change.'.format(active_user_with_permissions.name)
+    ]:
+        assert text in response.get_data(as_text=True)
     assert 'Confirm' in response.get_data(as_text=True)
     assert response.status_code == 200