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 buttons to footer, cleaned up functions

Browse source
This commit is contained in:
Blade Barringer 2014-12-05 06:41:40 -06:00 committed by Matteo Pagliazzi
parent c90ea166d4
commit 62d92db332
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
public/js/controllers/groupsCtrl.js
View file

@ -105,9 +105,12 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
$rootScope.openModal('private-message',{controller:'MemberModalCtrl'});
});
}
$scope.flagChat = function(uid) {
Members.selectMember(uid, function(){
$rootScope.openModal('abuse-flag',{controller:'MemberModalCtrl'});
$scope.flagChat = function(message) {
$scope.abuseObject = message;
Members.selectMember(message.uuid, function(){
$rootScope.openModal('abuse-flag',{controller:'MemberModalCtrl',
scope: $scope
});
});
}
}
@ -144,6 +147,11 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
$scope.$close();
})
}
$scope.reportAbuse = function(reporter, message) {
Notification.text(window.env.t('abuseReported'));
$rootScope.User.sync();
$scope.$close();
}
}
])

2
views/options/social/chat-message.jade
View file

@ -25,7 +25,7 @@ mixin chatMessages(inbox)
|        
a(ng-click='#{inbox? "user.ops.deletePM({params:{id:message.$key}})" : "deleteChatMessage(group, message)"}', ng-if='#{inbox ? "true" : ":: user.contributor.admin || message.uuid == user.id"}')
span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
a(ng-click="flagChat(message.uuid)", ng-if='#{inbox ? "true" : ":: message.uuid != user.id"}')
a(ng-click="flagChat(message)", ng-if='#{inbox ? "true" : ":: message.uuid != user.id"}')
span.glyphicon.glyphicon-flag(tooltip=env.t('abuseFlag'))
span.float-label
a.label.label-default.chat-message(ng-if=':: message.user', ng-class='::userLevelStyleFromLevel(message.contributor.level, message.backer.npc, style)', ng-click='clickMember(message.uuid, true)')

2
views/shared/modals/members.jade
View file

@ -96,3 +96,5 @@ script(type='text/ng-template', id='modals/abuse-flag.html')
.modal-body
h4!=env.t('abuseFlagModalBody', {firstLinkStart: "<a href='/static/community-guidelines' target='_blank'>", secondLinkStart: "<a href='/static/terms' target='_blank'>", linkEnd: "</a>"})
.modal-footer
button.btn.btn-primary(ng-click='$close()')=env.t('cancel')
button.btn.btn-default(ng-click='reportAbuse(user, abuseObject)')=env.t("abuseFlagModalButton")