From 4311978d650fa1e40f34db3c2cb411377bcc6936 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 6 Oct 2015 09:12:49 -0400
Subject: Combining email verification confirmation screen with login screen.

---
 web/react/components/email_verify.jsx |  4 ++--
 web/react/components/login.jsx        | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/email_verify.jsx b/web/react/components/email_verify.jsx
index 8d3f15525..391de3326 100644
--- a/web/react/components/email_verify.jsx
+++ b/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>
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>
-- 
cgit v1.2.3-1-g7c22