PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #506 from matrix-org/dbkr/sign_in_not_log_in

Browse source 
Use 'Sign In' / 'Sign Out' universally
This commit is contained in:
Richard van der Hoff 2016-09-30 11:30:00 +01:00 committed by GitHub
commit dca19a4940
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/MatrixChat.js
View file

@ -667,8 +667,8 @@ module.exports = React.createClass({
cli.on('Session.logged_out', function(call) { cli.on('Session.logged_out', function(call) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Logged Out", title: "Signed Out",
description: "For security, this session has been logged out. Please log in again." description: "For security, this session has been signed out. Please sign in again."
}); });
dis.dispatch({ dis.dispatch({
action: 'logout' action: 'logout'

2
src/components/structures/UserSettings.js
View file

@ -560,7 +560,7 @@ module.exports = React.createClass({
<div className="mx_UserSettings_section"> <div className="mx_UserSettings_section">
<div className="mx_UserSettings_logout mx_UserSettings_button" onClick={this.onLogoutClicked}> <div className="mx_UserSettings_logout mx_UserSettings_button" onClick={this.onLogoutClicked}>
Log out Sign out
</div> </div>
{accountJsx} {accountJsx}

4
src/components/structures/login/ForgotPassword.js
View file

@ -147,7 +147,7 @@ module.exports = React.createClass({
<div> <div>
<p>Your password has been reset.</p> <p>Your password has been reset.</p>
<p>You have been logged out of all devices and will no longer receive push notifications. <p>You have been logged out of all devices and will no longer receive push notifications.
To re-enable notifications, re-log in on each device.</p> To re-enable notifications, sign in again on each device.</p>
<input className="mx_Login_submit" type="button" onClick={this.props.onComplete} <input className="mx_Login_submit" type="button" onClick={this.props.onComplete}
value="Return to login screen" /> value="Return to login screen" />
</div> </div>
@ -188,7 +188,7 @@ module.exports = React.createClass({
onIsUrlChanged={this.onIsUrlChanged} onIsUrlChanged={this.onIsUrlChanged}
delayTimeMs={0}/> delayTimeMs={0}/>
<div className="mx_Login_error"> <div className="mx_Login_error">
</div> </div>
<a className="mx_Login_create" onClick={this.props.onLoginClick} href="#"> <a className="mx_Login_create" onClick={this.props.onLoginClick} href="#">
Return to login Return to login
</a> </a>

2
src/components/views/login/CustomServerDialog.js
View file

@ -27,7 +27,7 @@ module.exports = React.createClass({
</div> </div>
<div className="mx_Dialog_content"> <div className="mx_Dialog_content">
<span> <span>
You can use the custom server options to log into other Matrix You can use the custom server options to sign into other Matrix
servers by specifying a different Home server URL. servers by specifying a different Home server URL.
<br/> <br/>
This allows you to use this app with an existing Matrix account on This allows you to use this app with an existing Matrix account on

2
src/components/views/login/PasswordLogin.js
View file

@ -104,7 +104,7 @@ module.exports = React.createClass({displayName: 'PasswordLogin',
placeholder="Password" /> placeholder="Password" />
<br /> <br />
{forgotPasswordJsx} {forgotPasswordJsx}
<input className="mx_Login_submit" type="submit" value="Log in" /> <input className="mx_Login_submit" type="submit" value="Sign in" />
</form> </form>
</div> </div>
); );