diff --git a/website/public/js/controllers/notificationCtrl.js b/website/public/js/controllers/notificationCtrl.js index a90a30556a..34fd68f8a9 100644 --- a/website/public/js/controllers/notificationCtrl.js +++ b/website/public/js/controllers/notificationCtrl.js @@ -66,6 +66,7 @@ habitrpg.controller('NotificationCtrl', $rootScope.playSound('Level_Up'); if (User.user._tmp && User.user._tmp.drop && (User.user._tmp.drop.type === 'Quest')) return; if (after === 3) return; // Drop system unlock. FIXME can we do this without hardcoding? + if (after === 10) return; // Class system unlock. FIXME as above if (after === 50) return; // Orb of Rebirth unlock FIXME as above if (!User.user.preferences.suppressModals.levelUp) $rootScope.openModal('levelUp', {controller:'UserCtrl', size:'sm'}); }); diff --git a/website/public/js/services/notificationServices.js b/website/public/js/services/notificationServices.js index 3916dceb47..f4556f6989 100644 --- a/website/public/js/services/notificationServices.js +++ b/website/public/js/services/notificationServices.js @@ -108,7 +108,6 @@ angular.module("habitrpg").factory("Notification", var stack_topright = {"dir1": "down", "dir2": "left", "spacing1": 15, "spacing2": 15, "firstpos1": 60}; function _notify(html, type, icon) { - console.log(type) var notice = $.pnotify({ type: type || 'warning', //('info', 'text', 'warning', 'success', 'gp', 'xp', 'hp', 'lvl', 'death', 'mp', 'crit') text: html, diff --git a/website/views/shared/modals/hatch-pet.jade b/website/views/shared/modals/hatch-pet.jade index 3d536e1821..bca355737f 100644 --- a/website/views/shared/modals/hatch-pet.jade +++ b/website/views/shared/modals/hatch-pet.jade @@ -25,7 +25,7 @@ script(type='text/ng-template', id='modals/hatchPet.html') .container-fluid .row .col-xs-3 - a.twitter-share-button(href='https://twitter.com/intent/tweet?text=I just hatched a {{::hatchedPet.potion}} {{::hatchedPet.egg}} by completing my real-life tasks!&via=habitica&url=#{env.BASE_URL}/social/hatch-pet&count=none')=env.t('tweet') + a.twitter-share-button(href='https://twitter.com/intent/tweet?text="I just hatched a {{::hatchedPet.potion}} {{::hatchedPet.egg}} by completing my real-life tasks!"&via=habitica&url=#{env.BASE_URL}/social/hatch-pet&count=none')=env.t('tweet') .col-xs-4(style='margin-left:.8em') .fb-share-button(data-href='#{env.BASE_URL}/social/hatch-pet', data-layout='button') .col-xs-4(style='margin-left:.8em') diff --git a/website/views/shared/modals/level-up.jade b/website/views/shared/modals/level-up.jade index 256f199cd7..97f021d530 100644 --- a/website/views/shared/modals/level-up.jade +++ b/website/views/shared/modals/level-up.jade @@ -23,7 +23,7 @@ script(type='text/ng-template', id='modals/levelUp.html') .container-fluid .row .col-xs-3 - a.twitter-share-button(href='https://twitter.com/intent/tweet?text=I got to Level {{::user.stats.lvl}} in Habitica by improving my real-life habits!&via=habitica&url=#{env.BASE_URL}/social/level-up&count=none')=env.t('tweet') + a.twitter-share-button(href='https://twitter.com/intent/tweet?text=I+got+to+Level+{{::user.stats.lvl}}+in+Habitica+by+improving+my+real-life+habits!&via=habitica&url=#{env.BASE_URL}/social/level-up&count=none')=env.t('tweet') .col-xs-4(style='margin-left:.8em') .fb-share-button(data-href='#{env.BASE_URL}/social/level-up', data-layout='button') .col-xs-4(style='margin-left:.8em') diff --git a/website/views/shared/modals/quests.jade b/website/views/shared/modals/quests.jade index f9f0a078d5..fdb0ca9496 100644 --- a/website/views/shared/modals/quests.jade +++ b/website/views/shared/modals/quests.jade @@ -110,7 +110,7 @@ script(type='text/ng-template', id='modals/questDrop.html') .container-fluid .row .col-xs-3 - a.twitter-share-button(href='https://twitter.com/intent/tweet?text=I unlocked the quest {{::selectedQuest.text()}} in Habitica!&via=habitica&url=#{env.BASE_URL}/social/unlock-quest&count=none')=env.t('tweet') + a.twitter-share-button(href='https://twitter.com/intent/tweet?text="I unlocked the quest {{::selectedQuest.text()}} in Habitica!"&via=habitica&url=#{env.BASE_URL}/social/unlock-quest&count=none')=env.t('tweet') .col-xs-4(style='margin-left:.8em') .fb-share-button(data-href='#{env.BASE_URL}/social/unlock-quest', data-layout='button') .col-xs-4(style='margin-left:.8em') diff --git a/website/views/shared/modals/raise-pet.jade b/website/views/shared/modals/raise-pet.jade index eb3e5015b7..47c9b1d0cd 100644 --- a/website/views/shared/modals/raise-pet.jade +++ b/website/views/shared/modals/raise-pet.jade @@ -25,7 +25,7 @@ script(type='text/ng-template', id='modals/raisePet.html') .container-fluid .row .col-xs-3 - a.twitter-share-button(href='https://twitter.com/intent/tweet?text=I just raised a {{::raisedPet.displayName}} mount by completing my real-life tasks!&via=habitica&url=#{env.BASE_URL}/social/raise-pet&count=none')=env.t('tweet') + a.twitter-share-button(href='https://twitter.com/intent/tweet?text="I just raised a {{::raisedPet.displayName}} mount by completing my real-life tasks!"&via=habitica&url=#{env.BASE_URL}/social/raise-pet&count=none')=env.t('tweet') .col-xs-4(style='margin-left:.8em') .fb-share-button(data-href='#{env.BASE_URL}/social/raise-pet', data-layout='button') .col-xs-4(style='margin-left:.8em') diff --git a/website/views/shared/modals/won-challenge.jade b/website/views/shared/modals/won-challenge.jade index 1a3950001b..13f97b7477 100644 --- a/website/views/shared/modals/won-challenge.jade +++ b/website/views/shared/modals/won-challenge.jade @@ -30,7 +30,7 @@ script(type='text/ng-template', id='modals/wonChallenge.html') .container-fluid .row .col-xs-3 - a.twitter-share-button(href='https://twitter.com/intent/tweet?text=I just won the Challenge {{::user.achievements.challenges[user.achievements.challenges.length - 1]}} in Habitica!&via=habitica&url=#{env.BASE_URL}/social/won-challenge&count=none')=env.t('tweet') + a.twitter-share-button(href='https://twitter.com/intent/tweet?text="I just won the Challenge {{::user.achievements.challenges[user.achievements.challenges.length - 1]}} in Habitica!"&via=habitica&url=#{env.BASE_URL}/social/won-challenge&count=none')=env.t('tweet') .col-xs-4(style='margin-left:.8em') .fb-share-button(data-href='#{env.BASE_URL}/social/won-challenge', data-layout='button') .col-xs-4(style='margin-left:.8em')