From ba50290ca19f32a1442ed0f57ac6e1d1164d76c3 Mon Sep 17 00:00:00 2001
From: Aileen Nowak <aileen@ghost.org>
Date: Tue, 23 Jan 2018 17:45:19 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Improved=20warning=20about=20aut?=
 =?UTF-8?q?hored=20posts=20being=20removed=20when=20deleting=20a=20user=20?=
 =?UTF-8?q?(#951)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes TryGhost/Ghost#9405
- users were still not noticing the warning that a user's posts are deleted along with the user
- improves the confirmation dialog layout to be clearer and even more explicit about authored posts being deleted along with the user
---
 ghost/admin/app/styles/components/modals.css   |  2 +-
 .../templates/components/modal-delete-user.hbs | 18 +++++++++++++++---
 ghost/admin/tests/acceptance/team-test.js      |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ghost/admin/app/styles/components/modals.css b/ghost/admin/app/styles/components/modals.css
index 2de3f2f707..660f89b83c 100644
--- a/ghost/admin/app/styles/components/modals.css
+++ b/ghost/admin/app/styles/components/modals.css
@@ -105,7 +105,7 @@
 
 .modal-header {
     position: relative;
-    margin-bottom: 18px;
+    margin-bottom: 22px;
 }
 
 .modal-header h1 {
diff --git a/ghost/admin/app/templates/components/modal-delete-user.hbs b/ghost/admin/app/templates/components/modal-delete-user.hbs
index 7d314ebe09..adf7607a5f 100644
--- a/ghost/admin/app/templates/components/modal-delete-user.hbs
+++ b/ghost/admin/app/templates/components/modal-delete-user.hbs
@@ -4,14 +4,26 @@
 <a class="close" href="" title="Close" {{action "closeModal"}}>{{inline-svg "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
+    <p><strong>WARNING:</strong> You are about to delete the user '<strong>{{user.name}}</strong>'. There is no way to recover this.</p>
     {{#if user.count.posts}}
-        <strong>WARNING:</strong> <span class="red">This user is the author of {{pluralize user.count.posts 'post'}}.</span> All posts and user data will be deleted. There is no way to recover this.
+        <ul>
+            <li>The user will not have access to this blog anymore</li>
+            <li><strong>{{pluralize user.count.posts 'post'}}</strong> created by this user will be deleted</li>
+            <li>All other user data will be deleted</li>
+        </ul>
     {{else}}
-        <strong>WARNING:</strong> All user data will be deleted. There is no way to recover this.
+        <ul>
+            <li>User will not have access to this blog anymore</li>
+            <li>All user data will be deleted.</li>
+        </ul>
     {{/if}}
 </div>
 
 <div class="modal-footer">
     <button {{action "closeModal"}} class="gh-btn"><span>Cancel</span></button>
-    {{gh-task-button "Delete" successText="Deleted" task=deleteUser class="gh-btn gh-btn-red gh-btn-icon"}}
+    {{#if user.count.posts}}
+        {{gh-task-button "Delete user and their posts" successText="Deleted" task=deleteUser class="gh-btn gh-btn-red gh-btn-icon"}}
+    {{else}}
+        {{gh-task-button "Delete user" successText="Deleted" task=deleteUser class="gh-btn gh-btn-red gh-btn-icon"}}
+    {{/if}}
 </div>
diff --git a/ghost/admin/tests/acceptance/team-test.js b/ghost/admin/tests/acceptance/team-test.js
index c93343a9a7..8f27d2cf27 100644
--- a/ghost/admin/tests/acceptance/team-test.js
+++ b/ghost/admin/tests/acceptance/team-test.js
@@ -431,7 +431,7 @@ describe('Acceptance: Team', function () {
             await click('button.delete');
             // user has  posts so should warn about post deletion
             expect(
-                find('.fullscreen-modal .modal-content:contains("is the author of 1 post")').length,
+                find('.fullscreen-modal .modal-content:contains("1 post created by this user")').length,
                 'deleting user with posts has post count'
             ).to.equal(1);