diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json index 7588c4a581..a3a670e204 100644 --- a/common/locales/en/groups.json +++ b/common/locales/en/groups.json @@ -120,6 +120,7 @@ "sendGiftMessagePlaceholder": "Personal message (optional)", "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>", "battleWithFriends": "Battle Monsters With Friends", + "startPartyWithFriends": "Start a Party with your friends!", "startAParty": "Start a Party", "addToParty": "Add someone to your party", "likePost": "Click if you like this post!" diff --git a/website/public/css/shared.styl b/website/public/css/shared.styl index 41a04df2ce..5d3d5f0e5e 100644 --- a/website/public/css/shared.styl +++ b/website/public/css/shared.styl @@ -64,3 +64,6 @@ ul .flex-column display: flex flex-direction: column + +.margin-auto + margin: auto auto 1em auto; \ No newline at end of file diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade index f8df4e4273..10275456ff 100644 --- a/website/views/options/social/index.jade +++ b/website/views/options/social/index.jade @@ -5,6 +5,7 @@ include ./challenges include ./hall include ./quests/index include ./chat-message +include ./party script(type='text/ng-template', id='partials/options.social.inbox.html') .options-blurbmenu @@ -26,23 +27,6 @@ script(type='text/ng-template', id='partials/options.social.inbox.html') script(type='text/ng-template', id='partials/options.social.tavern.html') include ./tavern -script(type='text/ng-template', id='partials/options.social.party.html') - div(ng-if='group._id') - include ./group - div(ng-if='!group._id') - div(ng-show='user.invitations.party.id').container-fluid - h2=env.t('invitedTo', {name: '{{user.invitations.party.name}}'}) - a.btn.btn-success(data-type='party', ng-click='join(user.invitations.party)')=env.t('accept') - a.btn.btn-danger(ng-click='reject()')=env.t('reject') - div(ng-hide='user.invitations.party.id').container-fluid - h2=env.t('createAParty') - p - =env.t('noPartyText') - pre.prettyprint. - {{user.id}} - p!=env.t('LFG', {linkStart: "", linkEnd: ""}) - include ./create-group - script(type='text/ng-template', id='partials/options.social.guilds.public.html') .options-blurbmenu small.muted=env.t('blurbGuildsPage') diff --git a/website/views/options/social/party.jade b/website/views/options/social/party.jade new file mode 100644 index 0000000000..ccdc27ab86 --- /dev/null +++ b/website/views/options/social/party.jade @@ -0,0 +1,20 @@ +include ../../shared/avatar/generated_avatar + +script(type='text/ng-template', id='partials/options.social.party.html') + div(ng-if='group._id') + include ./group + div(ng-if='!group._id') + div(ng-show='user.invitations.party.id').container-fluid + h2=env.t('invitedTo', {name: '{{user.invitations.party.name}}'}) + a.btn.btn-success(data-type='party', ng-click='join(user.invitations.party)')=env.t('accept') + a.btn.btn-danger(ng-click='reject()')=env.t('reject') + + div(ng-hide='user.invitations.party.id').container-fluid + .row.margin-auto + a.btn.btn-primary.btn-lg.flex-column(ng-click="inviteOrStartParty(group)")=env.t("startPartyWithFriends") + .row.margin-auto.text-center(ng-controller='UserCtrl') + .margin-auto + span.inline-block.quest_vice3 + span.figure.herobox.inline-block + .character-sprites + +generatedAvatar diff --git a/website/views/shared/avatar/generated_avatar.jade b/website/views/shared/avatar/generated_avatar.jade index e6423c8f16..10ef1bf891 100644 --- a/website/views/shared/avatar/generated_avatar.jade +++ b/website/views/shared/avatar/generated_avatar.jade @@ -15,7 +15,7 @@ mixin generatedAvatar(options) +costumeSetting('armor', {prefix: "profile.preferences.size + '_' + "}) +costumeSetting('back', {suffix: " + '_collar'"}) +costumeSetting('body') - span(class='head_0') + span.head_0 - var hairTypes = ['base', 'bangs', 'mustache', 'beard'] each type in hairTypes span(class='hair_#{type}_{{profile.preferences.hair.#{type}}}_{{profile.preferences.hair.color}}')