This commit is contained in:
Matthew Hodgson 2017-01-21 17:43:46 +00:00
parent 3071fc0ddc
commit c618880af9

View file

@ -516,24 +516,28 @@ module.exports = React.createClass({
if (!isEncrypted && if (!isEncrypted &&
roomState.mayClientSendStateEvent("m.room.encryption", cli)) { roomState.mayClientSendStateEvent("m.room.encryption", cli)) {
return ( return (
<label> <div>
<input type="checkbox" ref="encrypt" onClick={ this.onEnableEncryptionClick }/> <label>
<img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" /> <input type="checkbox" ref="encrypt" onClick={ this.onEnableEncryptionClick }/>
Enable encryption (warning: cannot be disabled again!) <img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" />
</label> Enable encryption (warning: cannot be disabled again!)
{ settings } </label>
{ settings }
</div>
); );
} }
else { else {
return ( return (
<label> <div>
{ isEncrypted <label>
? <img className="mx_RoomSettings_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" /> { isEncrypted
: <img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" /> ? <img className="mx_RoomSettings_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" />
} : <img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" />
Encryption is { isEncrypted ? "" : "not " } enabled in this room. }
</label> Encryption is { isEncrypted ? "" : "not " } enabled in this room.
{ settings } </label>
{ settings }
</div>
); );
} }
}, },