diff options
author | Asaad Mahmood <asaad@spinpunch.com> | 2016-03-10 13:27:34 +0500 |
---|---|---|
committer | Asaad Mahmood <asaad@spinpunch.com> | 2016-03-11 19:26:58 +0500 |
commit | e4fed928d9365ba3e096a02e590cd741de4d2cb2 (patch) | |
tree | 0e1d60c32c6c46b7b290d8fab6a8ab9fd779a980 /web/react/components/login.jsx | |
parent | 7d7260273770a2e40fb01f1162228d598a28b7ce (diff) | |
download | chat-e4fed928d9365ba3e096a02e590cd741de4d2cb2.tar.gz chat-e4fed928d9365ba3e096a02e590cd741de4d2cb2.tar.bz2 chat-e4fed928d9365ba3e096a02e590cd741de4d2cb2.zip |
Adding or separator between ldap, username, email, github
Updating code theme name
Updating conditions for login page
updated the 2.0 Dockerfile to include the proper location of mm gzip
Fixing search loading icon on mobile
Adding or separator between ldap, username, email and github
Diffstat (limited to 'web/react/components/login.jsx')
-rw-r--r-- | web/react/components/login.jsx | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 581b8e0b5..1c393c679 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -19,6 +19,8 @@ export default class Login extends React.Component { render() { const teamDisplayName = this.props.teamDisplayName; const teamName = this.props.teamName; + const ldapEnabled = global.window.mm_config.EnableLdap === 'true'; + const usernameSigninEnabled = global.window.mm_config.EnableSignInWithUsername === 'true'; let loginMessage = []; if (global.window.mm_config.EnableSignUpWithGitLab === 'true') { @@ -173,6 +175,22 @@ export default class Login extends React.Component { ); } + if (ldapEnabled && (loginMessage.length > 0 || emailSignup || usernameSigninEnabled)) { + ldapLogin = ( + <div> + <div className='or__container'> + <FormattedMessage + id='login.or' + defaultMessage='or' + /> + </div> + <LoginLdap + teamName={this.props.teamName} + /> + </div> + ); + } + let findTeams = null; if (!Utils.isMobileApp()) { findTeams = ( @@ -197,6 +215,22 @@ export default class Login extends React.Component { ); } + if (usernameSigninEnabled && (loginMessage.length > 0 || emailSignup || ldapEnabled)) { + usernameLogin = ( + <div> + <div className='or__container'> + <FormattedMessage + id='login.or' + defaultMessage='or' + /> + </div> + <LoginUsername + teamName={this.props.teamName} + /> + </div> + ); + } + return ( <div className='signup-team__container'> <h5 className='margin--less'> |