Skip to content
Snippets Groups Projects
Commit b84d61aa authored by Martin Burchell's avatar Martin Burchell
Browse files

WIP on password reset

parent 57088f2c
No related branches found
No related tags found
1 merge request!49Password reset
{% for hidden in form.hidden_fields %}
{{ hidden }}
{% endfor %}
{% for field in form.visible_fields %}
<div class="pure-control-group">
<label>
<span {{ field.row_attrs }}>{{field.label}}</span>
{% if field.help_text %}<span class="help-text">{{ field.help_text|safe }}</span>{% endif %}
</label>
{{ field }}
{% if field.errors %}<span class="field-errors clearfix">{{ field.errors }}</span>{% endif %}
</div>
{% endfor %}
......@@ -21,7 +21,7 @@ urlpatterns = patterns(
# Uncomment the next line to enable the admin:
url(r'^admin/', include(admin.site.urls)),
url(r'^accounts/', include('users.urls')),
url(r'^accounts/', include('users.auth_urls')),
url(r'^api/', include('rest_api.urls')),
url(r'^dashboard/', include('dashboard.urls')),
url(r'^view-edit/', include('tabbed_page.urls')),
......
from django.conf.urls import patterns, url
from django.contrib.auth.views import (
login, logout_then_login, password_reset_confirm_uidb36
login, logout_then_login, password_reset_confirm
)
from .views import ResetPassword, change_password
urlpatterns = patterns('',
urlpatterns = patterns(
'',
url(r'login/$', login, name='login'),
url(r'logout/$', logout_then_login, name='logout'),
# Activation and password reset
url(r'password_reset/$', ResetPassword.as_view(), name='password_reset'),
url(r'password_reset_confirm/(?P<uidb36>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
password_reset_confirm_uidb36, {'post_reset_redirect': '/'}, name='password_reset_confirm'),
url(r'password_reset_confirm/(?P<uidb64>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
password_reset_confirm, {'post_reset_redirect': '/'}, name='password_reset_confirm'),
url(r'password_change/$', change_password, name='password_change'),
)
......@@ -12,9 +12,10 @@
<div class="form-group panel-body">
<form action="." method="post">{% csrf_token %}
{% bootstrap_form form show_label=False %}
<a href="{% url "password_reset" %}"><small>Forgot password?</small></a>
{% bootstrap_button "Log in" button_type="submit" value="Log in" button_class="btn btn-lg btn-primary btn-block" %}
</form>
</div>
</div>
</div>
{% endblock maincontent %}
\ No newline at end of file
{% endblock maincontent %}
{% extends "base.html" %}
{% block title %}Password reset{% endblock %}
{% block content %}
<form action="" method="post" class="pure-form pure-form-aligned solo-box centered clearfix" enctype="multipart/form-data">
<h3>Reset password</h3>
<fieldset class="move-right">
{% csrf_token %}
{% include "form_snippet.html" %}
<div class="pure-control-group move-right">
<a href="{% url "dashboard" %}" class="pure-button">Cancel</a>
<button type="submit" class="pure-button pure-button-primary">Reset password</button>
</div>
</fieldset>
</form>
{% endblock %}
from django.conf.urls import patterns, url
from django.contrib.auth.views import login, logout
from .views import (
AddContact, UpdateContact, DeleteContact, ListContacts,
......@@ -10,8 +9,6 @@ from .views import (
urlpatterns = patterns(
'',
url(r'login/$', login, name="login"),
url(r'logout/$', logout, name="logout"),
url(r'edit/$', AddContact.as_view(), name='contact_add'),
url(r'edit/(?P<pk>\d+)/$', UpdateContact.as_view(),
name='contact_update'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment