clara/Inventarium
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Bugfixes

Browse source 
+ delete categories
+ translations
+ style improvements
This commit is contained in:
Clemens-Dautermann 2018-12-27 13:40:49 +01:00
parent 51c942746b
commit a4486909df
14 changed files with 151 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
invsystem/user_manager/templates/registration/logged_out.html
View file

@ -4,8 +4,8 @@
{% block content %}
<div class="container">
<p>Logged out!</p>
<a href="{% url 'login'%}">Click here to login again.</a>
<p>Ausgelogt.</p>
<a href="{% url 'login'%}">Klicken sie hier um sich erneut einzuloggen.</a>
</div>
</body>
{% endblock %}

12
invsystem/user_manager/templates/registration/login.html
View file

@ -6,9 +6,9 @@
<html>
<div class="container">
<div class="container shadow">
{% if form.errors %}
<p class="error">Wrong username/password combination</p>
<p class="error">Falscher Nutzername oder falsches Passwort</p>
{% endif %}
{% if next %}
@ -19,13 +19,13 @@
<form class="form-horizontal login-form" action="{% url 'login' %}" method="post">
{% csrf_token %}
<div class="form-group">
<label class="control-label col-sm-2" for="email">Username:</label>
<label class="control-label col-sm-2" for="email">Nutzername:</label>
<div class="col-sm-10">
{{ form.username }}
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="pwd">Password:</label>
<label class="control-label col-sm-2" for="pwd">Passwort:</label>
<div class="col-sm-10">
{{ form.password }}
</div>
@ -33,9 +33,9 @@
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary">Login</button>
<button type="submit" class="btn btn-primary">Einloggen</button>
<input type="hidden" name="next" value="{{ next }}">
<span class="reset"><a href="{% url 'password_reset' %}">Lost password?</a></span>
<span class="reset"><a href="{% url 'password_reset' %}">Passwort vergessen?</a></span>
</div>

47
invsystem/user_manager/templates/registration/register.html
View file

@ -5,20 +5,55 @@
{% block content %}
<html>
<div class="container">
<h1>registration page</h1>
<form method="post" action="{% url 'register' %}">
<div class="container shadow">
<h1>Registrieren</h1>
<form method="post" action="{% url 'register' %}" class="registerformcontainer">
{% csrf_token %}
{% if form.errors %}
<p>There are errors in the form</p>
{% endif %}
{{ form }}
<input type="submit" value="Register">
<div class="username-wrapper">
{{ form.username.errors }}
<label for="{{ form.username.id_for_lable }}">Nutzername:</label>
{{ form.username }}
</div>
<div class="first_name-wrapper">
{{ form.first_name.errors }}
<label for="{{ form.first_name.id_for_lable }}">Vorname:</label>
{{ form.first_name }}
</div>
<div class="last_name-wrapper">
{{ form.last_name.errors }}
<label for="{{ form.last_name.id_for_lable }}">Nachname:</label>
{{ form.last_name }}
</div>
<div class="email-wrapper">
{{ form.email.errors }}
<label for="{{ form.email.id_for_lable }}">E-mail:</label>
{{ form.email }}
</div>
<div class="password1-wrapper">
{{ form.password1.errors }}
<label for="{{ form.password1.id_for_lable }}">Passwort:</label>
{{ form.password1 }}
</div>
<ul class="nodec pwdinfo">
<li>Das Passwort darf nicht zu ähnlich zu Ihren anderen persönlichen Informationen sein.</li>
<li>Das Passwort muss mindestens 8 Zeichen enthalten.</li>
<li>Das Passwort darf nicht allgemein üblich sein.</li>
<li>Das Passwort darf nicht komplett aus Ziffern bestehen.</li>
</ul>
<div class="password2-wrapper">
{{ form.password2.errors }}
<label for="{{ form.password2.id_for_lable }}">Passwort bestätigen:</label>
{{ form.password2 }}
</div>
<input type="submit" value="Registrieren" class="btn btn-success nomarg">
</form>
<div>
</body>
</html>