Added some templates for usermanagement
This commit is contained in:
parent
7eb627ad4f
commit
af1300c4b1
|
|
@ -130,8 +130,6 @@ STATICFILES_DIRS = [
|
|||
MEDIA_URL = '/media/'
|
||||
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
|
||||
|
||||
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
||||
|
||||
AUTH_USER_MODEL = 'users.User'
|
||||
|
||||
SLOT_COUNT = 7
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Gulashromstore Mockup</title>
|
||||
<title>Gulashromstore :: {% block title %}{% endblock %}</title>
|
||||
<link rel="stylesheet" type="text/css" href="{% static "css/gulash_bulma.css" %}">
|
||||
<link rel="stylesheet" type="text/css" href="{% static "fontawsome/css/font-awesome.min.css" %}">
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ class UserCreateForm(ModelForm):
|
|||
def clean_email(self):
|
||||
#Make sure Email is unique
|
||||
email = self.cleaned_data.get("email")
|
||||
if User.objects.filter(email = email):
|
||||
if get_user_model().objects.filter(email = email):
|
||||
raise forms.ValidationError("Email already in use.")
|
||||
|
||||
return email
|
||||
|
|
@ -77,7 +77,7 @@ class UserUpdateForm(ModelForm):
|
|||
def clean_email(self):
|
||||
#Make sure Email is still unique
|
||||
email = self.cleaned_data.get("email")
|
||||
if User.objects.filter(email = email).exclude(id=self.instance.id):
|
||||
if get_user_model().objects.filter(email = email).exclude(id=self.instance.id):
|
||||
raise forms.ValidationError("Email already in use.")
|
||||
|
||||
return email
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Registerierung abgeschlossen{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="rom-overview">
|
||||
<div class="columns">
|
||||
<div class="column">
|
||||
<div class="box">
|
||||
<h1 class="title is-1">Registerierung abgeschlossen</h1>
|
||||
Okay <b>{{confirm_user.username}}</b>,<br/>
|
||||
Danke fürs mitspielen.
|
||||
Deine Registrierung ist jetzt abgeschlossen.<br/>
|
||||
<br/>
|
||||
Jetzt kannst du dich <a href="{% url 'login' %}">einloggen</a>.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
Hallo, {{user.username}},
|
||||
Danke für die registrierung im Romstore.
|
||||
|
||||
Um deinen Account zu aktiveren klicke bitte auf den folgenden Link:
|
||||
{{validation_link}}
|
||||
|
||||
Viel Spaß!
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Einloggen{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="rom-overview">
|
||||
<div class="columns">
|
||||
<div class="column">
|
||||
<div class="box">
|
||||
<h1 class="title is-1">Einloggen</h1>
|
||||
{% if user.is_authenticated %}
|
||||
Du bist doch schon eingeloggt!?<br/>
|
||||
Meinten sie: <a href="{% url 'logout' %}">ausloggen</a> ?
|
||||
{% else %}
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
|
||||
<div class="field is-horizontal">
|
||||
<div class="field-label is-normal">
|
||||
<label class="label" for="{{form.username.id_for_label}}">{{form.username.label}}</label>
|
||||
</div>
|
||||
<div class="field-body">
|
||||
<div class="field is-narrow">
|
||||
<div class="control has-icons-left has-icons-right">
|
||||
<input class="input {% if form.username.errors %}is-danger{% endif %} is-primary"
|
||||
type="text" name="{{form.username.html_name}}"
|
||||
id="{{form.username.id_for_label}}" value="{{form.username.value|default_if_none:''}}" />
|
||||
<span class="icon is-small is-left">
|
||||
<i class="fa fa-user"></i>
|
||||
</span>
|
||||
<span class="icon is-small is-right">
|
||||
{% if form.username.errors %}
|
||||
<i class="fa fa-warning"></i>
|
||||
{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
<p class="help is-danger">
|
||||
{{form.username.errors.as_text}}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field is-horizontal">
|
||||
<div class="field-label is-normal">
|
||||
<label class="label" for="{{form.password.id_for_label}}">{{form.password.label}}</label>
|
||||
</div>
|
||||
<div class="field-body">
|
||||
<div class="field is-narrow">
|
||||
<div class="control has-icons-left has-icons-right">
|
||||
<input class="input {% if form.password.errors %}is-danger{% endif %} is-primary"
|
||||
type="password" name="{{form.password.html_name}}"
|
||||
id="{{form.password.id_for_label}}" value="{{form.password.value|default_if_none:'' }}" />
|
||||
<span class="icon is-small is-left">
|
||||
<i class="fa fa-unlock-alt"></i>
|
||||
</span>
|
||||
<span class="icon is-small is-right">
|
||||
{% if form.password.errors %}
|
||||
<i class="fa fa-warning"></i>
|
||||
{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
<p class="help is-danger">
|
||||
{{form.password.errors.as_text}}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field is-grouped">
|
||||
<p class="control">
|
||||
<button class="button is-primary">Einloggen</button>
|
||||
</p>
|
||||
</div>
|
||||
</form><br/>
|
||||
Och Mist, ich hab mein
|
||||
<a href="{% url 'password_reset' %}" class="resetlink">Passwort vergessen ...</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Passwort zurücksetzen{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="rom-overview">
|
||||
<div class="columns">
|
||||
<div class="column">
|
||||
<div class="box">
|
||||
<h1 class="title is-1">Passwort zurücksetzen</h1>
|
||||
{% if user.is_authenticated %}
|
||||
Du bist doch schon eingeloggt!?<br/>
|
||||
Und hast trotzdem dein Passwort vergessen?<br/>
|
||||
Von mir aus, dann <a href="{% url 'logout' %}">log dich erstm aus</a>.
|
||||
{% else %}
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
|
||||
<div class="field is-horizontal">
|
||||
<div class="field-label is-normal">
|
||||
<label class="label" for="{{form.email.id_for_label}}">{{form.email.label}}</label>
|
||||
</div>
|
||||
<div class="field-body">
|
||||
<div class="field is-narrow">
|
||||
<div class="control has-icons-left has-icons-right">
|
||||
<input class="input {% if form.email.errors %}is-danger{% endif %} is-primary"
|
||||
type="text" name="{{form.email.html_name}}"
|
||||
id="{{form.email.id_for_label}}" value="{{form.email.value|default_if_none:''}}" />
|
||||
<span class="icon is-small is-left">
|
||||
<i class="fa fa-envelope"></i>
|
||||
</span>
|
||||
<span class="icon is-small is-right">
|
||||
{% if form.email.errors %}
|
||||
<i class="fa fa-warning"></i>
|
||||
{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
<p class="help is-danger">
|
||||
{{form.email.errors.as_text}}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field is-grouped">
|
||||
<p class="control">
|
||||
<button class="button is-primary">Zurücksetzen</button>
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Email zum Passwort zurücksetzen gesendet{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="rom-overview">
|
||||
<div class="columns">
|
||||
<div class="column">
|
||||
<div class="box">
|
||||
<h1 class="title is-1">Email verschickt</h1>
|
||||
Du solltest jetzt eine Mail mit einem Link zum Passwort zurücksetzen bekommen haben.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Registerierung bestätigen{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="rom-overview">
|
||||
<div class="columns">
|
||||
<div class="column">
|
||||
<div class="box">
|
||||
<h1 class="title is-1">Registerierung bestätigen</h1>
|
||||
Hallo <b>{{confirm_user.username}}</b>,<br/>
|
||||
um deine Registerung abzuschließen klicke bitte auf den Link in der Email
|
||||
die du gerade bekommen hast.<br/>
|
||||
<br/>
|
||||
Keine Mail bekommen?<br/>
|
||||
Dann klicke <a href="{% url 'send_confirmation' user_id=confirm_user.pk %}">hier</a>
|
||||
um eine neue Email zu verschicken.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block title %} Sign up{% endblock %}
|
||||
{% block title %}Registrieren{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="rom-overview">
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
{% else %}
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
|
||||
<div class="field is-horizontal">
|
||||
<div class="field-label is-normal">
|
||||
<label class="label" for="{{form.username.id_for_label}}">{{form.username.label}}</label>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ urlpatterns = [
|
|||
'post_reset_redirect' : reverse_lazy('password_reset_sent')},
|
||||
name='password_reset'),
|
||||
|
||||
url(r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)/(?P<token>.+)/$', password_reset_confirm,
|
||||
url(r'^password/reset/(?P<uidb64>[0-9A-Za-z]+)/(?P<token>.+)/$', password_reset_confirm,
|
||||
{'template_name' : 'users/password_reset_confirm.html',
|
||||
'post_reset_redirect' : reverse_lazy('login')},
|
||||
name='password_reset_confirm'),
|
||||
|
|
|
|||
Loading…
Reference in New Issue