From 0722a178974160b4a906e72b3e2e9cdbd63a3e1f Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Mon, 16 Mar 2015 19:42:03 +0100
Subject: [PATCH] start working on kick from group email & message

---
 common/locales/en/groups.json               | 2 ++
 website/public/js/controllers/groupsCtrl.js | 5 +++--
 website/views/shared/modals/members.jade    | 9 +++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json
index c67a77c869..1b6833c276 100644
--- a/common/locales/en/groups.json
+++ b/common/locales/en/groups.json
@@ -59,6 +59,8 @@
     "guild": "Guild",
     "guilds": "Guilds",
     "sureKick": "Do you really want to remove this member from the party/guild?",
+    "optionalMessage": "Optional message",
+    "yesRemove": "Yes, remove them",
     "foreverAlone": "Can't like your own message. Don't be that person.",
     "sortLevel": "Sort by level",
     "sortRandom": "Sort randomly",
diff --git a/website/public/js/controllers/groupsCtrl.js b/website/public/js/controllers/groupsCtrl.js
index 0526fb6871..ab49091077 100644
--- a/website/public/js/controllers/groupsCtrl.js
+++ b/website/public/js/controllers/groupsCtrl.js
@@ -59,7 +59,8 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
       }
 
       $scope.removeMember = function(group, member, isMember){
-        var yes = confirm(window.env.t('sureKick'))
+        $rootScope.openModal('remove-member');
+        /*var yes = confirm(window.env.t('sureKick'))
         if(yes){
           Groups.Group.removeMember({gid: group._id, uuid: member._id }, undefined, function(){
             if(isMember){
@@ -68,7 +69,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
               _.pull(group.invites, member);
             }
           });
-        }
+        }*/
       }
 
       $scope.openInviteModal = function(group){
diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade
index bafe6c62f5..7cdeb13074 100644
--- a/website/views/shared/modals/members.jade
+++ b/website/views/shared/modals/members.jade
@@ -101,3 +101,12 @@ script(type='text/ng-template', id='modals/abuse-flag.html')
       | Reset Flag Count
     button.btn.btn-primary(ng-click='$close()')=env.t('cancel')
     button.btn.btn-default(ng-click='reportAbuse(user, abuseObject, groupId)')=env.t("abuseFlagModalButton")
+
+script(type='text/ng-template', id='modals/remove-member.html')
+  .modal-header
+    h4=env.t('sureKick')
+  .modal-body
+    textarea.form-control(type='text',rows='5', placeholder=env.t('optionalMessage'))
+  .modal-footer
+    button.pull-left.btn.btn-danger(ng-click='')=env.t('yesRemove')
+    button.btn.btn-default(ng-click='$close()')=env.t('cancel')
\ No newline at end of file