diff --git a/HISTORY.rst b/HISTORY.rst index 2de8ff653..d483578f1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -12,6 +12,8 @@ End-User Summary - Starting with branch of stable version Athenea (VarFish v1). - Documenting problem with extra annotations in ``20210728` data release (#450). Includes instructions on how to apply patch to get ``20210728b``. +- Removing problematic username modification behaviour on login page (#459). +- Displaying login page text from settings again (#458). Full Change List ================ @@ -19,6 +21,8 @@ Full Change List - Starting with branch of stable version Athenea (VarFish v1). - Documenting problem with extra annotations in ``20210728` data release (#450). Includes instructions on how to apply patch to get ``20210728b``. +- Removing problematic username modification behaviour on login page (#459). +- Displaying login page text from settings again (#458). ------ v1.2.0 diff --git a/varfish/static/js/login.js b/varfish/static/js/login.js index 31031fbb9..e69de29bb 100644 --- a/varfish/static/js/login.js +++ b/varfish/static/js/login.js @@ -1,58 +0,0 @@ -/* Autofill domain in login username ---------------------------------------- */ - -$(document).ready(function() { - $('#sodar-login-username').keyup(function(event) { - var maxLength = 255; - v = $(this).val(); - - // Fill domain - if (event.keyCode !== 8 && v.length > 3 && - v.indexOf('@') > 0 && v.indexOf('@') < v.length - 1) { - var domainName = null; - - if (v.charAt(v.indexOf('@') + 1).toUpperCase() === 'C') { - $(this).removeClass('text-danger'); - $('#sodar-login-submit').removeClass('disabled'); - domainName = 'CHARITE'; - } - - else if (v.charAt(v.indexOf('@') + 1).toUpperCase() === 'M') { - $(this).removeClass('text-danger'); - $('#sodar-login-submit').removeClass('disabled'); - domainName = 'MDC-BERLIN'; - } - - // Gently inform the user of an invalid domain :) - else { - $(this).addClass('text-danger'); - $('#sodar-login-submit').addClass('disabled'); - } - - if (domainName !== null) { - $(this).val(v.substring(0, v.indexOf('@') + 1) + domainName); - $(this).attr('maxlength', $(this).val().length); - } - } - - // Erase domain if backspace is pressed - else if (event.keyCode === 8 && v.indexOf('@') > 0) { - $(this).val(v.substring(0, v.indexOf('@') + 1)); - $(this).addClass('text-danger'); - $('#sodar-login-submit').addClass('disabled'); - $(this).attr('maxlength', maxLength); - } - - // Don't allow login if there is an empty domain - if (v.indexOf('@') === v.length - 1) { - $(this).addClass('text-danger'); - $('#sodar-login-submit').addClass('disabled'); - } - - // User without domain is OK (only for local admin/test users) - else if (v.indexOf('@') === -1) { - $(this).removeClass('text-danger'); - $('#sodar-login-submit').removeClass('disabled'); - $(this).attr('maxlength', maxLength); - } - }); - }); diff --git a/varfish/templates/users/login.html b/varfish/templates/users/login.html index f86f4f2f4..e567ff17e 100644 --- a/varfish/templates/users/login.html +++ b/varfish/templates/users/login.html @@ -4,6 +4,7 @@ {% load static %} {% load projectroles_tags %} {% load projectroles_common_tags %} +{% load variants_tags %} {% get_django_setting 'SITE_INSTANCE_TITLE' as site_title %} @@ -33,6 +34,7 @@

Login

{% autoescape off %} {% get_login_info %} + {% get_login_page_text %} {% endautoescape %}