From 47a05338e512060de5c8f3c4c6ae7776ccf80918 Mon Sep 17 00:00:00 2001
From: Kathryn Norris <kathrynanorris@gmail.com>
Date: Fri, 13 Mar 2015 04:11:35 -0700
Subject: [PATCH] Added confirmation before deleting messages and moved buttons
 to top of Inbox. (fixes #4848)

---
 common/locales/en/groups.json               | 4 ++--
 website/public/js/controllers/groupsCtrl.js | 6 ++++++
 website/views/options/social/index.jade     | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json
index 68d451311c..e036d7cdbd 100644
--- a/common/locales/en/groups.json
+++ b/common/locales/en/groups.json
@@ -80,8 +80,8 @@
     "send": "Send",
     "messageSentAlert": "Message sent",
     "pmHeading": "Private message to <%= name %>",
-    "clearAll": "Clear All",
-    "clearAllPopover": "Delete all messages",
+    "deleteAllMessages": "Delete All Messages",
+    "confirmDeleteAllMessages": "Are you sure you want to delete all messages in your inbox? Other users will still see messages you have sent to them.",
     "optOutPopover": "Don't like private messages? Click to completely opt out",
     "block": "Block",
     "unblock": "Un-block",
diff --git a/website/public/js/controllers/groupsCtrl.js b/website/public/js/controllers/groupsCtrl.js
index 3f27ecd82e..c17dfc1b59 100644
--- a/website/public/js/controllers/groupsCtrl.js
+++ b/website/public/js/controllers/groupsCtrl.js
@@ -33,6 +33,12 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
         group.$save();
         group._editing = false;
       }
+                                   
+      $scope.deleteAllMessages = function() {
+        if (confirm(window.env.t('confirmDeleteAllMessages'))) {
+          User.user.ops.clearPMs({});
+        }
+      }
 
       // ------ Modals ------
 
diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade
index ead6e5965b..e53410e1a7 100644
--- a/website/views/options/social/index.jade
+++ b/website/views/options/social/index.jade
@@ -10,14 +10,14 @@ script(type='text/ng-template', id='partials/options.social.inbox.html')
   .container-fluid
     .row
       .col-md-12
-        +chatMessages('inbox')
         .form-inline
-          a.btn.btn-xs.btn-danger(popover=env.t('clearAllPopover'), popover-trigger='mouseenter', ng-click='user.ops.clearPMs({})', popover-placement='right')=env.t('clearAll')
+          a.btn.btn-xs.btn-danger(popover=env.t('deleteAllMessages'), popover-trigger='mouseenter', ng-click='deleteAllMessages()', popover-placement='right')=env.t('deleteAllMessages')
           .checkbox
             label
               input(type='checkbox', ng-model='user.inbox.optOut', ng-change='set({"inbox.optOut": user.inbox.optOut?true: false})')
               | &nbsp;
               span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('optOutPopover'))=env.t('optOut')
+        +chatMessages('inbox')
 
 script(type='text/ng-template', id='partials/options.social.tavern.html')
   include ./tavern