diff --git a/lms/static/js/student_account/views/LoginView.js b/lms/static/js/student_account/views/LoginView.js index d54c65fddb..23fa772a1a 100644 --- a/lms/static/js/student_account/views/LoginView.js +++ b/lms/static/js/student_account/views/LoginView.js @@ -93,7 +93,7 @@ var edx = edx || {}; }, thirdPartyAuth: function( event ) { - var providerUrl = $(event.target).data('provider-url') || ''; + var providerUrl = $(event.currentTarget).data('provider-url') || ''; if (providerUrl) { window.location.href = providerUrl; diff --git a/lms/static/js/student_account/views/RegisterView.js b/lms/static/js/student_account/views/RegisterView.js index 294704521b..bf52b942d4 100644 --- a/lms/static/js/student_account/views/RegisterView.js +++ b/lms/static/js/student_account/views/RegisterView.js @@ -62,7 +62,7 @@ var edx = edx || {}; }, thirdPartyAuth: function( event ) { - var providerUrl = $(event.target).data('provider-url') || ''; + var providerUrl = $(event.currentTarget).data('provider-url') || ''; if ( providerUrl ) { window.location.href = providerUrl; diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss index aad4cab6f3..7bfbe93523 100644 --- a/lms/static/sass/views/_login-register.scss +++ b/lms/static/sass/views/_login-register.scss @@ -385,6 +385,10 @@ $sm-btn-linkedin: #0077b5; color: $white; } + span { + color: inherit; + } + &:hover, &:focus { background-image: none; diff --git a/lms/templates/student_account/login.underscore b/lms/templates/student_account/login.underscore index 58447bdba8..0278412c86 100644 --- a/lms/templates/student_account/login.underscore +++ b/lms/templates/student_account/login.underscore @@ -35,6 +35,15 @@ +

+ <% if ( context.providers.length > 0 && !context.currentProvider || context.hasSecondaryProviders ) { %> + <%- gettext("Sign in here using your email address and password, or use one of the providers listed below.") %> + <% } else { %> + <%- gettext("Sign in here using your email address and password.") %> + <% } %> + <%- gettext("If you do not yet have an account, use the button below to register.") %> +

+ <%= context.fields %> @@ -51,7 +60,8 @@ if ( provider.loginUrl ) { %> <% } }); %> diff --git a/lms/templates/student_account/register.underscore b/lms/templates/student_account/register.underscore index 285bd90a2e..ddd409dbda 100644 --- a/lms/templates/student_account/register.underscore +++ b/lms/templates/student_account/register.underscore @@ -31,7 +31,8 @@ if ( provider.registerUrl ) { %> <% } }); %>