From 5513061d80de7241935683dbcba44fdd675115f0 Mon Sep 17 00:00:00 2001
From: TheHollidayInn <krh121791@gmail.com>
Date: Thu, 30 Apr 2015 18:05:11 -0500
Subject: [PATCH 1/5] Added invite to friends in header, added setting to hide
 the invite friends, and localized the invite friends string

---
 common/locales/en/groups.json           | 3 ++-
 common/locales/en/settings.json         | 4 +++-
 website/src/models/user.js              | 1 +
 website/views/options/settings.jade     | 4 ++++
 website/views/options/social/group.jade | 2 +-
 website/views/shared/header/header.jade | 1 +
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json
index 6e5e0915d8..48fd1c4673 100644
--- a/common/locales/en/groups.json
+++ b/common/locales/en/groups.json
@@ -116,5 +116,6 @@
     "sendGiftFromBalance": "From Balance",
     "sendGiftPurchase": "Purchase",
     "sendGiftMessagePlaceholder": "Personal message (optional)",
-    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
+    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
+    "inviteFriends": "Invite Friends"
 }
diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json
index a1eb6ce215..26c252902b 100644
--- a/common/locales/en/settings.json
+++ b/common/locales/en/settings.json
@@ -118,5 +118,7 @@
     "resubscribe": "Resubscribe",
     "promoCode": "Promo Code",
     "promoCodeApplied": "Promo Code Applied! Check your inventory",
-    "promoPlaceholder": "Enter Promotion Code"
+    "promoPlaceholder": "Enter Promotion Code",
+    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
 }
diff --git a/website/src/models/user.js b/website/src/models/user.js
index 60385abfbb..e0eb462263 100644
--- a/website/src/models/user.js
+++ b/website/src/models/user.js
@@ -314,6 +314,7 @@ var UserSchema = new Schema({
     advancedCollapsed: {type: Boolean, 'default': false},
     toolbarCollapsed: {type:Boolean, 'default':false},
     background: String,
+    displayInviteToPartyWhenPartyIs1: { type:Boolean, 'default':true},
     webhooks: {type: Schema.Types.Mixed, 'default': {}},
     // For this fields make sure to use strict comparison when searching for falsey values (=== false)
     // As users who didn't login after these were introduced may have them undefined/null
diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade
index c25d4a054f..0d0c011417 100644
--- a/website/views/options/settings.jade
+++ b/website/views/options/settings.jade
@@ -66,6 +66,10 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
               label
                 input(type='checkbox', ng-model='user.preferences.dailyDueDefaultView', ng-change='set({"preferences.dailyDueDefaultView": user.preferences.dailyDueDefaultView?true: false})')
                 span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('dailyDueDefaultViewPop'))=env.t('dailyDueDefaultView')
+            .checkbox
+              label
+                input(type='checkbox', ng-model='user.preferences.displayInviteToPartyWhenPartyIs1', ng-change='set({"preferences.displayInviteToPartyWhenPartyIs1": user.preferences.displayInviteToPartyWhenPartyIs1 ? true : false})')
+                span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('displayInviteToPartyWhenPartyIs1'))=env.t('displayInviteToPartyWhenPartyIs1')
             // button.btn.btn-default(ng-click='showTour()', popover-placement='right', popover-trigger='mouseenter', popover=env.t('restartTour'))= env.t('showTour')
             button.btn.btn-default(ng-click='showBailey()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('showBaileyPop'))= env.t('showBailey')
             button.btn.btn-default(ng-click='openRestoreModal()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('fixValPop'))= env.t('fixVal')
diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade
index 850694e7e4..9c35139c58 100644
--- a/website/views/options/social/group.jade
+++ b/website/views/options/social/group.jade
@@ -60,7 +60,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
         .panel-heading
           h3.panel-title
             =env.t('members')
-            button.pull-right.btn.btn-primary(ng-click="openInviteModal(group)")=env.t('inviteFriends')
+            button.pull-right.btn.btn-primary(ng-click="openInviteModal(group)")=env.t("inviteFriends")
         .panel-body.modal-fixed-height
           div.form-group(ng-if='::group.type=="party"')
             p=env.t('partyList')
diff --git a/website/views/shared/header/header.jade b/website/views/shared/header/header.jade
index 4fc7cb3c03..35937fbe5f 100644
--- a/website/views/shared/header/header.jade
+++ b/website/views/shared/header/header.jade
@@ -32,5 +32,6 @@
 
     // party
     span(ng-controller='PartyCtrl')
+      button.pull-right.btn.btn-primary(ng-click="openInviteModal(group)", ng-if="(party.members.length === 1) && user.preferences.displayInviteToPartyWhenPartyIs1")=env.t("inviteFriends")
       .herobox-wrap(ng-repeat='profile in partyMinusSelf')
         +herobox()

From e3f5c22fe80b5d7f453bee9d4caed0e60efa5a1b Mon Sep 17 00:00:00 2001
From: TheHollidayInn <krh121791@gmail.com>
Date: Mon, 11 May 2015 20:18:35 -0500
Subject: [PATCH 2/5] Added start party option, locales, and plus button

---
 common/locales/en/groups.json               |  4 +++-
 website/public/css/header.styl              | 10 ++++++----
 website/public/js/controllers/headerCtrl.js | 15 +++++++++++++--
 website/views/shared/header/header.jade     |  5 ++++-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json
index 48fd1c4673..ce6a86e786 100644
--- a/common/locales/en/groups.json
+++ b/common/locales/en/groups.json
@@ -117,5 +117,7 @@
     "sendGiftPurchase": "Purchase",
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
-    "inviteFriends": "Invite Friends"
+    "inviteFriends": "Invite Friends",
+    "startAParty": "Start a Party",
+    "addToParty": "Add someone to your party"
 }
diff --git a/website/public/css/header.styl b/website/public/css/header.styl
index e9cd485114..df1638a1eb 100644
--- a/website/public/css/header.styl
+++ b/website/public/css/header.styl
@@ -98,7 +98,7 @@
 @media (min-width: 70em)
   .site-header
     width: 70%
-    
+
 
 // this is a wrapper for avatars in the header
 // inside this is the actual `herobox` module
@@ -125,7 +125,7 @@
     hrpg-label-color-mixin(darken($color-herobox, 16.18%))
     width: 2.618em
     text-align:center
-    margin-right: 0.618em    
+    margin-right: 0.618em
   .meter
     position: relative
     overflow: hidden
@@ -161,7 +161,7 @@
     white-space: nowrap
     &.value
       right: 0.382em
-      
+
   // boss.jade only
   [class^="quest_"] + &
       min-width: 220px
@@ -172,4 +172,6 @@
 header .hero-stats
   background-color: darken($color-herobox, 4%)
   border-right: 1px solid darken($color-herobox, 12%)
-        
\ No newline at end of file
+
+button.party-invite
+  margin-top: 55px;
diff --git a/website/public/js/controllers/headerCtrl.js b/website/public/js/controllers/headerCtrl.js
index 9424eca81d..be0ab2bc22 100644
--- a/website/public/js/controllers/headerCtrl.js
+++ b/website/public/js/controllers/headerCtrl.js
@@ -1,7 +1,7 @@
 "use strict";
 
-habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User',
-  function($scope, Groups, User) {
+habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User', '$location', '$rootScope',
+  function($scope, Groups, User, $location, $rootScope) {
 
     $scope.Math = window.Math;
     $scope.user = User.user;
@@ -16,6 +16,17 @@ habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User',
         $scope.$watch('user.party.orderAscending', triggerResort);
     });
 
+    $scope.inviteOrStartParty = function(group) {
+      if (group.type === "party") {
+        $rootScope.openModal('invite-friends', {controller:'InviteToGroupCtrl', resolve:
+          {injectedGroup: function(){
+            return group;
+        }}});
+      } else {
+        $location.path("/options/groups/party");
+      }
+    }
+
     function resortParty() {
       var result = _.sortBy(
         _.filter($scope.party.members, function(member){
diff --git a/website/views/shared/header/header.jade b/website/views/shared/header/header.jade
index 35937fbe5f..e0b722583e 100644
--- a/website/views/shared/header/header.jade
+++ b/website/views/shared/header/header.jade
@@ -32,6 +32,9 @@
 
     // party
     span(ng-controller='PartyCtrl')
-      button.pull-right.btn.btn-primary(ng-click="openInviteModal(group)", ng-if="(party.members.length === 1) && user.preferences.displayInviteToPartyWhenPartyIs1")=env.t("inviteFriends")
+      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)", ng-if="(!party.members) && user.preferences.displayInviteToPartyWhenPartyIs1", popover=env.t("startAParty"), popover-placement="top", popover-trigger="mouseenter")
+        span.glyphicon.glyphicon-plus
+      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)", ng-if="(party.members.length === 1) && user.preferences.displayInviteToPartyWhenPartyIs1", popover=env.t("addToParty"), popover-placement="top", popover-trigger="mouseenter")
+        span.glyphicon.glyphicon-plus
       .herobox-wrap(ng-repeat='profile in partyMinusSelf')
         +herobox()

From d1df5d740d9c073d4a32361ab87d4d523e7366a1 Mon Sep 17 00:00:00 2001
From: TheHollidayInn <krh121791@gmail.com>
Date: Mon, 1 Jun 2015 21:10:49 -0500
Subject: [PATCH 3/5] Changed button to invite friends text

---
 website/views/shared/header/header.jade | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/website/views/shared/header/header.jade b/website/views/shared/header/header.jade
index e0b722583e..563f33af9f 100644
--- a/website/views/shared/header/header.jade
+++ b/website/views/shared/header/header.jade
@@ -32,9 +32,7 @@
 
     // party
     span(ng-controller='PartyCtrl')
-      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)", ng-if="(!party.members) && user.preferences.displayInviteToPartyWhenPartyIs1", popover=env.t("startAParty"), popover-placement="top", popover-trigger="mouseenter")
-        span.glyphicon.glyphicon-plus
-      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)", ng-if="(party.members.length === 1) && user.preferences.displayInviteToPartyWhenPartyIs1", popover=env.t("addToParty"), popover-placement="top", popover-trigger="mouseenter")
-        span.glyphicon.glyphicon-plus
+      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)", ng-if="(!party.members) && user.preferences.displayInviteToPartyWhenPartyIs1", popover=env.t("startAParty"), popover-placement="top", popover-trigger="mouseenter")=env.t("inviteFriends")
+      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)", ng-if="(party.members.length === 1) && user.preferences.displayInviteToPartyWhenPartyIs1", popover=env.t("addToParty"), popover-placement="top", popover-trigger="mouseenter")=env.t("inviteFriends")
       .herobox-wrap(ng-repeat='profile in partyMinusSelf')
         +herobox()

From 2234c7219ee4b3d8363be04084e98ae59ad4f371 Mon Sep 17 00:00:00 2001
From: TheHollidayInn <krh121791@gmail.com>
Date: Wed, 3 Jun 2015 20:26:31 -0500
Subject: [PATCH 4/5] Moved invite friends button to under the subscribe button

---
 website/public/css/header.styl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/public/css/header.styl b/website/public/css/header.styl
index df1638a1eb..a1169843ce 100644
--- a/website/public/css/header.styl
+++ b/website/public/css/header.styl
@@ -174,4 +174,6 @@ header .hero-stats
   border-right: 1px solid darken($color-herobox, 12%)
 
 button.party-invite
-  margin-top: 55px;
+  right: 10px;
+  position: absolute;
+  top: 55px;

From 7a1c5835d0050b79116243af9c4b66691a971d6f Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Thu, 4 Jun 2015 08:16:43 -0500
Subject: [PATCH 5/5] Final adjustments to PR #5114

* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
---
 test/spec/headerCtrlSpec.js                 | 56 +++++++++++++++++++++
 website/public/js/controllers/headerCtrl.js | 10 ++--
 website/views/options/settings.jade         |  2 +-
 website/views/shared/header/header.jade     |  5 +-
 4 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 test/spec/headerCtrlSpec.js

diff --git a/test/spec/headerCtrlSpec.js b/test/spec/headerCtrlSpec.js
new file mode 100644
index 0000000000..4060519fde
--- /dev/null
+++ b/test/spec/headerCtrlSpec.js
@@ -0,0 +1,56 @@
+'use strict';
+
+describe('Header Controller', function() {
+  var scope, ctrl, user, $location, $rootScope;
+
+  beforeEach(function() {
+    module(function($provide) {
+      $provide.value('User', {});
+    });
+
+    inject(function(_$rootScope_, _$controller_, _$location_){
+      user = specHelper.newUser();
+      user._id = "unique-user-id"
+
+      scope = _$rootScope_.$new();
+      $rootScope = _$rootScope_;
+
+      $location = _$location_;
+
+      // Load RootCtrl to ensure shared behaviors are loaded
+      _$controller_('RootCtrl',  {$scope: scope, User: {user: user}});
+
+      ctrl = _$controller_('HeaderCtrl', {$scope: scope, User: {user: user}});
+    });
+  });
+
+  context('inviteOrStartParty', function(){
+    beforeEach(function(){
+      sinon.stub($location, 'path');
+      sinon.stub($rootScope, 'openModal');
+    });
+
+    afterEach(function(){
+      $location.path.restore();
+      $rootScope.openModal.restore();
+    });
+
+    it('redirects to party page if user does not have a party', function(){
+      var group = {};
+      scope.inviteOrStartParty(group);
+
+      expect($location.path).to.be.calledWith("/options/groups/party");
+      expect($rootScope.openModal).to.not.be.called;
+    });
+
+    it('Opens invite-friends modal if user has a party', function(){
+      var group = {
+        type: 'party'
+      };
+      scope.inviteOrStartParty(group);
+
+      expect($rootScope.openModal).to.be.calledOnce;
+      expect($location.path).to.not.be.called;
+    });
+  });
+});
diff --git a/website/public/js/controllers/headerCtrl.js b/website/public/js/controllers/headerCtrl.js
index be0ab2bc22..89db3dc18c 100644
--- a/website/public/js/controllers/headerCtrl.js
+++ b/website/public/js/controllers/headerCtrl.js
@@ -18,10 +18,12 @@ habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User', '$location', '$ro
 
     $scope.inviteOrStartParty = function(group) {
       if (group.type === "party") {
-        $rootScope.openModal('invite-friends', {controller:'InviteToGroupCtrl', resolve:
-          {injectedGroup: function(){
-            return group;
-        }}});
+        $rootScope.openModal('invite-friends', {
+          controller:'InviteToGroupCtrl',
+          resolve: {
+            injectedGroup: function(){ return group; }
+          }
+        });
       } else {
         $location.path("/options/groups/party");
       }
diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade
index 0d0c011417..053efa17da 100644
--- a/website/views/options/settings.jade
+++ b/website/views/options/settings.jade
@@ -66,7 +66,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
               label
                 input(type='checkbox', ng-model='user.preferences.dailyDueDefaultView', ng-change='set({"preferences.dailyDueDefaultView": user.preferences.dailyDueDefaultView?true: false})')
                 span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('dailyDueDefaultViewPop'))=env.t('dailyDueDefaultView')
-            .checkbox
+            .checkbox(ng-if='party.memberCount === 1')
               label
                 input(type='checkbox', ng-model='user.preferences.displayInviteToPartyWhenPartyIs1', ng-change='set({"preferences.displayInviteToPartyWhenPartyIs1": user.preferences.displayInviteToPartyWhenPartyIs1 ? true : false})')
                 span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('displayInviteToPartyWhenPartyIs1'))=env.t('displayInviteToPartyWhenPartyIs1')
diff --git a/website/views/shared/header/header.jade b/website/views/shared/header/header.jade
index 563f33af9f..3fe3006e56 100644
--- a/website/views/shared/header/header.jade
+++ b/website/views/shared/header/header.jade
@@ -32,7 +32,8 @@
 
     // party
     span(ng-controller='PartyCtrl')
-      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)", ng-if="(!party.members) && user.preferences.displayInviteToPartyWhenPartyIs1", popover=env.t("startAParty"), popover-placement="top", popover-trigger="mouseenter")=env.t("inviteFriends")
-      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)", ng-if="(party.members.length === 1) && user.preferences.displayInviteToPartyWhenPartyIs1", popover=env.t("addToParty"), popover-placement="top", popover-trigger="mouseenter")=env.t("inviteFriends")
+      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)",
+        ng-if="(!party.members || party.memberCount === 1) && user.preferences.displayInviteToPartyWhenPartyIs1",
+        popover="{{!party.members ? env.t('startAParty') : env.t('addToParty')}}", popover-placement="left", popover-trigger="mouseenter")=env.t("inviteFriends")
       .herobox-wrap(ng-repeat='profile in partyMinusSelf')
         +herobox()