Merge pull request #4850 from stillsnowedin/develop

Added confirmation before deleting messages and moved buttons to top of ...

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",
+    "clearAll": "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",

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 ------
 

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(ng-click='deleteAllMessages()')=env.t('clearAll')
           .checkbox
             label
               input(type='checkbox', ng-model='user.inbox.optOut', ng-change='set({"inbox.optOut": user.inbox.optOut?true: false})')
               |  
               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