diff options
author | samogot <samogot@gmail.com> | 2016-07-30 03:54:42 +0900 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-07-29 14:54:42 -0400 |
commit | 748fdef1fbded624a786533e8f065b91a047b91c (patch) | |
tree | b329aeeed4d5cf5a1e357ddfd3bdc38c3f7ad11a /webapp/components/user_list_row.jsx | |
parent | c084c4ae4d12ad92941b54cbbda623320e93be22 (diff) | |
download | chat-748fdef1fbded624a786533e8f065b91a047b91c.tar.gz chat-748fdef1fbded624a786533e8f065b91a047b91c.tar.bz2 chat-748fdef1fbded624a786533e8f065b91a047b91c.zip |
Online status in all modals (#3617)
* add wrapper to modal avatar image which show small round indicator of online/away status of member in all modals
* add offline indicator
* the color of the status indicators follow the theme
Diffstat (limited to 'webapp/components/user_list_row.jsx')
-rw-r--r-- | webapp/components/user_list_row.jsx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/webapp/components/user_list_row.jsx b/webapp/components/user_list_row.jsx index 6761206e0..d5d123ab7 100644 --- a/webapp/components/user_list_row.jsx +++ b/webapp/components/user_list_row.jsx @@ -1,6 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. +import UserStore from 'stores/user_store.jsx'; import Constants from 'utils/constants.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; import * as Utils from 'utils/utils.jsx'; @@ -31,17 +32,23 @@ export default function UserListRow({user, teamMember, actions, actionProps}) { }); } + if (!user.status) { + var status = UserStore.getStatus(user.id); + user.status = status ? 'status-' + status : ''; + } return ( <div key={user.id} className='more-modal__row' > - <img - className='more-modal__image' - width='38' - height='38' - src={`${Client.getUsersRoute()}/${user.id}/image?time=${user.update_at}`} - /> + <span className={`more-modal__image-wrapper ${user.status}`}> + <img + className='more-modal__image' + width='38' + height='38' + src={`${Client.getUsersRoute()}/${user.id}/image?time=${user.update_at}`} + /> + </span> <div className='more-modal__details' > |