feat(sharing): Remaining cheevo modals

HabitRPG · Nov 10, 2015 · 23df5b6 · 23df5b6
1 parent 875f2ac
commit 23df5b6
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 40 deletions.
diff --git a/website/public/js/controllers/inventoryCtrl.js b/website/public/js/controllers/inventoryCtrl.js
@@ -128,15 +128,15 @@ habitrpg.controller("InventoryCtrl",
       if(!user.achievements.beastMaster
           && $scope.petCount >= 90) {
         User.user.achievements.beastMaster = true;
-        $rootScope.openModal('achievements/beastMaster', {controller:'UserCtrl'});
+        $rootScope.openModal('achievements/beastMaster', {controller:'UserCtrl', size:'sm'});
       }
 
       // Checks if Triad Bingo has been reached for the first time
       if(!user.achievements.triadBingo
           && $scope.mountCount >= 90
           && Shared.count.dropPetsCurrentlyOwned(User.user.items.pets) >= 90) {
         User.user.achievements.triadBingo = true;
-        $rootScope.openModal('achievements/triadBingo');
+        $rootScope.openModal('achievements/triadBingo', {controller:'UserCtrl', size:'sm'});
       }
     }
 
@@ -169,7 +169,7 @@ habitrpg.controller("InventoryCtrl",
         if(!user.achievements.mountMaster
             && $scope.mountCount >= 90) {
           User.user.achievements.mountMaster = true;
-          $rootScope.openModal('achievements/mountMaster');
+          $rootScope.openModal('achievements/mountMaster', {controller:'UserCtrl', size:'sm'});
         }
 
       // Selecting Pet

diff --git a/website/public/js/controllers/notificationCtrl.js b/website/public/js/controllers/notificationCtrl.js
@@ -154,12 +154,12 @@ habitrpg.controller('NotificationCtrl',
 
     $rootScope.$watch('user.achievements.rebirths', function(after, before){
       if(after === before) return;
-      $rootScope.openModal('achievements/rebirth');
+      $rootScope.openModal('achievements/rebirth', {controller:'UserCtrl', size: 'sm'});
     });
 
     $rootScope.$watch('user.flags.contributor', function(after, before){
       if (after === before || after !== true) return;
-      $rootScope.openModal('achievements/contributor');
+      $rootScope.openModal('achievements/contributor',{controller:'UserCtrl'});
     });
 
     // Completed quest modal

diff --git a/website/views/shared/modals/achievements.jade b/website/views/shared/modals/achievements.jade
@@ -68,7 +68,7 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
       .shop_armoire.pull-right
       p!=env.t("armoireUnlocked")
       br
-      button.btn.btn-primary(ng-click='$close()')=env.t('ok')
+      button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
     +achievementFooter
 
 // Beast Master
@@ -79,54 +79,55 @@ script(id='modals/achievements/beastMaster.html', type='text/ng-template')
       +achievementAvatar('rat',0)
       p=env.t('beastAchievement')
       br
-      button.btn.btn-primary(ng-click='$close()')=env.t('ok')
+      button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
     +achievementFooter
 
 
 // Mount Master
 script(id='modals/achievements/mountMaster.html', type='text/ng-template')
-  .modal-header
-    h4=env.t('modalAchievement')
-  .modal-body
-    p
-      .achievement.achievement-wolf
-      =env.t('mountAchievement')
-  .modal-footer
-    button.btn.btn-default(ng-click='$close()')=env.t('ok')
+  .modal-content(style='min-width:28em')
+    .modal-body.text-center
+      h3(style='margin-bottom:0')=env.t('modalAchievement')
+      +achievementAvatar('wolf',0)
+      p=env.t('mountAchievement')
+      br
+      button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
+    +achievementFooter
 
 // Triad Bingo
 script(id='modals/achievements/triadBingo.html', type='text/ng-template')
-  .modal-header
-    h4=env.t('modalAchievement')
-  .modal-body
-    p
-      .achievement.achievement-triadbingo
-      =env.t('triadBingoAchievement')
-  .modal-footer
-    button.btn.btn-default(ng-click='$close()')=env.t('ok')
+  .modal-content(style='min-width:28em')
+    .modal-body.text-center
+      h3(style='margin-bottom:0')=env.t('modalAchievement')
+      +achievementAvatar('triadbingo',0)
+      p=env.t('triadBingoAchievement')
+      br
+      button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
+    +achievementFooter
 
 // Contributor
 // activated by user.flags.contributor
 script(id='modals/achievements/contributor.html', type='text/ng-template')
-  .modal-header
-    h4=env.t('modalContribAchievement')
-  .modal-body
-    div(class="#{env.worldDmg.guide ? 'npc_justin_broken.float-left' : 'npc_justin.float-left'}")
-    p
+  .modal-content(style='min-width:28em')
+    .modal-body.text-center
+      h3(style='margin-bottom:0')=env.t('modalContribAchievement')
+      +achievementAvatar('boot',0)
       !=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"}) + ' '
       a(href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink')
-  .modal-footer
-    button.btn.btn-default(ng-click='set({"flags.contributor":false}); $close()')=env.t('ok')
+      br
+      button.btn.btn-primary(style='margin-top:1em' ng-click='set({"flags.contributor":false}); $close()')=env.t('huzzah')
+    +achievementFooter
 
 //Rebirth
 script(id='modals/achievements/rebirth.html', type='text/ng-template')
-  .modal-header
-    h4=env.t('modalAchievement')
-  .modal-body
-    .achievement.achievement-sun
-    div(ng-if='user.achievements.rebirthLevel < 100')
-      =env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
-    div(ng-if='user.achievements.rebirthLevel >= 100')
-      =env.t('rebirthAchievement100', {number: "{{user.achievements.rebirths}}"})
-  .modal-footer
-    button.btn.btn-default(ng-click='$close()')=env.t('ok')
+  .modal-content(style='min-width:28em')
+    .modal-body.text-center
+      h3(style='margin-bottom:0')=env.t('modalAchievement')
+      +achievementAvatar('sun',0)
+      div(ng-if='user.achievements.rebirthLevel < 100')
+        =env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
+      div(ng-if='user.achievements.rebirthLevel >= 100')
+        =env.t('rebirthAchievement100', {number: "{{user.achievements.rebirths}}"})
+      br
+      button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
+    +achievementFooter