add icon to room header

pull/21833/head
Bruno Windels 2019-02-01 13:40:19 +01:00
parent f2928c184d
commit 0cdf3d0898
1 changed files with 5 additions and 0 deletions

View File

@ -33,6 +33,7 @@ import ManageIntegsButton from '../elements/ManageIntegsButton';
import {CancelButton} from './SimpleRoomHeader';
import SettingsStore from "../../../settings/SettingsStore";
import RoomHeaderButtons from '../right_panel/RoomHeaderButtons';
import E2EIcon from './E2EIcon';
linkifyMatrix(linkify);
@ -52,6 +53,7 @@ module.exports = React.createClass({
onSearchClick: PropTypes.func,
onLeaveClick: PropTypes.func,
onCancelClick: PropTypes.func,
e2eStatus: PropTypes.string,
},
getDefaultProps: function() {
@ -237,6 +239,8 @@ module.exports = React.createClass({
);
}
let e2eIcon = this.props.e2eStatus ? <E2EIcon status={this.props.e2eStatus} /> : undefined;
if (this.props.onCancelClick) {
cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
}
@ -413,6 +417,7 @@ module.exports = React.createClass({
<div className={"mx_RoomHeader light-panel " + (this.props.editing ? "mx_RoomHeader_editing" : "")}>
<div className="mx_RoomHeader_wrapper">
<div className="mx_RoomHeader_avatar">{ roomAvatar }</div>
{ e2eIcon }
{ name }
{ topicElement }
{ spinner }