inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-22 23:00:54 +00:00
Code Activity

Merge pull request from SchrodingersGat/incorrect-login-fix

Browse Source 
Add message if username / password combo is rejected
This commit is contained in:
Oliver
2021-02-17 07:37:08 +11:00
committed by GitHub
parent a444f21e64 baa352ca98
commit d2c9f759b1
6 changed files with 2249 additions and 1612 deletions
InvenTree
InvenTree
static
css
inventree.css
locale
de
LC_MESSAGES
django.modjango.po
en
LC_MESSAGES
django.po
es
LC_MESSAGES
django.po
templates
registration
login.html

2
InvenTree/InvenTree/static/css/inventree.css

@ -30,7 +30,7 @@
border-radius: 15px;
padding: 20px;
padding-bottom: 35px;
background-color: rgba(50, 50, 50, 0.5);
background-color: rgba(50, 50, 50, 0.75);
}
.login-header {

BIN
InvenTree/locale/de/LC_MESSAGES/django.mo

Binary file not shown.

1335
InvenTree/locale/de/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff

1254
InvenTree/locale/en/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff

1254
InvenTree/locale/es/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff

16
InvenTree/templates/registration/login.html

@ -21,6 +21,12 @@
<script type='text/javascript' src="{% static 'fontawesome/js/brands.js' %}"></script>
<script type='text/javascript' src="{% static 'fontawesome/js/fontawesome.js' %}"></script>
<style>
.login-error {
color: #F88;
}
</style>
<title>
InvenTree
</title>
@ -55,7 +61,7 @@
<div class='input-group-addon'>
<span class='fas fa-user'></span>
</div>
<input type="text" name="username" autofocus autocapitalize="none" autocomplete="username" maxlength="150" class="textinput textInput form-control" required id="id_username">
<input type="text" name="username" autofocus autocapitalize="none" autocomplete="username" maxlength="150" class="textinput textInput form-control" required id="id_username" placeholder='{% trans "Enter username" %}'>
</div>
</div>
</div>
@ -67,11 +73,17 @@
<div class='input-group-addon'>
<span class='fas fa-key'></span>
</div>
<input type="password" name="password" autocomplete="current-password" class="textinput textInput form-control" required id="id_password">
<input type="password" name="password" autocomplete="current-password" class="textinput textInput form-control" required id="id_password" placeholder='{% trans "Enter password" %}'>
</div>
</div>
</div>
{% if form.errors %}
<div class='login-error'>
<b>{% trans "Username / password combination is incorrect" %}</b>
</div>
{% endif %}
<hr>
<button class='pull-right btn btn-primary login-button' type="submit">{% trans "Login" %}</button>