OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

improve previewbar look & feel

pull/21833/head
Matthew Hodgson 2016-03-21 22:05:59 +00:00
parent 3bd93c90b1
commit 4e97fe982d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/views/rooms/RoomPreviewBar.js
View File

@ -90,16 +90,22 @@ module.exports = React.createClass({
sent to matches one associated with your account. sent to matches one associated with your account.
</div> </div>
} else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) { } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {
emailMatchBlock = <div className="warning"> emailMatchBlock =
<img src="img/warning.svg" width="24" height="23" title= "/!\\" alt="/!\\" /> <div className="mx_RoomPreviewBar_warning">
This invitation was sent to <span className="email">{this.props.invitedEmail}</span> which is not publicly associated with your account. <div className="mx_RoomPreviewBar_warningIcon">
</div> <img src="img/warning.svg" width="24" height="23" title= "/!\\" alt="/!\\" />
</div>
<div className="mx_RoomPreviewBar_warningText">
This invitation was sent to <b><span className="email">{this.props.invitedEmail}</span></b>, which is not associated with this account.<br/>
You may wish to login with a different account, or add this email to your this account.
</div>
</div>
} }
} }
joinBlock = ( joinBlock = (
<div> <div>
<div className="mx_RoomPreviewBar_invite_text"> <div className="mx_RoomPreviewBar_invite_text">
You have been invited to join this room by { this.props.inviterName } You have been invited to join this room by <b>{ this.props.inviterName }</b>
</div> </div>
<div className="mx_RoomPreviewBar_join_text"> <div className="mx_RoomPreviewBar_join_text">
Would you like to <a onClick={ this.props.onJoinClick }>accept</a> or <a onClick={ this.props.onRejectClick }>decline</a> this invitation? Would you like to <a onClick={ this.props.onJoinClick }>accept</a> or <a onClick={ this.props.onRejectClick }>decline</a> this invitation?