remove spurious Sign In button and legacy Return to App buttons

pull/21833/head
Matthew Hodgson 2017-10-26 17:57:49 +01:00
parent 14d9743e30
commit 655d0c615a
2 changed files with 17 additions and 4 deletions

View File

@ -346,12 +346,15 @@ module.exports = React.createClass({
}
let returnToAppJsx;
if (this.props.onCancelClick && theme !== 'status') {
/*
// with the advent of ILAG I don't think we need this any more
if (this.props.onCancelClick) {
returnToAppJsx =
<a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
{ _t('Return to app') }
</a>;
}
*/
let serverConfig;
let header;

View File

@ -382,6 +382,8 @@ module.exports = React.createClass({
}
let returnToAppJsx;
/*
// with the advent of ILAG I don't think we need this any more
if (this.props.onCancelClick) {
returnToAppJsx = (
<a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
@ -389,6 +391,7 @@ module.exports = React.createClass({
</a>
);
}
*/
let header;
let errorText;
@ -402,6 +405,15 @@ module.exports = React.createClass({
}
}
let signIn;
if (!this.state.doingUIAuth) {
signIn = (
<a className="mx_Login_create" onClick={this.props.onLoginClick} href="#">
{ theme === 'status' ? _t('Sign in') : _t('I already have an account') }
</a>
);
}
return (
<LoginPage>
<div className="mx_Login_box">
@ -413,9 +425,7 @@ module.exports = React.createClass({
/>
{ header }
{ registerBody }
<a className="mx_Login_create" onClick={this.props.onLoginClick} href="#">
{ theme === 'status' ? _t('Sign in') : _t('I already have an account') }
</a>
{ signIn }
{ errorText }
{ returnToAppJsx }
<LoginFooter />