diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-12 14:28:46 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-12 14:28:46 -0500 |
commit | 72ed22d7421f50bc686e5adaea2f4a416fcbad27 (patch) | |
tree | 32359b9c26b1e827e734536208f7d9f4547f2415 /web/react/components | |
parent | f06db338a37896bb989e05a04b28f65abc1cd6aa (diff) | |
parent | e4fed928d9365ba3e096a02e590cd741de4d2cb2 (diff) | |
download | chat-72ed22d7421f50bc686e5adaea2f4a416fcbad27.tar.gz chat-72ed22d7421f50bc686e5adaea2f4a416fcbad27.tar.bz2 chat-72ed22d7421f50bc686e5adaea2f4a416fcbad27.zip |
Merge pull request #2412 from asaadmahmoodspin/ui-improvements
Adding separators between ldap, username, email, github
Diffstat (limited to 'web/react/components')
-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'> |