From a5052b1f515d7f7046e32d12d37140843d2a59e9 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 12 Feb 2015 07:39:10 -0600 Subject: [PATCH] feat(event): Card notifs --- views/shared/header/menu.jade | 5 +++++ views/shared/modals/limited.jade | 6 ++++-- views/shared/new-stuff.jade | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index a08920b3af..642d0db8f3 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -202,6 +202,11 @@ 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 || user.items.special.nyeReceived') + a(ng-click='$state.go("options.inventory.drops"); expandMenu(null)') + span.glyphicon.glyphicon-envelope + span=env.t('holidayCard') + ul.toolbar-controls //-li //-a(ng-click='') Clear all diff --git a/views/shared/modals/limited.jade b/views/shared/modals/limited.jade index 5a1f082f7c..e9889e88e3 100644 --- a/views/shared/modals/limited.jade +++ b/views/shared/modals/limited.jade @@ -8,13 +8,15 @@ script(id='modals/valentine.html', type='text/ng-template') .bg-info(style='padding:10px') p To: {{user.profile.name}}, From: {{user.items.special.valentineReceived[0]}} hr - ul.list-unstyled(ng-switch='::Math.floor(Math.random()*3)') + ul.list-unstyled(ng-switch='::Math.floor(Math.random()*4)') li(ng-switch-when='0') !=env.t('valentine0', {lineBreak:"
"}) li(ng-switch-when='1') !=env.t('valentine1', {lineBreak:"
"}) - li(ng-switch-default) + li(ng-switch-when='2') !=env.t('valentine2', {lineBreak:"
"}) + li(ng-switch-default) + !=env.t('valentine3', {lineBreak:"
"}) p small For enduring such a saccharine poem, you both receive the "Adoring Friends" badge! .modal-footer diff --git a/views/shared/new-stuff.jade b/views/shared/new-stuff.jade index 05200138bc..4d39eb56e4 100644 --- a/views/shared/new-stuff.jade +++ b/views/shared/new-stuff.jade @@ -26,7 +26,7 @@ mixin oldNews tr td h5 Login Type Switching - p Want to change your email address, or switch from Facebook login to email login (or vice versa)? Good news! Now you can switch it yourself, under Settings! + p Want to change your email address, or switch from Facebook login to email login? Good news! Now you can switch it yourself, under Settings! p.small.muted by Lefnire h5 2/3/2015 tr