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

Merge pull request #4697 from SabreCat/valentines

Browse source 
End Valentine's event
This commit is contained in:
Sabe Jones 2015-02-16 18:42:06 -06:00
commit a2772e843c
7 changed files with 202 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/dist/sprites/habitrpg-shared.css vendored
View file

File diff suppressed because one or more lines are too long

394
common/dist/sprites/spritesmith3.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
common/dist/sprites/spritesmith3.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 493 KiB

After

Width:  |  Height:  |  Size: 493 KiB

BIN
common/img/sprites/spritesmith/npcs/npc_bailey.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

7
website/public/js/controllers/authCtrl.js
View file

@ -84,14 +84,12 @@ angular.module('habitrpg')
$scope._expandedMenu = ($scope._expandedMenu == menu) ? null : menu;
};
function selectNotificationValue(mysteryValue, invitationValue, holidayCardValue, unallocatedValue, messageValue, noneValue) {
function selectNotificationValue(mysteryValue, invitationValue, unallocatedValue, messageValue, noneValue) {
var user = $scope.user;
if (user.purchased && user.purchased.plan && user.purchased.plan.mysteryItems && user.purchased.plan.mysteryItems.length) {
return mysteryValue;
} else if ((user.invitations.party && user.invitations.party.id) || (user.invitations.guilds && user.invitations.guilds.length > 0)) {
return invitationValue;
} else if ((user.items.special.valentineReceived[0] || user.items.special.nyeReceived[0])) {
return holidayCardValue;
} else if (user.flags.classSelected && !(user.preferences && user.preferences.disableClasses) && user.stats.points) {
return unallocatedValue;
} else if (!(_.isEmpty(user.newMessages))) {
@ -105,14 +103,13 @@ angular.module('habitrpg')
return selectNotificationValue(
"glyphicon-gift",
"glyphicon-user",
"glyphicon-envelope",
"glyphicon-plus-sign",
"glyphicon-comment",
"glyphicon-comment inactive");
};
$scope.hasNoNotifications = function() {
return selectNotificationValue(false, false, false, false, false, true);
return selectNotificationValue(false, false, false, false, true);
}
// ------ Social ----------

2
website/views/options/inventory/inventory.jade
View file

@ -244,7 +244,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
p
| 20 
span.shop_gold
div
// div
button.customize-option(popover='{{::Content.spells.special.valentine.notes()}}', popover-title='{{::Content.spells.special.valentine.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.valentine)', class='inventory_special_valentine')
p
| {{Content.spells.special.valentine.value}}

2
website/views/shared/header/menu.jade
View file

@ -202,7 +202,7 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
span {{v.name}}
a(ng-click='Groups.seenMessage(k)', popover=env.t('clear'),popover-placement='right',popover-trigger='mouseenter',popover-append-to-body='true')
span.glyphicon.glyphicon-remove-circle
li(ng-if='user.items.special.valentineReceived[0] || user.items.special.nyeReceived[0]')
// li(ng-if='user.items.special.valentineReceived[0] || user.items.special.nyeReceived[0]')
a(ng-click='$state.go("options.inventory.drops"); expandMenu(null)')
span.glyphicon.glyphicon-envelope
span=env.t('holidayCard')