sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added confirmation before deleting messages and moved buttons to top of Inbox. (fixes #4848)

Browse source
This commit is contained in:
Kathryn Norris 2015-03-13 04:11:35 -07:00
parent 881f70997b
commit 47a05338e5
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/locales/en/groups.json
View file

@ -80,8 +80,8 @@
"send": "Send", "send": "Send",
"messageSentAlert": "Message sent", "messageSentAlert": "Message sent",
"pmHeading": "Private message to <%= name %>", "pmHeading": "Private message to <%= name %>",
"clearAll": "Clear All", "deleteAllMessages": "Delete All Messages",
"clearAllPopover": "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", "optOutPopover": "Don't like private messages? Click to completely opt out",
"block": "Block", "block": "Block",
"unblock": "Un-block", "unblock": "Un-block",

6
website/public/js/controllers/groupsCtrl.js
View file

@ -33,6 +33,12 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
group.$save(); group.$save();
group._editing = false; group._editing = false;
} }
$scope.deleteAllMessages = function() {
if (confirm(window.env.t('confirmDeleteAllMessages'))) {
User.user.ops.clearPMs({});
}
}
// ------ Modals ------ // ------ Modals ------

4
website/views/options/social/index.jade
View file

@ -10,14 +10,14 @@ script(type='text/ng-template', id='partials/options.social.inbox.html')
.container-fluid .container-fluid
.row .row
.col-md-12 .col-md-12
+chatMessages('inbox')
.form-inline .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 .checkbox
label label
input(type='checkbox', ng-model='user.inbox.optOut', ng-change='set({"inbox.optOut": user.inbox.optOut?true: false})') input(type='checkbox', ng-model='user.inbox.optOut', ng-change='set({"inbox.optOut": user.inbox.optOut?true: false})')
| &nbsp; | &nbsp;
span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('optOutPopover'))=env.t('optOut') 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') script(type='text/ng-template', id='partials/options.social.tavern.html')
include ./tavern include ./tavern