From 5513061d80de7241935683dbcba44fdd675115f0 Mon Sep 17 00:00:00 2001 From: TheHollidayInn Date: Thu, 30 Apr 2015 18:05:11 -0500 Subject: [PATCH] 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()