From 427fbb959b7e0881333fc3dcbeccc2ab1f689071 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Sun, 23 Aug 2015 14:59:06 -0500
Subject: [PATCH] Add join existing party button

---
 common/locales/en/groups.json                        |  1 +
 .../views/options/social/party/start-a-party.jade    |  5 +++--
 website/views/shared/modals/invite-friends.jade      | 12 +++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json
index 9e7200c8c2..635bf3715c 100644
--- a/common/locales/en/groups.json
+++ b/common/locales/en/groups.json
@@ -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",
diff --git a/website/views/options/social/party/start-a-party.jade b/website/views/options/social/party/start-a-party.jade
index a7645de60b..cf1bba6ad4 100644
--- a/website/views/options/social/party/start-a-party.jade
+++ b/website/views/options/social/party/start-a-party.jade
@@ -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
diff --git a/website/views/shared/modals/invite-friends.jade b/website/views/shared/modals/invite-friends.jade
index d4a40d353d..ae4a2c4c7a 100644
--- a/website/views/shared/modals/invite-friends.jade
+++ b/website/views/shared/modals/invite-friends.jade
@@ -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')