From be87ddf10812c5814fe93a7d6529b15bd4d2608c Mon Sep 17 00:00:00 2001 From: komalsheth286 Date: Mon, 3 Oct 2016 18:05:29 +0530 Subject: Forgot passward templates added --- scipy2016/urls.py | 12 +-- website/templates/base.html | 6 +- .../templates/register/password_change_done.html | 55 +++++++++++ .../templates/register/password_change_form.html | 59 ++++++++++++ .../register/password_reset_complete.html | 51 ++++++++++ .../templates/register/password_reset_confirm.html | 99 +++++++++++++++++++ .../templates/register/password_reset_done.html | 49 ++++++++++ .../templates/register/password_reset_form.html | 64 +++++++++++++ .../registration/password_change_done.html | 63 ------------ .../registration/password_change_form.html | 64 ------------- .../registration/password_reset_complete.html | 56 ----------- .../registration/password_reset_confirm.html | 106 --------------------- .../registration/password_reset_done.html | 55 ----------- .../registration/password_reset_form.html | 69 -------------- 14 files changed, 386 insertions(+), 422 deletions(-) create mode 100755 website/templates/register/password_change_done.html create mode 100755 website/templates/register/password_change_form.html create mode 100755 website/templates/register/password_reset_complete.html create mode 100755 website/templates/register/password_reset_confirm.html create mode 100755 website/templates/register/password_reset_done.html create mode 100755 website/templates/register/password_reset_form.html delete mode 100755 website/templates/registration/password_change_done.html delete mode 100755 website/templates/registration/password_change_form.html delete mode 100755 website/templates/registration/password_reset_complete.html delete mode 100755 website/templates/registration/password_reset_confirm.html delete mode 100755 website/templates/registration/password_reset_done.html delete mode 100755 website/templates/registration/password_reset_form.html diff --git a/scipy2016/urls.py b/scipy2016/urls.py index e1259cf..5878a44 100755 --- a/scipy2016/urls.py +++ b/scipy2016/urls.py @@ -14,15 +14,15 @@ urlpatterns = patterns('', url(r'^', include('social.apps.django_app.urls', namespace='social')), url(r'^', include('django.contrib.auth.urls', namespace='auth')), - url(r'^forgotpassword/$', password_reset, {'template_name': 'registration/password_reset_form.html'}, name="password_reset"), + url(r'^forgotpassword/$', password_reset, {'template_name': 'register/password_reset_form.html'}, name="password_reset"), url(r'^password_reset/(?P[0-9A-Za-z]+)-(?P.+)/$', - password_reset_confirm, {'template_name': 'registration/password_reset_confirm.html'}, name='password_reset_confirm'), - url(r'^password_reset/mail_sent/$', password_reset_done, {'template_name': 'registration/password_reset_done.html'}, + password_reset_confirm, {'template_name': 'register/password_reset_confirm.html'}, name='password_reset_confirm'), + url(r'^password_reset/mail_sent/$', password_reset_done, {'template_name': 'register/password_reset_done.html'}, name='password_reset_done'), - url(r'^password_reset/complete/$', password_reset_complete, {'template_name': 'registration/password_reset_complete.html'}, + url(r'^password_reset/complete/$', password_reset_complete, {'template_name': 'register/password_reset_complete.html'}, name='password_reset_complete'), - url(r'^changepassword/$', password_change, {'template_name': 'registration/password_change_form.html'}, + url(r'^changepassword/$', password_change, {'template_name': 'register/password_change_form.html'}, name='password_change'), - url(r'^password_change/done/$', password_change_done, {'template_name': 'registration/password_change_done.html'}, + url(r'^password_change/done/$', password_change_done, {'template_name': 'register/password_change_done.html'}, name='password_change_done'), ) diff --git a/website/templates/base.html b/website/templates/base.html index d033412..fd20174 100755 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -428,9 +428,9 @@ Visit SciPy.in/ - - - + 2009/ + 2010/ + 2011/ 2012/ 2013/ 2014/ diff --git a/website/templates/register/password_change_done.html b/website/templates/register/password_change_done.html new file mode 100755 index 0000000..a5b771c --- /dev/null +++ b/website/templates/register/password_change_done.html @@ -0,0 +1,55 @@ +{% extends 'base.html' %} +{% load static %} + + + + + Forgot Password + + + + + + + + {% block header %} +
+

SciPy India 2016

+

Reset Password

+
+{% endblock %} + +
+ +{% block nav %} + + +{% endblock %} + + + +{% block content %} +
+
+
+ + +

Your password has been changed successfully.

+

Redirecting ...

+
+
+
+{% endblock %} \ No newline at end of file diff --git a/website/templates/register/password_change_form.html b/website/templates/register/password_change_form.html new file mode 100755 index 0000000..c3254ba --- /dev/null +++ b/website/templates/register/password_change_form.html @@ -0,0 +1,59 @@ +{% extends 'base.html' %} +{% load static %} + + + + + Call for Proposal + + + + + + + + + + + {% block header %} +
+

SciPy India 2016

+

Reset Password

+
+{% endblock %} + +
+ +{% block nav %} + + +{% endblock %} + + + +{% block content %} +
+
+
+
+ {% csrf_token %} +
+ + {{ form }} +
+
+
+
+
+
+
+
+{% endblock %} diff --git a/website/templates/register/password_reset_complete.html b/website/templates/register/password_reset_complete.html new file mode 100755 index 0000000..ef6496f --- /dev/null +++ b/website/templates/register/password_reset_complete.html @@ -0,0 +1,51 @@ +{% extends 'base.html' %} +{% load static %} + + + + + Call for Proposal + + + + + + + + + + + {% block header %} +
+

SciPy India 2016

+

Reset Password

+
+{% endblock %} + +
+ +{% block nav %} + + +{% endblock %} + + + +{% block content %} +
+
+
+

Your password has been reset.

+

Please Log in with your new password.

+
+
+
+{% endblock %} diff --git a/website/templates/register/password_reset_confirm.html b/website/templates/register/password_reset_confirm.html new file mode 100755 index 0000000..db880b7 --- /dev/null +++ b/website/templates/register/password_reset_confirm.html @@ -0,0 +1,99 @@ +{% extends 'base.html' %} +{% load static %} + + + + + Call for Proposal + + + + + + + + + + + {% block header %} +
+

SciPy India 2016

+

Reset Password

+
+{% endblock %} + +
+ +{% block nav %} + + +{% endblock %} + + + +{% block content %} +
+
+
+ {% if validlink %} +
+

Please enter your new password twice.

+
+
+
+ +
+ + + + + + + + + + + + +
+
{{ form.new_password1.errors }} + {{ form.new_password1 }}
{{ form.new_password2.errors }} + {{ form.new_password2 }}

+
+
+ {% else %} +

The password reset link is invalid, + possibly because it has already been used.
+ Please request a new password reset.


+ {% endif %} +
+
+
+ + +{% endblock %} diff --git a/website/templates/register/password_reset_done.html b/website/templates/register/password_reset_done.html new file mode 100755 index 0000000..723f43b --- /dev/null +++ b/website/templates/register/password_reset_done.html @@ -0,0 +1,49 @@ +{% extends 'base.html' %} +{% load static %} + + + + + Call for Proposal + + + + + + + + + + + {% block header %} +
+

SciPy India 2016

+

Reset Password

+
+{% endblock %} + +
+ +{% block nav %} + + +{% endblock %} + + +{% block content %} +
+
+
+ If an account exists with this email, you would receive the password reset instructions shortly. Please check your spam folder too.
+
+
+
+ {% endblock %} diff --git a/website/templates/register/password_reset_form.html b/website/templates/register/password_reset_form.html new file mode 100755 index 0000000..d2ac4f8 --- /dev/null +++ b/website/templates/register/password_reset_form.html @@ -0,0 +1,64 @@ +{% extends 'base.html' %} +{% load static %} + + + + + Call for Proposal + + + + + + + + + + + {% block header %} +
+

SciPy India 2016

+

Reset Password

+
+{% endblock %} + +
+ +{% block nav %} + + +{% endblock %} + + + +{% block content %} +
+
+
+

Recovery Email

+
+Kindly enter your email ID used for registration. The password reset link will be mailed to the same. +

+
+ {% csrf_token %} + {{ form.email.errors }} +

{{ form.email }}

+ + +
+ +
+ +
+
+
+{% endblock %} diff --git a/website/templates/registration/password_change_done.html b/website/templates/registration/password_change_done.html deleted file mode 100755 index 753daa5..0000000 --- a/website/templates/registration/password_change_done.html +++ /dev/null @@ -1,63 +0,0 @@ -{% extends 'base.html' %} -{% load static %} - - - - - Call for Proposal - - - - - - - - - - - {% block header %} - -{% endblock %} - -
- -{% block nav %} - - -{% endblock %} - - - -{% block content %} -
-
-
- - -

Your password has been changed successfully.

-

Redirecting ...

-
-
-
-{% endblock %} \ No newline at end of file diff --git a/website/templates/registration/password_change_form.html b/website/templates/registration/password_change_form.html deleted file mode 100755 index 61b4e6c..0000000 --- a/website/templates/registration/password_change_form.html +++ /dev/null @@ -1,64 +0,0 @@ -{% extends 'base.html' %} -{% load static %} - - - - - Call for Proposal - - - - - - - - - - - {% block header %} - -{% endblock %} - -
- -{% block nav %} - - -{% endblock %} - - - -{% block content %} -
-
-
-
- {% csrf_token %} -
- - {{ form }} -
-
-
-
-
-
-
-
-{% endblock %} diff --git a/website/templates/registration/password_reset_complete.html b/website/templates/registration/password_reset_complete.html deleted file mode 100755 index c2a765e..0000000 --- a/website/templates/registration/password_reset_complete.html +++ /dev/null @@ -1,56 +0,0 @@ -{% extends 'base.html' %} -{% load static %} - - - - - Call for Proposal - - - - - - - - - - - {% block header %} - -{% endblock %} - -
- -{% block nav %} - - -{% endblock %} - - - -{% block content %} -
-
-
-

Your password has been reset.

-

Log in

-
-
-
-{% endblock %} diff --git a/website/templates/registration/password_reset_confirm.html b/website/templates/registration/password_reset_confirm.html deleted file mode 100755 index 86d5cdb..0000000 --- a/website/templates/registration/password_reset_confirm.html +++ /dev/null @@ -1,106 +0,0 @@ -{% extends 'base.html' %} -{% load static %} - - - - - Call for Proposal - - - - - - - - - - - {% block header %} - -{% endblock %} - -
- -{% block nav %} - - -{% endblock %} - - - -{% block content %} -
-
-
- {% if validlink %} -
-

Please enter your new password twice. - So we can verify you typed it in correctly.

-
-
-
- -
- - - - - - - - - - - - -
-
{{ form.new_password1.errors }} - {{ form.new_password1 }}
{{ form.new_password2.errors }} - {{ form.new_password2 }}

-
-
- {% else %} -

Password reset unsuccessful

-

The password reset link was invalid,
- possibly because it has already been used.
- Please request a new password reset.

- {% endif %} -
-
-
- - -{% endblock %} diff --git a/website/templates/registration/password_reset_done.html b/website/templates/registration/password_reset_done.html deleted file mode 100755 index 64e28aa..0000000 --- a/website/templates/registration/password_reset_done.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends 'base.html' %} -{% load static %} - - - - - Call for Proposal - - - - - - - - - - - {% block header %} - -{% endblock %} - -
- -{% block nav %} - - -{% endblock %} - - - -{% block content %} -
-
-
- If an account exists with this email, you would receive the password reset instructions shortly. Please check your spam folder too. -
-
-
- {% endblock %} diff --git a/website/templates/registration/password_reset_form.html b/website/templates/registration/password_reset_form.html deleted file mode 100755 index 7f1d67c..0000000 --- a/website/templates/registration/password_reset_form.html +++ /dev/null @@ -1,69 +0,0 @@ -{% extends 'base.html' %} -{% load static %} - - - - - Call for Proposal - - - - - - - - - - - {% block header %} - -{% endblock %} - -
- -{% block nav %} - - -{% endblock %} - - - -{% block content %} -
-
-
-

Recovery Email

-
-Kindly Enter Your Email ID used for Registration. The password Reset link wll be mailed to the same. -

-
- {% csrf_token %} - {{ form.email.errors }} -

{{ form.email }}

- - -
- -
- -
-
-
-{% endblock %} -- cgit