[#1465] bug fixes to achievements listing

public/js/controllers/groupsCtrl.js

@@ -25,7 +25,6 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
         } else {
           // We need the member information up top here, but then we pass it down to the modal controller
           // down below. Better way of handling this?
-          debugger
           Members.selectMember(uid);
           $rootScope.modals.member = true;
         }

views/options/market.html

@@ -1,57 +0,0 @@
-<market:>
-
-    <!-- pets pane -->
-    <div id="market-tab">
-        <table><tr>
-            <td><div class="NPC-Alex pull-left"></div></td>
-            <td>
-                <div class="popover static-popover fade right in">
-                    <div class="arrow"></div>
-                    <h3 class="popover-title">Alexander Augustin</h3>
-                    <div class="popover-content">Welcome to the Market! I'm the merchant, <a target="_blank" href="http://www.kickstarter.com/profile/523661924">Alexander</a>. Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here!</div>
-                </div>
-            </td>
-        </tr></table>
-
-        <h4>Eggs</h4>
-        {#with _items.pets as :egg}
-        <table class="tab-pane pet-grid">
-            <tr>
-                {#with :egg[0]}<app:pets:egg />{/}
-                {#with :egg[1]}<app:pets:egg />{/}
-                {#with :egg[2]}<app:pets:egg />{/}
-                {#with :egg[3]}<app:pets:egg />{/}
-            </tr>
-            <tr>
-                {#with :egg[4]}<app:pets:egg />{/}
-                {#with :egg[5]}<app:pets:egg />{/}
-                {#with :egg[6]}<app:pets:egg />{/}
-                {#with :egg[7]}<app:pets:egg />{/}
-            </tr>
-            <tr>
-                {#with :egg[8]}<app:pets:egg />{/}
-            </tr>
-        </table>
-        {/}
-        <h4>Hatching Potions</h4>
-        {#with _items.hatchingPotions as :hatchingPotion}
-        <table class="tab-pane pet-grid">
-            <tr>
-                {#with :hatchingPotion[0]}<app:pets:hatchingPotion />{/}
-                {#with :hatchingPotion[1]}<app:pets:hatchingPotion />{/}
-                {#with :hatchingPotion[2]}<app:pets:hatchingPotion />{/}
-                {#with :hatchingPotion[3]}<app:pets:hatchingPotion />{/}
-            </tr>
-            <tr>
-                {#with :hatchingPotion[4]}<app:pets:hatchingPotion />{/}
-                {#with :hatchingPotion[5]}<app:pets:hatchingPotion />{/}
-                {#with :hatchingPotion[6]}<app:pets:hatchingPotion />{/}
-                {#with :hatchingPotion[7]}<app:pets:hatchingPotion />{/}
-            </tr>
-            <tr>
-                {#with :hatchingPotion[8]}<app:pets:hatchingPotion />{/}
-                {#with :hatchingPotion[9]}<app:pets:hatchingPotion />{/}
-            </tr>
-        </table>
-        {/}
-    </div>

views/shared/modals/members.html

@@ -1,27 +0,0 @@
-<div ng-controller="MemberModalCtrl">
-    <div modal="modals.member">
-        <app:avatar:profile />
-
-        <!-- see above -->
-        <h2 class='profile-modal-header'>{{username(profile.auth, profile.profile.name)}}</h2>
-        <hr/>
-        <div class='row-fluid'>
-            <div class='span6'>
-                <img ng-show='profile.profile.imageUrl' ng-src="{{profile.profile.imageUrl}}" />
-                <p ng-show="profile.profile.blurb">{{profile.profile.blurb}}</p>
-                <ul ng-show="profile.profile.websites">
-                    <li ng-repeat="website in profile.profile.websites">{{website}}</li>
-                </ul>
-                <h3>Stats</h3>
-                <app:avatar:profile-stats profile={{profile}} />
-            </div>
-            <div class='span6'>
-                <h3>Achievements</h3>
-                <app:avatar:achievements profile={{profile}} />
-            </div>
-        </div>
-        <footer>
-            <button data-dismiss="modal" class="btn btn-success">Ok</button>
-        </footer>
-    </div>
-</div>

views/shared/modals/members.jade

@@ -17,6 +17,6 @@ div(ng-controller='MemberModalCtrl')
         .span6
           include ../header/avatar
           h3 Achievements
-            include ../profiles/achievements
+          include ../profiles/achievements
     .modal-footer
       button.btn.btn-default(ng-click='modals.member = false') Ok

views/shared/profiles/achievements.jade

@@ -13,58 +13,65 @@
   // <div class='achievement achievement-shield'></div>
   // <div class='achievement achievement-karaoke'></div>
 
-  .achievement.achievement-helm(ng-if='profile.backer.npc')
   div(ng-if='profile.backer.npc')
+    .achievement.achievement-helm
     h5
-      span.label.label-success {{profile.backer.npc}} NPC
+      span.label.label-master {{profile.backer.npc}} NPC
     small Backed the Kickstarter project at the maximum level!
     hr
 
-  .achievement.achievement-firefox(ng-if='profile.backer.contributor')
+  div(ng-if='profile.backer.contributor || user._id == profile._id')
-  div(ng-class='{muted: !profile.backer.contributor, hidden: user.id!=profile.id}')
+    .achievement.achievement-firefox(ng-show='profile.backer.contributor')
-    h5
+    div(ng-class='{muted: !profile.backer.contributor}')
-      span.label.label-inverse(ng-if='profile.backer.contributor') {{profile.backer.contributor}}
+      h5
-      span.label(ng-if='!profile.backer.contributor') Contributor
+        span.label(ng-if='profile.backer.contributor', ng-class='nameTagClasses(profile.backer.contributor)') {{profile.backer.contributor}}
-    small
+        span.label(ng-if='!profile.backer.contributor') Contributor
-      | Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :)
+      small.
+        Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :)
     hr
 
-  .achievement.achievement-heart(ng-if='profile.backer.tier')
   div(ng-if='profile.backer.tier')
+    .achievement.achievement-heart
     h5 Kickstarter Backer - ${{profile.backer.tier}} Tier
     small Backed the Kickstarter Project
     hr
 
-  .achievement.achievement-thermometer(ng-show='profile.achievements.streak')
+  div(ng-if='profile.achievements.streak || user._id == profile._id')
-  div(ng-class='{muted: !profile.achievements.streak, hidden: user.id!=profile.id}')
+    .achievement.achievement-thermometer(ng-show='profile.achievements.streak')
-    h5 {{profile.achievements.streak || 0 }} Streak Achievement(s)
+    div(ng-class='{muted: !profile.achievements.streak}')
-    small
+      h5 {{profile.achievements.streak || 0 }} Streak Achievement(s)
-      | Has performed {{profile.achievements.streak || 0 }} 21-day streaks on Dailies
+      small Has performed {{profile.achievements.streak || 0 }} 21-day streaks on Dailies
     hr
 
-  .achievement.achievement-cake(ng-if='profile.achievements.originalUser')
+  div(ng-if='profile.achievements.ultimateGear || user._id == profile._id')
-  div(ng-if='profile.achievements.originalUser')
+    .achievement.achievement-armor(ng-show='profile.achievements.ultimateGear')
-    h5 Original User
+    div(ng-class='{muted: !profile.achievements.ultimateGear}')
-    small
+      h5 Ultimate Gear
-      | Goes way back to the Habit's days of yore (bless them for soldiering through bugs!)
+      small Has upgraded to the maximum weapon and armor set
     hr
 
-  .achievement.achievement-armor(ng-show='profile.achievements.ultimateGear')
+  div(ng-if='profile.achievements.beastMaster || user._id == profile._id')
-  div(ng-class='{muted: !profile.achievements.ultimateGear, hidden: user.id!=profile.id}')
+    .achievement.achievement-rat(ng-show='profile.achievements.beastMaster')
-    h5 Ultimate Gear
+    div(ng-class='{muted: !profile.achievements.beastMaster}')
-    small Has upgraded to the maximum weapon and armor set
+      h5 Beast Master
+      small Has found all 90 pets (insanely difficult, give this user props!)
     hr
 
-  .achievement.achievement-rat(ng-show='profile.achievements.beastMaster')
-  div(ng-class='{muted: !profile.achievements.beastMaster, hidden: user.id!=profile.id}')
-    h5 Beast Master
-    small Has found all 90 pets (insanely difficult, give this user props!)
-    hr
-
-  .achievement.achievement-tree(ng-if='profile.achievements.helpedHabit')
   div(ng-if='profile.achievements.helpedHabit')
+    .achievement.achievement-tree
     h5 Helped Habit Grow
-    small
+    small.
-      | Has helped HabitRPG grow by filling out
+      Helped HabitRPG grow by filling out <a href='http://community.habitrpg.com/node/290' target='_blank'>this survey.</a>
-      a(href='http://community.habitrpg.com/node/290', target='_blank') this survey.
+    hr
+
+  div(ng-if='profile.achievements.originalUser || profile.achievements.veteranUser')
+    .achievement.achievement-cake
+    div(ng-if='profile.achievements.veteran')
+      h5 Veteran
+      small
+        | Has weathered Habit The Grey (our pre Angular website), and has gained many battle-scars from its bugs.
+    div(ng-if='profile.achievements.originalUser')
+      h5 Original User!
+      small
+        | One of the <em>very</em> original early adopters, Talk about alpha tester!
     hr