From 85879177a6dec809576eb85cc5d48397eff1e144 Mon Sep 17 00:00:00 2001
From: hairlessbear <davidhersh0402@gmail.com>
Date: Tue, 2 Jun 2015 00:54:54 -0400
Subject: [PATCH] Added group leader to group description, and removed group
 leader from member list

---
 common/locales/en/groups.json           |  2 ++
 website/views/options/social/group.jade | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json
index 6e5e0915d8..78ad3d162c 100644
--- a/common/locales/en/groups.json
+++ b/common/locales/en/groups.json
@@ -39,6 +39,8 @@
     "editGroup": "Edit Group",
     "newGroupName": "<%= groupType %> Name",
     "groupName": "Group Name",
+    "groupLeader": "Group Leader: ",
+    "groupID": "Group ID: ",
     "groupDescr": "Description shown in public Guilds list (Markdown OK)",
     "logoUrl": "Logo URL",
     "assignLeader": "Assign Group Leader",
diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade
index 850694e7e4..858df2adee 100644
--- a/website/views/options/social/group.jade
+++ b/website/views/options/social/group.jade
@@ -51,7 +51,12 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
             img.pull-right(ng-show='group.logo', ng-src='{{group.logo}}')
             markdown(text='group.description')
           hr
-          small.muted Group ID: {{group._id}}
+          p=env.t('groupLeader')
+            a(class='badge badge-info', ng-click='clickMember(group.leader, true)')
+              | {{group.leader}}
+          .formatting-help
+            small.muted=env.t('groupID')
+              | {{group._id}}
 
       include ./challenge-box
 
@@ -78,14 +83,14 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
               ng-change='set({"party.orderAscending": user.party.orderAscending})'
               )
           table.table.table-striped(bindonce='group')
-            tr(ng-repeat='member in group.members track by member._id')
+            tr(ng-repeat='member in group.members track by member._id' ng-if='member._id != group.leader')
               td.media
                 // allow leaders to ban members
-                div.pull-left(ng-show='group.leader == user.id && user.id!=member._id')
+                div.pull-left(ng-show='group.leader == user.id')
                   a.media-object(ng-click='removeMember(group, member, true)')
                     span.glyphicon.glyphicon-ban-circle(tooltip=env.t('banTip'))
                 a.media-body
-                  span(ng-class='{"badge badge-info": group.leader==member._id}', ng-click='clickMember(member._id, true)')
+                  span(ng-click='clickMember(member._id, true)')
                     | {{member.profile.name}}
             tr(ng-if='group.memberCount > group.members.length')
               td