Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
La Quadrature du Net
Respect My Net
Commits
4dc9eded
Commit
4dc9eded
authored
Mar 13, 2016
by
Okhin
Browse files
Fixing the last template to fully use the registration backend
parent
7fa02525
Changes
4
Show whitespace changes
Inline
Side-by-side
nnmon/templates/registration/activation_email.txt
View file @
4dc9eded
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
{{activation_key}}
{{activation_key}}
{% trans "Please click on this link to activate your account" %}
{% trans "Please click on this link to activate your account" %}
{%root_url%}{% url registration_activate activation_key %}
{%root_url%}{% url
"auth_
registration_activate
"
activation_key %}
{% trans "This link will expire in:" %} {{expiration_days}} {% trans "days." %}
{% trans "This link will expire in:" %} {{expiration_days}} {% trans "days." %}
...
...
nnmon/templates/registration/login.html
View file @
4dc9eded
...
@@ -4,12 +4,12 @@
...
@@ -4,12 +4,12 @@
{% block title %}Login{% endblock %}
{% block title %}Login{% endblock %}
{% block content %}
{% block content %}
<form
action=
"{% url "
login
"
%}"
method=
"post"
>
{% csrf_token %}
<form
action=
"{% url "
auth_
login
"
%}"
method=
"post"
>
{% csrf_token %}
{{form.as_p}}
{{form.as_p}}
<input
type=
"hidden"
name=
"next"
value=
"{{next}}"
/>
<input
type=
"hidden"
name=
"next"
value=
"{{next}}"
/>
<input
type=
"submit"
name=
"login"
value=
"Login"
/>
<input
type=
"submit"
name=
"login"
value=
"Login"
/>
</form>
</form>
<p>
[
<a
href=
"{% url "
password_reset
"
%}"
>
{% trans "Password reset" %}
</a>
]
</p>
<p>
[
<a
href=
"{% url "
auth_
password_reset
"
%}"
>
{% trans "Password reset" %}
</a>
]
</p>
{% endblock %}
{% endblock %}
nnmon/templates/registration/password_reset_email.html
View file @
4dc9eded
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
{% trans "Please go to the following page and choose a new password:" %}
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
{% block reset_link %}
{{ protocol }}://{{ domain }}{% url "password_reset_confirm" uidb36=uid token=token %}
{{ protocol }}://{{ domain }}{% url "
auth_
password_reset_confirm" uidb36=uid token=token %}
{% endblock %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
...
...
nnmon/urls.py
View file @
4dc9eded
...
@@ -65,8 +65,6 @@ urlpatterns = patterns('',
...
@@ -65,8 +65,6 @@ urlpatterns = patterns('',
url
(
r
'^accounts/logout$'
,
url
(
r
'^accounts/logout$'
,
'django.contrib.auth.views.logout'
,
{
'next_page'
:
'/'
}),
'django.contrib.auth.views.logout'
,
{
'next_page'
:
'/'
}),
url
(
r
'^accounts/'
,
url
(
r
'^accounts/'
,
include
(
'django.contrib.auth.urls'
)),
url
(
r
'^register/'
,
include
(
'registration.backends.model_activation.urls'
)),
include
(
'registration.backends.model_activation.urls'
)),
url
(
r
'^comments/'
,
url
(
r
'^comments/'
,
include
(
'django_comments.urls'
)),
include
(
'django_comments.urls'
)),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment