diff options
author | Corey Hulen <corey@hulen.com> | 2015-10-06 13:24:17 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-10-06 13:24:17 -0700 |
commit | fe802fb9c4afdf27a2fb56eb472f48eb921b4de0 (patch) | |
tree | 67617a819d423afd6c848c35f37f57ec81f240fa /web/react/components/login.jsx | |
parent | cbe1ab8dbac9502017a5ae5cd4eb01d9c43772e2 (diff) | |
parent | 4311978d650fa1e40f34db3c2cb411377bcc6936 (diff) | |
download | chat-fe802fb9c4afdf27a2fb56eb472f48eb921b4de0.tar.gz chat-fe802fb9c4afdf27a2fb56eb472f48eb921b4de0.tar.bz2 chat-fe802fb9c4afdf27a2fb56eb472f48eb921b4de0.zip |
Merge pull request #938 from mattermost/plt-111
PLT-111 Combining email verification confirmation screen with login screen.
Diffstat (limited to 'web/react/components/login.jsx')
-rw-r--r-- | web/react/components/login.jsx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 70f7a5d6e..54df75cbc 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -112,6 +112,17 @@ export default class Login extends React.Component { errorClass = ' has-error'; } + const verifiedParam = Utils.getUrlParameter('verified'); + let verifiedBox = ''; + if (verifiedParam) { + verifiedBox = ( + <div className='alert alert-success'> + <i className='fa fa-check' /> + {' Email Verified'} + </div> + ); + } + let emailSignup; if (global.window.config.EnableSignUpWithEmail === 'true') { emailSignup = ( @@ -175,6 +186,7 @@ export default class Login extends React.Component { <h2 className='signup-team__name'>{teamDisplayName}</h2> <h2 className='signup-team__subdomain'>on {global.window.config.SiteName}</h2> <form onSubmit={this.handleSubmit}> + {verifiedBox} <div className={'form-group' + errorClass}> {serverError} </div> |