5 files changed, 27 insertions, 24 deletions
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade
index e08666e5..44e899a7 100644
--- a/client/components/users/userAvatar.jade
+++ b/client/components/users/userAvatar.jade
@@ -1,7 +1,7 @@
 template(name="userAvatar")
   a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}})")
-    if userData.profile.avatarUrl
-      img.avatar.avatar-image(src=userData.profile.avatarUrl)
+    if userData.getAvatarUrl
+      img.avatar.avatar-image(src=userData.getAvatarUrl)
     else
       +userAvatarInitials(userId=userData._id)
 
diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js
index 04add0a6..1e531882 100644
--- a/client/components/users/userAvatar.js
+++ b/client/components/users/userAvatar.js
@@ -22,8 +22,11 @@ Template.userAvatar.helpers({
   },
 
   presenceStatusClassName() {
+    const user = Users.findOne(this.userId);
     const userPresence = presences.findOne({ userId: this.userId });
-    if (!userPresence)
+    if (user && user.isInvitedTo(Session.get('currentBoard')))
+      return 'pending';
+    else if (!userPresence)
       return 'disconnected';
     else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
       return 'active';
@@ -82,11 +85,7 @@ BlazeComponent.extendComponent({
   },
 
   setAvatar(avatarUrl) {
-    Meteor.users.update(Meteor.userId(), {
-      $set: {
-        'profile.avatarUrl': avatarUrl,
-      },
-    });
+    Meteor.user().setAvatarUrl(avatarUrl);
   },
 
   setError(error) {
@@ -151,19 +150,9 @@ Template.cardMembersPopup.helpers({
 
 Template.cardMembersPopup.events({
   'click .js-select-member'(evt) {
-    const cardId = Template.parentData(2).data._id;
+    const card = Cards.findOne(Session.get('currentCard'));
     const memberId = this.userId;
-    let operation;
-    if (Cards.find({ _id: cardId, members: memberId}).count() === 0)
-      operation = '$addToSet';
-    else
-      operation = '$pull';
-
-    Cards.update(cardId, {
-      [operation]: {
-        members: memberId,
-      },
-    });
+    card.toggleMember(memberId);
     evt.preventDefault();
   },
 });
@@ -176,7 +165,7 @@ Template.cardMemberPopup.helpers({
 
 Template.cardMemberPopup.events({
   'click .js-remove-member'() {
-    Cards.update(this.cardId, {$pull: {members: this.userId}});
+    Cards.findOne(this.cardId).unassignMember(this.userId);
     Popup.close();
   },
   'click .js-edit-profile': Popup.open('editProfile'),
diff --git a/client/components/users/userAvatar.styl b/client/components/users/userAvatar.styl
index 83257792..b962b01c 100644
--- a/client/components/users/userAvatar.styl
+++ b/client/components/users/userAvatar.styl
@@ -56,6 +56,10 @@ avatar-radius = 50%
       background: #bdbdbd
       border-color: #ededed
 
+    &.pending
+      background: #e44242
+      border-color: #f1dada
+
   .edit-avatar
     position: absolute
     top: 0
diff --git a/client/components/users/userForm.styl b/client/components/users/userForm.styl
index 9b6e86ce..dbe62b4e 100644
--- a/client/components/users/userForm.styl
+++ b/client/components/users/userForm.styl
@@ -45,3 +45,13 @@
       .at-signUp,
       .at-signIn
         font-weight: bold
+
+  .at-form-lang
+    margin: auto
+    width: 275px
+    padding: 25px
+    padding-bottom: 10px
+
+    .select-lang
+      width: 275px
+      font-size: 1.0em
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index 0f91fd15..a478da0c 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -18,9 +18,9 @@ Template.memberMenuPopup.events({
 Template.editProfilePopup.events({
   submit(evt, tpl) {
     evt.preventDefault();
-    const fullname = $.trim(tpl.find('.js-profile-fullname').value);
-    const username = $.trim(tpl.find('.js-profile-username').value);
-    const initials = $.trim(tpl.find('.js-profile-initials').value);
+    const fullname = tpl.find('.js-profile-fullname').value.trim();
+    const username = tpl.find('.js-profile-username').value.trim();
+    const initials = tpl.find('.js-profile-initials').value.trim();
     Users.update(Meteor.userId(), {$set: {
       'profile.fullname': fullname,
       'profile.initials': initials,