diff options
author | Corey Hulen <corey@hulen.com> | 2016-04-05 21:17:31 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-04-05 21:17:31 -0700 |
commit | b5a9431ad6dc9c56eabf6a79cfb2d74fd801c77f (patch) | |
tree | 4dafd32120b107a7b748c7adf889a3c7becb3ff9 /webapp/components | |
parent | d78fd58237218e213307d22af8fa58760abadcc7 (diff) | |
parent | 1d311243fb8d79bf2895c11591578226dc1663d0 (diff) | |
download | chat-b5a9431ad6dc9c56eabf6a79cfb2d74fd801c77f.tar.gz chat-b5a9431ad6dc9c56eabf6a79cfb2d74fd801c77f.tar.bz2 chat-b5a9431ad6dc9c56eabf6a79cfb2d74fd801c77f.zip |
Merge pull request #2643 from asaadmahmoodspin/ui-improvements
PLT-2519 - Fixing users page
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/admin_console/team_users.jsx | 8 | ||||
-rw-r--r-- | webapp/components/admin_console/user_item.jsx | 30 |
2 files changed, 19 insertions, 19 deletions
diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx index 1bf3f785b..8b37bd237 100644 --- a/webapp/components/admin_console/team_users.jsx +++ b/webapp/components/admin_console/team_users.jsx @@ -165,11 +165,9 @@ export default class UserList extends React.Component { className='form-horizontal' role='form' > - <table className='more-modal__list member-list-holder'> - <tbody> - {memberList} - </tbody> - </table> + <div className='more-modal__list member-list-holder'> + {memberList} + </div> </form> <ResetPasswordModal user={this.state.user} diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx index c00050584..5bd05d063 100644 --- a/webapp/components/admin_console/user_item.jsx +++ b/webapp/components/admin_console/user_item.jsx @@ -365,16 +365,18 @@ export default class UserItem extends React.Component { } return ( - <tr> - <td className='more-modal__row'> - <img - className='more-modal__image pull-left' - src={`/api/v1/users/${user.id}/image?time=${user.update_at}`} - height='36' - width='36' - /> - <span className='more-modal__name'>{Utils.getDisplayName(user)}</span> - <span className='more-modal__description'>{email}</span> + <div className='more-modal__row'> + <img + className='more-modal__image pull-left' + src={`/api/v1/users/${user.id}/image?time=${user.update_at}`} + height='36' + width='36' + /> + <div className='more-modal__details'> + <div className='more-modal__name'>{Utils.getDisplayName(user)}</div> + <div className='more-modal__description'>{email}</div> + </div> + <div className='more-modal__actions'> <div className='dropdown member-drop'> <a href='#' @@ -409,10 +411,10 @@ export default class UserItem extends React.Component { </li> </ul> </div> - {makeDemoteModal} - {serverError} - </td> - </tr> + </div> + {makeDemoteModal} + {serverError} + </div> ); } } |