From 130261dacf376c1042775dc87e2b41ccbc5b6219 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 16 Feb 2015 18:15:09 -0600 Subject: [PATCH] feat(event): End Valentine's --- .../sprites/spritesmith/npcs/npc_bailey.png | Bin 3747 -> 3673 bytes website/public/js/controllers/authCtrl.js | 7 ++----- .../views/options/inventory/inventory.jade | 2 +- website/views/shared/header/menu.jade | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/common/img/sprites/spritesmith/npcs/npc_bailey.png b/common/img/sprites/spritesmith/npcs/npc_bailey.png index 385d1548f685cc1ed090f5be20ab900f2f4a5a29..d5940b986bb48e28954dbf7234480f8421353806 100644 GIT binary patch literal 3673 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 delta 3738 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 Ef-z|{kpKVy diff --git a/website/public/js/controllers/authCtrl.js b/website/public/js/controllers/authCtrl.js index 2cf594965d..6bdd4c0b83 100644 --- a/website/public/js/controllers/authCtrl.js +++ b/website/public/js/controllers/authCtrl.js @@ -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 ---------- diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade index a90ebe977e..6ddb58fa21 100644 --- a/website/views/options/inventory/inventory.jade +++ b/website/views/options/inventory/inventory.jade @@ -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}} diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade index adb5e7231f..cd7a08b00f 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -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')