Added password reset functionality

* Using the Django views directly.
* Replacement templates are in templates/registration but they are
* largely copies of the content in Django's but with our layout.html

oscar/app.py

@@ -1,4 +1,5 @@
 from django.conf.urls.defaults import patterns, url, include
+from django.contrib.auth import views as auth_views
 
 from oscar.core.application import Application
 from oscar.apps.catalogue.app import application as catalogue_app
@@ -29,6 +30,15 @@ class Shop(Application):
             (r'^accounts/', include(self.customer_app.urls)),
             (r'^search/', include(self.search_app.urls)),
             (r'^dashboard/', include(self.dashboard_app.urls)),
+
+            # Password reset - as we're using Django's default view funtions, we
+            # can't namespace these urls as that prevents the reverse function
+            # from working.
+            url(r'^password-reset/$', auth_views.password_reset, name='password-reset'),
+            url(r'^password-reset/done/$', auth_views.password_reset_done, name='password-reset-done'),
+            url(r'^password-reset/confirm/$', auth_views.password_reset_confirm, name='password-reset-confirm'),
+            url(r'^password-reset/complete/$', auth_views.password_reset_complete, name='password-reset-complete'),
+
             (r'', include(self.promotions_app.urls)),             
         )
         return urlpatterns

oscar/apps/customer/app.py

@@ -7,6 +7,7 @@ from oscar.apps.customer.views import AccountSummaryView, OrderHistoryView, \
     AccountAuthView, AnonymousOrderDetailView
 from oscar.core.application import Application
 
+
 class CustomerApplication(Application):
     name = 'customer'
     summary_view = AccountSummaryView
@@ -30,6 +31,9 @@ class CustomerApplication(Application):
         urlpatterns += patterns('',
             url(r'^$', login_required(self.summary_view.as_view()), name='summary'),
             url(r'^login/$', self.login_view.as_view(), name='login'),
+
+
+            # Profile
             url(r'^orders/$', login_required(self.order_history_view.as_view()), name='order-list'),
             url(r'^order-status/(?P<order_number>[\w-]*)/(?P<hash>\w+)/$', 
                 self.anon_order_detail_view.as_view(), name='anon-order'),

oscar/templates/checkout/gateway.html

@@ -27,12 +27,12 @@ Checkout gateway | {{ block.super }}
 			I have an account and my password is:</label>
 		{{ form.password }}
 		{{ form.password.errors }}
-		<a href="">Get a password reminder</a>
+		<a href="{% url password-reset %}">Get a password reminder</a>
 		<label><input type="radio" id="id_options_0" name="options" value="new" {% if not form.password.errors %}checked="checked"{% endif %} /> I don't want to create an account</label><br/>
 	</div>
 	<div>
 		<button type="submit" class="btn btn-large btn-primary">Continue</button>
-		Alternatively <a href="">create an account</a> before you checkout.
+		Alternatively <a href="{% url customer:login %}">create an account</a> before you checkout.
 	</div>
 </form>
 

oscar/templates/registration/password_reset_complete.html

@@ -0,0 +1,14 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password reset complete' %} | {{ block.super }}{% endblock %}
+
+{% block content %}
+
+<h1>{% trans 'Password reset complete' %}</h1>
+
+<p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
+
+<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
+
+{% endblock %}

oscar/templates/registration/password_reset_confirm.html

@@ -0,0 +1,30 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password reset confirm' %} | {{ block.super }}{% endblock %}
+
+{% block content %}
+
+{% if validlink %}
+
+<h1>{% trans 'Enter new password' %}</h1>
+
+<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+
+<form action="" method="post">{% csrf_token %}
+{{ form.new_password1.errors }}
+<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
+{{ form.new_password2.errors }}
+<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
+<p><input type="submit" value="{% trans 'Change my password' %}" /></p>
+</form>
+
+{% else %}
+
+<h1>{% trans 'Password reset unsuccessful' %}</h1>
+
+<p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+
+{% endif %}
+
+{% endblock %}

oscar/templates/registration/password_reset_done.html

@@ -0,0 +1,11 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password reset successful' %} | {{ block.super }}{% endblock %}
+
+{% block content %}
+
+	<h1>{% trans 'Password reset successful' %}</h1>
+	<p>{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p>
+
+{% endblock %}

oscar/templates/registration/password_reset_email.html

@@ -0,0 +1,14 @@
+{% load i18n %}{% load url from future %}{% autoescape off %}
+{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
+
+{% trans "Please go to the following page and choose a new password:" %}
+{% block reset_link %}
+{{ protocol }}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
+{% endblock %}
+{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
+
+{% trans "Thanks for using our site!" %}
+
+{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
+
+{% endautoescape %}

oscar/templates/registration/password_reset_form.html

@@ -0,0 +1,17 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password reset' %} | {{ block.super }}{% endblock %}
+
+{% block content %}
+
+	<h1>{% trans "Password reset" %}</h1>
+
+	<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p>
+
+	<form action="" method="post">{% csrf_token %}
+	{{ form.email.errors }}
+	<p><label for="id_email">{% trans 'E-mail address:' %}</label> {{ form.email }} <input type="submit" value="{% trans 'Reset my password' %}" /></p>
+	</form>
+
+{% endblock %}

oscar/templates/registration/password_reset_subject.txt

@@ -0,0 +1,3 @@
+{% load i18n %}{% autoescape off %}
+{% blocktrans %}Password reset on {{ site_name }}{% endblocktrans %}
+{% endautoescape %}

sandbox/settings.py

@@ -110,7 +110,7 @@ ROOT_URLCONF = 'urls'
 
 from oscar import OSCAR_PARENT_TEMPLATE_DIR
 TEMPLATE_DIRS = (
-    location('templates'),
+    os.path.join(OSCAR_PARENT_TEMPLATE_DIR, 'templates'),
     OSCAR_PARENT_TEMPLATE_DIR,
 )