sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-22 05:38:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add join existing party button

Browse source
This commit is contained in:
Blade Barringer 2015-08-23 14:59:06 -05:00
parent 3098c7d460
commit 427fbb959b
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/locales/en/groups.json
View file

@ -25,6 +25,7 @@
"noPartyText": "You are either not in a party or your party is taking a while to load. You can either create one and invite friends, or if you want to join an existing party, have them enter your Unique User ID below and then come back here to look for the invitation:",
"LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
"wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
"joinExistingParty": "Join Someone Else's Party",
"create": "Create",
"userId": "User ID",
"invite": "Invite",

5
website/views/options/social/party/start-a-party.jade
View file

@ -18,5 +18,6 @@
h4=env.t('wantToStartParty')
.row.row-margin
span.btn.btn-primary(ng-click='inviteOrStartParty(group)')=env.t('inviteFriendsNow')
span.btn.btn-default(ng-click='create(newGroup); group.loadingNewParty = true')=env.t('inviteFriendsLater')
.btn.btn-primary(ng-click='inviteOrStartParty(group)')=env.t('inviteFriendsNow')
.btn.btn-default(ng-click='create(newGroup); group.loadingNewParty = true')=env.t('inviteFriendsLater')
.btn.btn-default(ng-click='openModal("user-id")') Join Someone Else's Party

12
website/views/shared/modals/invite-friends.jade
View file

@ -107,4 +107,14 @@ script(type='text/ng-template', id='modals/invite-party.html')
.modal-footer(style='padding-bottom:0',ng-if='!group._id || group.memberCount < 2')
p!=env.t('wantExistingParty', {linkStart: "<a href='/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>", linkEnd: "</a>"})
pre(style='margin:1em 0 0 0').
{{user.id}}
{{::user._id}}
script(type='text/ng-template', id='modals/user-id.html')
.modal-header
h4=env.t('userId')
.modal-body
p!=env.t('wantExistingParty', {linkStart: "<a href='/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>", linkEnd: "</a>"})
pre(style='margin:1em 0 0 0').
{{::user._id}}
.modal-footer
.btn.btn-default.pull-right(ng-click='$close()')=env.t('close')