Commit 4dc9eded authored by Okhin's avatar Okhin

Fixing the last template to fully use the registration backend

parent 7fa02525
......@@ -5,7 +5,7 @@
{{activation_key}}
{% 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." %}
......
......@@ -4,12 +4,12 @@
{% block title %}Login{% endblock %}
{% block content %}
<form action="{% url "login" %}" method="post">{% csrf_token %}
<form action="{% url "auth_login" %}" method="post">{% csrf_token %}
{{form.as_p}}
<input type="hidden" name="next" value="{{next}}" />
<input type="submit" name="login" value="Login" />
</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 %}
......@@ -4,7 +4,7 @@
{% trans "Please go to the following page and choose a new password:" %}
{% 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 %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
......
......@@ -65,8 +65,6 @@ urlpatterns = patterns('',
url(r'^accounts/logout$',
'django.contrib.auth.views.logout', {'next_page': '/'}),
url(r'^accounts/',
include('django.contrib.auth.urls')),
url(r'^register/',
include('registration.backends.model_activation.urls')),
url(r'^comments/',
include('django_comments.urls')),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment