mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-08-04 04:59:40 +00:00
Add unallocated attribute points notification
* Uses i18n "haveUnallocated" string, to come in another commit
This commit is contained in:
parent
74be4b211b
commit
9ecbe9d48f
2 changed files with 9 additions and 2 deletions
|
|
@ -95,12 +95,14 @@ angular.module('authCtrl', [])
|
|||
$scope._expandedMenu = ($scope._expandedMenu == menu) ? null : menu;
|
||||
};
|
||||
|
||||
function selectNotificationValue(mysteryValue, invitationValue, messageValue, noneValue) {
|
||||
function selectNotificationValue(mysteryValue, invitationValue, unallocatedValue, messageValue, noneValue) {
|
||||
var user = $scope.user;
|
||||
if (user.purchased.plan.mysteryItems.length) {
|
||||
return mysteryValue;
|
||||
} else if ((user.invitations.party && user.invitations.party.id) || user.invitations.guilds.length > 0) {
|
||||
return invitationValue;
|
||||
} else if (user.flags.classSelected && !(user.preferences && user.preferences.disableClasses) && user.stats.points) {
|
||||
return unallocatedValue;
|
||||
} else if (!(_.isEmpty(user.newMessages))) {
|
||||
return messageValue;
|
||||
} else {
|
||||
|
|
@ -112,12 +114,13 @@ angular.module('authCtrl', [])
|
|||
return selectNotificationValue(
|
||||
"glyphicon-gift",
|
||||
"glyphicon-user",
|
||||
"glyphicon-plus-sign",
|
||||
"glyphicon-comment",
|
||||
"glyphicon-comment inactive");
|
||||
};
|
||||
|
||||
$scope.hasNoNotifications = function() {
|
||||
return selectNotificationValue(false, false, false, true);
|
||||
return selectNotificationValue(false, false, false, false, true);
|
||||
}
|
||||
}
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -155,6 +155,10 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
|
|||
a(ui-sref='options.social.guilds', ng-click='expandMenu(null)')
|
||||
span.glyphicon.glyphicon-user
|
||||
span=env.t('invitedTo', {name: '{{guild.name}}'})
|
||||
li(ng-if='user.flags.classSelected && !user.preferences.disableClasses && user.stats.points')
|
||||
a(ui-sref='options.profile.stats', ng-click='expandMenu(null)')
|
||||
span.glyphicon.glyphicon-plus-sign
|
||||
span=env.t('haveUnallocated', {points: '{{user.stats.points}}'})
|
||||
li(ng-repeat='(k,v) in user.newMessages', ng-if='v.value')
|
||||
a(ng-click='k==party._id ? $state.go("options.social.party") : $state.go("options.social.guilds.detail",{gid:k}); expandMenu(null)')
|
||||
span.glyphicon.glyphicon-comment
|
||||
|
|
|
|||
Loading…
Reference in a new issue