Pull tk674 changes from trunk. Required manual conflict resolution

because of tree changes in this (tk685) branch; with luck the
subversion mergeinfo will record what happened as I intended, but if
something horrible happens when this is merged back to trunk, you'll
know why.  Manual diff of affected files against trunk looks good.

svn path=/branches/tk685/; revision=5766

7 files changed, 41 insertions, 0 deletions

diff --git a/rpki/gui/app/templates/registration/login.html b/rpki/gui/app/templates/registration/login.html
index 0d6fb6fd..18b66b55 100644
--- a/rpki/gui/app/templates/registration/login.html
+++ b/rpki/gui/app/templates/registration/login.html
@@ -22,4 +22,6 @@
   </div>
 </form>
 
+<a href="{% url "password_reset" %}">Forgot your password?</a>
+
 {% endblock %}
diff --git a/rpki/gui/app/templates/registration/password_reset_complete.html b/rpki/gui/app/templates/registration/password_reset_complete.html
new file mode 100644
index 00000000..d60c6b09
--- /dev/null
+++ b/rpki/gui/app/templates/registration/password_reset_complete.html
@@ -0,0 +1,7 @@
+{% extends "app/app_base.html" %}
+{% load url from future %}
+
+{% block content %}
+<p>Your password has been set.  You may go ahead and log in now.</p>
+<p><a href="{% url "rpki.gui.views.login" %}">Log in</a></p>
+{% endblock %}
diff --git a/rpki/gui/app/templates/registration/password_reset_confirm.html b/rpki/gui/app/templates/registration/password_reset_confirm.html
new file mode 100644
index 00000000..a577f12d
--- /dev/null
+++ b/rpki/gui/app/templates/registration/password_reset_confirm.html
@@ -0,0 +1,5 @@
+{% extends "app/app_form.html" %}
+
+{% block form_info %}
+<p>Please enter your new password twice, so we can verify you typed it in correctly.</p>
+{% endblock %}
diff --git a/rpki/gui/app/templates/registration/password_reset_done.html b/rpki/gui/app/templates/registration/password_reset_done.html
new file mode 100644
index 00000000..c0584f86
--- /dev/null
+++ b/rpki/gui/app/templates/registration/password_reset_done.html
@@ -0,0 +1,6 @@
+{% extends "app/app_base.html" %}
+
+{% block content %}
+<p>We've e-mailed you instructions for setting your password to the e-mail address you submitted.</p>
+<p>You should be receiving it shortly.</p>
+{% endblock %}
diff --git a/rpki/gui/app/templates/registration/password_reset_email.html b/rpki/gui/app/templates/registration/password_reset_email.html
new file mode 100644
index 00000000..0c4a5672
--- /dev/null
+++ b/rpki/gui/app/templates/registration/password_reset_email.html
@@ -0,0 +1,2 @@
+Someone asked for password reset for email {{ email }}. Follow the link below:
+{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb36=uid token=token %}
diff --git a/rpki/gui/app/templates/registration/password_reset_form.html b/rpki/gui/app/templates/registration/password_reset_form.html
new file mode 100644
index 00000000..12f1d624
--- /dev/null
+++ b/rpki/gui/app/templates/registration/password_reset_form.html
@@ -0,0 +1,5 @@
+{% extends "app/app_form.html" %}
+
+{% block form_info %}
+<p>Please specify your email address to receive instructions for resetting it.</p>
+{% endblock %}
diff --git a/rpki/gui/app/urls.py b/rpki/gui/app/urls.py
index 92e90b0e..a86611a7 100644
--- a/rpki/gui/app/urls.py
+++ b/rpki/gui/app/urls.py
@@ -78,4 +78,18 @@ urlpatterns = patterns(
     (r'^user/create$', views.user_create),
     (r'^user/(?P<pk>\d+)/delete$', views.user_delete),
     (r'^user/(?P<pk>\d+)/edit$', views.user_edit),
+
+    url(r'^user/password/reset/$', 
+        'django.contrib.auth.views.password_reset', 
+        #{'post_reset_redirect' : '/user/password/reset/done/'},
+        {'extra_context': {'form_title': 'Password Reset'}},
+        name="password_reset"),
+    (r'^user/password/reset/done/$',
+        'django.contrib.auth.views.password_reset_done'),
+    url(r'^user/password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 
+        'django.contrib.auth.views.password_reset_confirm', 
+        #{'post_reset_redirect' : '/user/password/done/'},
+        name="password_reset_confirm"),
+    (r'^user/password/done/$', 
+        'django.contrib.auth.views.password_reset_complete'),
 )