diff --git a/server/views/account/email-signin.jade b/server/views/account/email-signin.jade index cb965ee7d0..d3a11c3b8a 100644 --- a/server/views/account/email-signin.jade +++ b/server/views/account/email-signin.jade @@ -34,18 +34,17 @@ block content a(href="/deprecated-signin") Or click here if you want to sign in with other options. script. - $(document).ready(function() { - - function disableMagicButton (isDisabled) { - if (isDisabled) { - $('#magic-btn') - .html('') - .prop('disabled', true); - } else { - $('#magic-btn') - .html('Get a magic link to sign in.') - .prop('disabled', false); - } + $(document).ready(function() { + function disableMagicButton (isDisabled) { + if (isDisabled) { + $('#magic-btn') + .prop('disabled', true) + .html('Ok - We will attempt sending to the email above.'); + } else { + $('#magic-btn') + .prop('disabled', true) + .html('Did not get a link? Reload the page and resend again.'); + } } $('form').submit(function(event){ @@ -54,26 +53,29 @@ block content disableMagicButton(true); var $form = $(event.target); $.ajax({ - type : 'POST', - url : $form.attr('action'), - data : $form.serialize(), - dataType : 'json', - encode : true, - xhrFields : { withCredentials: true } + type : 'POST', + url : $form.attr('action'), + data : $form.serialize(), + dataType : 'json', + encode : true, + xhrFields : { withCredentials: true } }) .fail(error => { if (error.responseText){ - var data = JSON.parse(error.responseText); - if(data.error && data.error.message) + var data = JSON.parse(error.responseText); + if(data.error && data.error.message) { $('#flash-content').html(data.error.message); $('#flash-board') .removeClass('alert-success') .addClass('alert-info') + .slideDown(400) + .delay(800) .fadeIn(); disableMagicButton(false); } + } }) - .done(data =>{ + .done(data => { if(data && data.message) { var alertType = 'alert-'; switch (data.type) { @@ -91,11 +93,13 @@ block content } $('#flash-content').html(data.message); $('#flash-board') - .removeClass('alert-info alert-success alert-danger') - .addClass(alertType) - .fadeIn(); + .removeClass('alert-info alert-success alert-danger') + .addClass(alertType) + .slideDown(400) + .delay(800) + .fadeIn(); disableMagicButton(false); } }); }); - }); + });