From 02744e0c170cb7c610bc4c8bcb00930badb0dc16 Mon Sep 17 00:00:00 2001 From: remmz0r Date: Tue, 17 Feb 2015 13:36:07 +0800 Subject: [PATCH 1/7] possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb --- .../views/shared/profiles/achievements.jade | 142 +++++++++++++----- 1 file changed, 107 insertions(+), 35 deletions(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index a61952968b..be97908dfe 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -11,49 +11,61 @@ //
//
-div(ng-if='profile.backer.npc') +if mobile + .item.item-divider=env.t('achievements') + +div(ng-if='::profile.backer.npc') .achievement.achievement-helm h5 span.label.label-npc - | {{profile.backer.npc}} + | {{::profile.backer.npc}} =env.t('npc') small=env.t('npcText') hr -div(ng-if='profile.contributor.level || user._id == profile._id') - .achievement.achievement-firefox(ng-if='profile.contributor.level') - div(ng-class='{muted: !profile.contributor.level}') +div(ng-if='::profile.contributor.level || user._id == profile._id') + .achievement.achievement-firefox(ng-if='::profile.contributor.level') + div(ng-class='::{muted: !profile.contributor.level}') h5 - span.label.label-default(ng-if='profile.contributor.level', class='label-contributor-{{profile.contributor.level}}') {{contribText(profile.contributor, profile.backer)}} - span.label.label-default(ng-if='!profile.contributor.level')=env.t('contribName') + span.label.label-default(ng-if='::profile.contributor.level', class='label-contributor-{{::profile.contributor.level}}') {{::contribText(profile.contributor, profile.backer)}} + span.label.label-default(ng-if='::!profile.contributor.level')=env.t('contribName') small =env.t('contribText') - a(href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG', target='_blank')=env.t('readMore') + |  + +aLink('http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG', env.t('readMore')) | . hr -div(ng-if='profile.backer.tier') +div(ng-if='::profile.backer.tier') .achievement.achievement-heart - h5=env.t('kickstartName', {tier: "{{profile.backer.tier}}"}) + h5=env.t('kickstartName', {tier: "{{::profile.backer.tier}}"}) small=env.t('kickstartText') hr div(ng-if='profile.achievements.streak || user._id == profile._id') .achievement.achievement-thermometer(ng-show='profile.achievements.streak') div(ng-class='{muted: !profile.achievements.streak}') - h5 - |{{profile.achievements.streak || 0 }}  + h5(ng-show='profile.achievements.streak > 1 || !profile.achievements.streak') + + | {{profile.achievements.streak || 0 }}  =env.t('streakName') - small=env.t('streakText', {streaks: "{{profile.achievements.streak || 0 }}"}) + small(ng-show='profile.achievements.streak > 1 || !profile.achievements.streak')=env.t('streakText', {streaks: "{{profile.achievements.streak || 0 }}"}) + h5(ng-show='profile.achievements.streak == 1') + =env.t('streakSingular') + small(ng-show='profile.achievements.streak == 1')=env.t('streakSingularText') hr div(ng-if='profile.achievements.perfect || user._id == profile._id') .achievement.achievement-perfect(ng-show='profile.achievements.perfect') div(ng-class='{muted: !profile.achievements.perfect}') - h5 - |{{profile.achievements.perfect || 0 }}  + h5(ng-show='profile.achievements.perfect > 1 || !profile.achievements.perfect') + + | {{profile.achievements.perfect || 0 }}  =env.t('perfectName') - small=env.t('perfectText', {perfects: "{{profile.achievements.perfect || 0 }}"}) + small(ng-show='profile.achievements.perfect > 1 || !profile.achievements.perfect')=env.t('perfectText', {perfects: "{{profile.achievements.perfect || 0 }}"}) + h5(ng-show='profile.achievements.perfect == 1') + =env.t('perfectSingular') + small(ng-show='profile.achievements.perfect == 1')=env.t('perfectSingularText') hr //-div(ng-if='profile.achievements.ultimateGear || user._id == profile._id') @@ -63,17 +75,39 @@ div(ng-if='profile.achievements.perfect || user._id == profile._id') small=env.t('ultimGearText') hr // Remove the following when ultimate gear is fixed (https://github.com/HabitRPG/habitrpg/issues/2232): -div(ng-if='user._id == profile._id') +div(ng-if='::user._id == profile._id') div.muted h5=env.t('ultimGearName') - small Returning soon + small + +aLink('https://github.com/HabitRPG/habitrpg/issues/2232', 'Returning soon') hr div(ng-if='profile.achievements.beastMaster || user._id == profile._id') .achievement.achievement-rat(ng-show='profile.achievements.beastMaster') div(ng-class='{muted: !profile.achievements.beastMaster}') - h5=env.t('beastMastName') - small=env.t('beastMastText') + h5=env.t('beastMasterName') + small=env.t('beastMasterText') + small(ng-if='profile.achievements.beastMasterCount') + =env.t('beastMasterText2', {count: "{{profile.achievements.beastMasterCount}}"}) + hr + +div(ng-if='profile.achievements.mountMaster || user._id == profile._id') + .achievement.achievement-wolf(ng-show='profile.achievements.mountMaster') + div(ng-class='{muted: !profile.achievements.mountMaster}') + h5=env.t('mountMasterName') + small=env.t('mountMasterText') + small(ng-if='profile.achievements.mountMasterCount') + =env.t('mountMasterText2', {count: "{{profile.achievements.mountMasterCount}}"}) + hr + +div(ng-if='profile.achievements.triadBingo || user._id == profile._id') + .achievement.achievement-triadbingo(ng-show='profile.achievements.triadBingo') + div(ng-class='{muted: !profile.achievements.triadBingo}') + h5=env.t('triadBingoName') + + small=env.t('triadBingoText') + small(ng-if='profile.achievements.triadBingoCount') + =env.t('triadBingoText2', {count: "{{profile.achievements.triadBingoCount}}"}) hr div(ng-if='profile.achievements.rebirths') @@ -86,13 +120,13 @@ div(ng-if='profile.achievements.rebirths') | {{profile.achievements.rebirthLevel}}. hr -div(ng-if='profile.achievements.helpedHabit') +div(ng-if='::profile.achievements.helpedHabit') .achievement.achievement-tree h5=env.t('helped') small =env.t('helpedText1') |  - a(href='http://community.habitrpg.com/node/290', target='_blank')=env.t('helpedText2') + +aLink('http://community.habitrpg.com/node/290', env.t('helpedText2')) hr div(ng-if='profile.achievements.veteran') @@ -101,22 +135,22 @@ div(ng-if='profile.achievements.veteran') h5=env.t('veteran') small=env.t('veteranText') hr - + div(ng-if='profile.achievements.originalUser') .achievement.achievement-alpha div(ng-if='profile.achievements.originalUser') h5=env.t('originalUser') - small=env.t('originalUserText') - hr - + small!=env.t('originalUserText') + hr + div(ng-if='profile.achievements.challenges || user._id == profile._id') // This is a very strange icon to use. revisit .achievement.achievement-karaoke(ng-show='profile.achievements.challenges') div(ng-class='{muted: !profile.achievements.challenges}') h5=env.t('challengeWinner') table.table.table-striped - tr(ng-repeat='chal in profile.achievements.challenges') - td {{chal}} + tr(ng-repeat='chal in profile.achievements.challenges track by $index') + td {{::chal}} hr div(ng-if='profile.achievements.quests || user._id == profile._id') @@ -125,7 +159,7 @@ div(ng-if='profile.achievements.quests || user._id == profile._id') h5=env.t('completedQuests') table.table.table-striped tr(ng-repeat='(k,v) in profile.achievements.quests') - td {{Content.quests[k].text}} + td {{::Content.quests[k].text()}} td x{{v}} hr @@ -136,16 +170,54 @@ div(ng-if='profile.achievements.snowball') =env.t('annoyingFriendsText', {snowballs: "{{profile.achievements.snowball}}"}) hr -div(ng-if='profile.achievements.habitBirthday') - .achievement.achievement-habitBirthday - h5=env.t('habitBirthday') +div(ng-if='profile.achievements.spookDust') + .achievement.achievement-spookDust + h5=env.t('alarmingFriends') small - =env.t('habitBirthdayText') + =env.t('alarmingFriendsText', {spookDust: "{{profile.achievements.spookDust}}"}) hr -div(ng-if='profile.achievements.valentine') +div(ng-if='::profile.achievements.habitBirthdays') + .achievement.achievement-habitBirthday + h5=env.t('habitBirthday') + small(ng-if='::profile.achievements.habitBirthdays == 1') + + =env.t('habitBirthdayText') + small(ng-if='::profile.achievements.habitBirthdays > 1') + =env.t('habitBirthdayPluralText', {number: "{{profile.achievements.habitBirthdays}}"}) + hr + +div(ng-if='::profile.achievements.valentine') .achievement.achievement-valentine h5=env.t('adoringFriends') small - =env.t('adoringFriendsText', {cards: "{{profile.achievements.valentine}}"}) + =env.t('adoringFriendsText', {cards: "{{::profile.achievements.valentine}}"}) hr + +div(ng-if='::profile.achievements.quests.dilatory') + .achievement.achievement-dilatory + h5=env.t('achievementDilatory') + small + =env.t('achievementDilatoryText') + hr + +div(ng-if='::profile.achievements.costumeContest') + .achievement.achievement-costumeContest + h5=env.t('costumeContest') + small + =env.t('costumeContestText') + hr + +div(ng-if='::profile.achievements.nye') + .achievement.achievement-nye + h5=env.t('auldAcquaintance') + small + =env.t('auldAcquaintanceText', {cards: "{{::profile.achievements.nye}}"}) + hr + +div(ng-if='::profile.achievements.quests.stressbeast') + .achievement.achievement-stoikalm + h5=env.t('achievementStressbeast') + small + =env.t('achievementStressbeastText') + hr \ No newline at end of file From 2ef3848a09ffd7ed1f2dbea782ab434d09a41096 Mon Sep 17 00:00:00 2001 From: remmy poos Date: Tue, 17 Feb 2015 21:39:24 +0800 Subject: [PATCH 2/7] Fixes issue #4670 find/replaced archery links with new guild --- website/views/options/social/index.jade | 2 +- website/views/options/social/tavern.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade index 24b86ab7e5..d9b2fe3535 100644 --- a/website/views/options/social/index.jade +++ b/website/views/options/social/index.jade @@ -39,7 +39,7 @@ script(type='text/ng-template', id='partials/options.social.party.html') p =env.t('startLFG') |  - a(href="http://habitrpg.wikia.com/wiki/Board:The_Archery_-_LFG")=env.t('linkLFG') + a(href="https://habitrpg.com/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601")=env.t('linkLFG') |  =env.t('endLFG') include ./create-group diff --git a/website/views/options/social/tavern.jade b/website/views/options/social/tavern.jade index 0739126588..48ed144348 100644 --- a/website/views/options/social/tavern.jade +++ b/website/views/options/social/tavern.jade @@ -34,7 +34,7 @@ a(target='_blank', href='/static/community-guidelines')=env.t('communityGuidelines') tr td - a(target='_blank', href='http://habitrpg.wikia.com/wiki/Board:The_Archery_-_LFG')=env.t('lfgPosts') + a(target='_blank', href='https://habitrpg.com/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601')=env.t('lfgPosts') tr td a(target='_blank', href='https://vimeo.com/57654086')=env.t('tutorial') From f6e549caf0bc5d4b7aec898ef1d4fc8cfe517dbe Mon Sep 17 00:00:00 2001 From: remmz0r Date: Tue, 17 Feb 2015 21:58:22 +0800 Subject: [PATCH 3/7] fixes #4696 original user badge not showing veteran badge also showing now --- website/views/shared/profiles/achievements.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index be97908dfe..b9fa0f90b6 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -130,15 +130,15 @@ div(ng-if='::profile.achievements.helpedHabit') hr div(ng-if='profile.achievements.veteran') - .achievement.achievement-cake - div(ng-if='profile.achievements.veteran') + .achievement.achievement-alpha + div(ng-if='::profile.achievements.veteran') h5=env.t('veteran') small=env.t('veteranText') hr -div(ng-if='profile.achievements.originalUser') +div(ng-if='::profile.achievements.originalUser') .achievement.achievement-alpha - div(ng-if='profile.achievements.originalUser') + div(ng-if='::profile.achievements.originalUser') h5=env.t('originalUser') small!=env.t('originalUserText') hr From 263d1369930bfb01707d2d35856c5ab79d0716a4 Mon Sep 17 00:00:00 2001 From: remmy poos Date: Tue, 17 Feb 2015 22:17:01 +0800 Subject: [PATCH 4/7] fixes #4696 sorry, a billion things to learn about git this code -should- work tested locally --- website/views/shared/profiles/achievements.jade | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index 9b35d57d5e..0c851b5d4d 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -129,26 +129,14 @@ div(ng-if='::profile.achievements.helpedHabit') +aLink('http://community.habitrpg.com/node/290', env.t('helpedText2')) hr -<<<<<<< HEAD -div(ng-if='profile.achievements.veteran') - .achievement.achievement-alpha -======= div(ng-if=':: profile.achievements.veteran') .achievement.achievement-cake ->>>>>>> 7a08ff360f988a02b96417b2040b5d806b426101 div(ng-if='::profile.achievements.veteran') h5=env.t('veteran') small=env.t('veteranText') - div(ng-if='::profile.achievements.originalUser') - h5=env.t('originalUser') - small!=env.t('originalUserText') hr -<<<<<<< HEAD -div(ng-if='::profile.achievements.originalUser') -======= div(ng-if=':: profile.achievements.originalUser') ->>>>>>> 7a08ff360f988a02b96417b2040b5d806b426101 .achievement.achievement-alpha div(ng-if='::profile.achievements.originalUser') h5=env.t('originalUser') From 56c7d9ff9a22ddfa3e898f84c062968ede27c86f Mon Sep 17 00:00:00 2001 From: remmy poos Date: Tue, 17 Feb 2015 22:34:59 +0800 Subject: [PATCH 5/7] couldn't figure out how to push two unedited files so this is an edit so i can repush correct files --- website/views/options/social/index.jade | 2 +- website/views/options/social/tavern.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade index d9b2fe3535..b43ec1745e 100644 --- a/website/views/options/social/index.jade +++ b/website/views/options/social/index.jade @@ -1,6 +1,6 @@ // FIXME note, due to https://github.com/angular-ui/bootstrap/issues/783 we can't use nested angular-bootstrap tabs // Subscribe to that ticket & change this when they fix - +// include ./challenges include ./hall include ./boss diff --git a/website/views/options/social/tavern.jade b/website/views/options/social/tavern.jade index 48ed144348..beda13b0c6 100644 --- a/website/views/options/social/tavern.jade +++ b/website/views/options/social/tavern.jade @@ -1,6 +1,6 @@ .container-fluid .row - .col-md-4 + .col-md-45 +boss(true, false) From 1746ec45188afe99f778bb61feedb3f68d1f648e Mon Sep 17 00:00:00 2001 From: remmy poos Date: Tue, 17 Feb 2015 22:37:42 +0800 Subject: [PATCH 6/7] fixes nothing (breaks everything) --- website/views/options/social/index.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade index b43ec1745e..27c104054e 100644 --- a/website/views/options/social/index.jade +++ b/website/views/options/social/index.jade @@ -1,7 +1,7 @@ // FIXME note, due to https://github.com/angular-ui/bootstrap/issues/783 we can't use nested angular-bootstrap tabs // Subscribe to that ticket & change this when they fix -// -include ./challenges + +include ./challengesss include ./hall include ./boss include ./chat-message From b2aa9f399fa80ca9cea971741d9cc96049bef518 Mon Sep 17 00:00:00 2001 From: remmy poos Date: Tue, 17 Feb 2015 22:40:18 +0800 Subject: [PATCH 7/7] fixes #4670 changes Archery links to guild in tavern --- website/views/options/social/index.jade | 2 +- website/views/options/social/tavern.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade index 27c104054e..d9b2fe3535 100644 --- a/website/views/options/social/index.jade +++ b/website/views/options/social/index.jade @@ -1,7 +1,7 @@ // FIXME note, due to https://github.com/angular-ui/bootstrap/issues/783 we can't use nested angular-bootstrap tabs // Subscribe to that ticket & change this when they fix -include ./challengesss +include ./challenges include ./hall include ./boss include ./chat-message diff --git a/website/views/options/social/tavern.jade b/website/views/options/social/tavern.jade index beda13b0c6..48ed144348 100644 --- a/website/views/options/social/tavern.jade +++ b/website/views/options/social/tavern.jade @@ -1,6 +1,6 @@ .container-fluid .row - .col-md-45 + .col-md-4 +boss(true, false)