Ensure the language dropdown is left aligned beside forget password link on the login form.

This commit is contained in:
Yogesh Mahajan
2022-11-08 13:35:38 +05:30
committed by GitHub
parent b673a0d896
commit bcf31d2317

View File

@@ -10,15 +10,20 @@
<form action="{{ url_for('authenticate.login') }}" method="POST" name="login_user_form"> <form action="{{ url_for('authenticate.login') }}" method="POST" name="login_user_form">
{{ login_user_form.hidden_tag() }} {{ login_user_form.hidden_tag() }}
{% set user_language = request.cookies.get('PGADMIN_LANGUAGE') or 'en' %} {% set user_language = request.cookies.get('PGADMIN_LANGUAGE') or 'en' %}
{% if not ((config.OAUTH2 in config.AUTHENTICATION_SOURCES or config.KERBEROS in config.AUTHENTICATION_SOURCES) and config.AUTHENTICATION_SOURCES | length == 1 {% set show_login_form = not ((config.OAUTH2 in config.AUTHENTICATION_SOURCES or config.KERBEROS in config.AUTHENTICATION_SOURCES) and config.AUTHENTICATION_SOURCES | length == 1
or (config.OAUTH2 in config.AUTHENTICATION_SOURCES and config.KERBEROS in config.AUTHENTICATION_SOURCES) and config.AUTHENTICATION_SOURCES | length == 2) %} or (config.OAUTH2 in config.AUTHENTICATION_SOURCES and config.KERBEROS in config.AUTHENTICATION_SOURCES) and config.AUTHENTICATION_SOURCES | length == 2) %}
{% if show_login_form %}
{{ render_username_with_errors(login_user_form.email, "text") }} {{ render_username_with_errors(login_user_form.email, "text") }}
{{ render_field_with_errors(login_user_form.password, "password") }} {{ render_field_with_errors(login_user_form.password, "password") }}
<button name="internal_button" class="btn btn-primary btn-block btn-login" type="submit" value="{{ _('Login') }}">{{ _('Login') }}</button> <button name="internal_button" class="btn btn-primary btn-block btn-login" type="submit" value="{{ _('Login') }}">{{ _('Login') }}</button>
<div class="col-7"><span class="help-block">{{ _('<a href="%(url)s" class="text-white">Forgotten your password</a>?', url=url_for('browser.forgot_password')) }}</span></div>
{% endif %} {% endif %}
<div class="form-group row mb-3 c user-language"> <div class="form-group row mb-3 c user-language">
<div class="col-5"> {% if show_login_form %}
<div class="col-7">
<span class="help-block">{{ _('<a href="%(url)s" class="text-white">Forgotten your password</a>?', url=url_for('browser.forgot_password')) }}</span>
</div>
{% endif %}
<div class="{{'col-5' if show_login_form else 'col-12'}}">
<select class="form-control" name="language" value="{{user_language}}"> <select class="form-control" name="language" value="{{user_language}}">
{% for key, lang in config.LANGUAGES.items() %} {% for key, lang in config.LANGUAGES.items() %}
<option value="{{key}}" {% if user_language == key %}selected{% endif %}>{{lang}}</option> <option value="{{key}}" {% if user_language == key %}selected{% endif %}>{{lang}}</option>