diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-11-05 12:08:34 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-11-05 12:08:34 -0500 |
commit | ff38c402cb793bbea8881f9cdc8123d0959e6e08 (patch) | |
tree | 502dcbdc730305ab8f4e2d28ab9b582f41cf1252 /web/react/components/admin_console/user_item.jsx | |
parent | 0e728316397eda4aaa9e957b7f1e2b7645ee804b (diff) | |
parent | bc1820a498633a4c89f58d32e05a084a71f7eccf (diff) | |
download | chat-ff38c402cb793bbea8881f9cdc8123d0959e6e08.tar.gz chat-ff38c402cb793bbea8881f9cdc8123d0959e6e08.tar.bz2 chat-ff38c402cb793bbea8881f9cdc8123d0959e6e08.zip |
Merge pull request #1316 from asaadmahmoodspin/ui-improvements
Modal improvements for members
Diffstat (limited to 'web/react/components/admin_console/user_item.jsx')
-rw-r--r-- | web/react/components/admin_console/user_item.jsx | 90 |
1 files changed, 46 insertions, 44 deletions
diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx index f7e92672d..2badaf0e5 100644 --- a/web/react/components/admin_console/user_item.jsx +++ b/web/react/components/admin_console/user_item.jsx @@ -212,50 +212,52 @@ export default class UserItem extends React.Component { } return ( - <div className='row member-div'> - <img - className='post-profile-img pull-left' - src={`/api/v1/users/${user.id}/image?time=${user.update_at}&${Utils.getSessionIndex()}`} - height='36' - width='36' - /> - <span className='member-name'>{Utils.getDisplayName(user)}</span> - <span className='member-email'>{email}</span> - <div className='dropdown member-drop'> - <a - href='#' - className='dropdown-toggle theme' - type='button' - id='channel_header_dropdown' - data-toggle='dropdown' - aria-expanded='true' - > - <span>{currentRoles} </span> - <span className='caret'></span> - </a> - <ul - className='dropdown-menu member-menu' - role='menu' - aria-labelledby='channel_header_dropdown' - > - {makeAdmin} - {makeMember} - {makeActive} - {makeNotActive} - {makeSystemAdmin} - <li role='presentation'> - <a - role='menuitem' - href='#' - onClick={this.handleResetPassword} - > - {'Reset Password'} - </a> - </li> - </ul> - </div> - {serverError} - </div> + <tr> + <td className='row member-div'> + <img + className='post-profile-img pull-left' + src={`/api/v1/users/${user.id}/image?time=${user.update_at}&${Utils.getSessionIndex()}`} + height='36' + width='36' + /> + <span className='member-name'>{Utils.getDisplayName(user)}</span> + <span className='member-email'>{email}</span> + <div className='dropdown member-drop'> + <a + href='#' + className='dropdown-toggle theme' + type='button' + id='channel_header_dropdown' + data-toggle='dropdown' + aria-expanded='true' + > + <span>{currentRoles} </span> + <span className='caret'></span> + </a> + <ul + className='dropdown-menu member-menu' + role='menu' + aria-labelledby='channel_header_dropdown' + > + {makeAdmin} + {makeMember} + {makeActive} + {makeNotActive} + {makeSystemAdmin} + <li role='presentation'> + <a + role='menuitem' + href='#' + onClick={this.handleResetPassword} + > + {'Reset Password'} + </a> + </li> + </ul> + </div> + {serverError} + </td> + </tr> ); } } |