diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-14 02:30:55 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-14 02:30:55 +0500 |
| commit | 0a166572c12e3e13fefee02e79ab9eca6f4d2229 (patch) | |
| tree | 6cf4961916233ee1eaf010f48c6eb88776ece41a /web | |
| parent | e38ea318a1287710313a0c86fecb76dff8a923aa (diff) | |
| download | chat-0a166572c12e3e13fefee02e79ab9eca6f4d2229.tar.gz chat-0a166572c12e3e13fefee02e79ab9eca6f4d2229.tar.bz2 chat-0a166572c12e3e13fefee02e79ab9eca6f4d2229.zip | |
Merge branch 'MM-1302' of https://github.com/nickago/platform into mm-1302
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/sidebar_header.jsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index 0b59d2036..7f8fe3d52 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -121,9 +121,12 @@ module.exports = React.createClass({ }, render: function() { var teamName = this.props.teamName ? this.props.teamName : config.SiteName; + var me = UserStore.getCurrentUser() return ( <div className="team__header theme"> + <img className="profile-picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} /> + <span className="user_name">{me.username}</span> <a className="team__name" href="/channels/town-square">{ teamName }</a> <NavbarDropdown teamType={this.props.teamType} /> </div> |