From 5afb258aa92f7781d26c641e97a038c7f87f7bcf Mon Sep 17 00:00:00 2001
From: Alice Harris <alice.harris@oldgods.net>
Date: Fri, 12 Sep 2014 09:47:02 +1000
Subject: [PATCH] add sort by name and background for party avatars in header,
 remove sort option from guilds pages

---
 public/js/controllers/groupsCtrl.js |  2 ++
 public/js/controllers/headerCtrl.js |  6 ++++++
 views/options/social/group.jade     | 16 ++++++++--------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js
index ca062e95e8..2345623097 100644
--- a/public/js/controllers/groupsCtrl.js
+++ b/public/js/controllers/groupsCtrl.js
@@ -202,6 +202,8 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
       'random': window.env.t('sortRandom'),
       'pets': window.env.t('sortPets'),
       'party_date_joined': window.env.t('sortJoined'),
+      'name': window.env.t('sortName'),
+      'backgrounds': window.env.t('sortBackgrounds'),
     };
 
   }])
diff --git a/public/js/controllers/headerCtrl.js b/public/js/controllers/headerCtrl.js
index d039bca7bb..197c48d8bf 100644
--- a/public/js/controllers/headerCtrl.js
+++ b/public/js/controllers/headerCtrl.js
@@ -22,6 +22,12 @@ habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User',
               case 'pets':
                 return member.items.pets.length;
                 break;
+              case 'name':
+                return member.profile.name;
+                break;
+              case 'backgrounds':
+                return member.preferences.background;
+                break;
               default:
                 // party date joined
                 return true;
diff --git a/views/options/social/group.jade b/views/options/social/group.jade
index 3f0d6cd518..fdbbab2856 100644
--- a/views/options/social/group.jade
+++ b/views/options/social/group.jade
@@ -50,15 +50,15 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
         .panel-heading
           h3.panel-title=env.t('members')
         .panel-body.modal-fixed-height
-          span
+          div(ng-if='group.type=="party"')
             =env.t('partyList')
-            |&nbsp;
-          select#partyOrder(
-            ng-model='user.party.order',
-            ng-controller='ChatCtrl',
-            ng-options='k as v for (k , v) in partyOrderChoices',
-            ng-change='set({"party.order": user.party.order})'
-            )
+            br
+            select#partyOrder(
+              ng-model='user.party.order',
+              ng-controller='ChatCtrl',
+              ng-options='k as v for (k , v) in partyOrderChoices',
+              ng-change='set({"party.order": user.party.order})'
+              )
           table.table.table-striped(bindonce='group')
             tr(ng-repeat='member in group.members')
               td