Merge pull request #938 from mattermost/plt-111

PLT-111 Combining email verification confirmation screen with login screen.

web/react/components/email_verify.jsx

@@ -38,8 +38,8 @@ export default class EmailVerify extends React.Component {
         }
 
         return (
-            <div className='col-sm-offset-4 col-sm-4'>
-                <div className='panel panel-default'>
+            <div className='col-sm-12'>
+                <div className='panel panel-default verify_panel'>
                     <div className='panel-heading'>
                         <h3 className='panel-title'>{title}</h3>
                     </div>

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>