diff options
author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-06-03 00:34:47 +0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-06-02 12:34:47 -0700 |
commit | 848a8663ed7f856aee3f801a62b82e87b20de0ea (patch) | |
tree | d3721ea0c8635a412e947485528e6b02f75449d3 /webapp/components/rhs_root_post.jsx | |
parent | e0fca16b27b35d6d4303e5a76f10a689fdefcce3 (diff) | |
download | chat-848a8663ed7f856aee3f801a62b82e87b20de0ea.tar.gz chat-848a8663ed7f856aee3f801a62b82e87b20de0ea.tar.bz2 chat-848a8663ed7f856aee3f801a62b82e87b20de0ea.zip |
Multiple UI improvements (#3220)
* Multiple UI improvements
* Pushing time fix
* Fixing absolute time stamps on IOS
Diffstat (limited to 'webapp/components/rhs_root_post.jsx')
-rw-r--r-- | webapp/components/rhs_root_post.jsx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index e6edcb86a..f7c9c9141 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -41,6 +41,7 @@ export default class RhsRootPost extends React.Component { render() { const post = this.props.post; const user = this.props.user; + const mattermostLogo = Constants.MATTERMOST_ICON_SVG; var isOwner = this.props.currentUser.id === post.user_id; var isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser(); const isSystemMessage = post.type && post.type.startsWith(Constants.SYSTEM_MESSAGE_PREFIX); @@ -201,7 +202,7 @@ export default class RhsRootPost extends React.Component { ); } - const profilePic = ( + let profilePic = ( <img className='post-profile-img' src={PostUtils.getProfilePicSrcForPost(post, timestamp)} @@ -210,6 +211,15 @@ export default class RhsRootPost extends React.Component { /> ); + if (PostUtils.isSystemMessage(post)) { + profilePic = ( + <span + className='icon' + dangerouslySetInnerHTML={{__html: mattermostLogo}} + /> + ); + } + const messageWrapper = ( <div ref='message_holder' |