possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb

2026-08-02 04:00:36 +00:00 · 2015-02-17 13:36:07 +08:00 · 2015-02-17 13:36:07 +08:00 · 7a08ff360f
commit 7a08ff360f
parent feb1e01c4d
1 changed files with 115 additions and 40 deletions
--- a/website/views/shared/profiles/achievements.jade
+++ b/website/views/shared/profiles/achievements.jade
@ -11,49 +11,61 @@
 // <div class='achievement achievement-shield'></div>
 // <div class='achievement achievement-karaoke'></div>

-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') 
+      |&nbsp;
+      +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 }}&nbsp;
+    h5(ng-show='profile.achievements.streak > 1 || !profile.achievements.streak')
+
+      | {{profile.achievements.streak || 0 }}&nbsp;
      =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 }}&nbsp;
+    h5(ng-show='profile.achievements.perfect > 1 || !profile.achievements.perfect')
+
+      | {{profile.achievements.perfect || 0 }}&nbsp;
      =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 <a href='https://github.com/HabitRPG/habitrpg/issues/2232' target='_blank'>Returning soon</a>
+    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,37 +120,40 @@ div(ng-if='profile.achievements.rebirths')
    |&nbsp;{{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')
    |&nbsp;
-    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')
+div(ng-if=':: profile.achievements.veteran')
  .achievement.achievement-cake
-  div(ng-if='profile.achievements.veteran')
+  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
+
+div(ng-if=':: profile.achievements.originalUser')
+  .achievement.achievement-alpha
+  div(ng-if='::profile.achievements.originalUser')
+    h5=env.t('originalUser')
+    small!=env.t('originalUserText')
  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 
-
 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 +162,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 +173,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