summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xscipy2016/urls.py12
-rwxr-xr-xwebsite/templates/base.html6
-rwxr-xr-xwebsite/templates/register/password_change_done.html55
-rwxr-xr-xwebsite/templates/register/password_change_form.html (renamed from website/templates/registration/password_change_form.html)25
-rwxr-xr-xwebsite/templates/register/password_reset_complete.html (renamed from website/templates/registration/password_reset_complete.html)27
-rwxr-xr-xwebsite/templates/register/password_reset_confirm.html (renamed from website/templates/registration/password_reset_confirm.html)33
-rwxr-xr-xwebsite/templates/register/password_reset_done.html (renamed from website/templates/registration/password_reset_done.html)28
-rwxr-xr-xwebsite/templates/register/password_reset_form.html (renamed from website/templates/registration/password_reset_form.html)27
-rwxr-xr-xwebsite/templates/registration/password_change_done.html63
9 files changed, 120 insertions, 156 deletions
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<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
- 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 @@
</ul>
Visit SciPy.in/
- <!-- <a style="color:white;" href="">2009</a>/ -->
- <!-- <a style="color:white;" target="_blank" href="">2010</a>/ -->
- <!-- <a style="color:white;" target="_blank" href="">2011</a>/ -->
+ <a style="color:white;" href="http://scipy.in/2009">2009</a>/
+ <a style="color:white;" target="_blank" href="http://scipy.in/scipyin/2010/">2010</a>/
+ <a style="color:white;" target="_blank" href="http://scipy.in/scipyin/2011/">2011</a>/
<a style="color:white;" target="_blank" href="http://scipy.in/2012">2012</a>/
<a style="color:white;" target="_blank" href="http://scipy.in/2013" >2013</a>/
<a style="color:white;" target="_blank" href="http://scipy.in/2014">2014</a>/
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 %}
+
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Forgot Password</title>
+ <meta charset="utf-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <link rel="stylesheet" href="assets/css/main.css" />
+ </head>
+ <body>
+
+
+ {% block header %}
+ <header id="header1">
+ <h1>SciPy India 2016</h1>
+ <h2>Reset Password</h2>
+</header>
+{% endblock %}
+
+<div id="wrapper">
+
+{% block nav %}
+
+<div id="navbar-main">
+ <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="{% url 'website:home' %}" class="active">Home</a></li>
+ </ul>
+ </div>
+ </div>
+</div>
+{% endblock %}
+
+
+
+{% block content %}
+<div id="wrapper">
+<div id="main">
+<section id="content" class="main">
+
+<script type="text/javascript">
+ window.setTimeout(function()
+ {
+ location.href="{{ URL_ROOT }}/accounts/"
+ }, 2000);
+</script>
+<h3>Your password has been changed successfully.</h3>
+<h4>Redirecting ...</h4>
+</section>
+</div>
+</div>
+{% endblock %} \ No newline at end of file
diff --git a/website/templates/registration/password_change_form.html b/website/templates/register/password_change_form.html
index 61b4e6c..c3254ba 100755
--- a/website/templates/registration/password_change_form.html
+++ b/website/templates/register/password_change_form.html
@@ -16,7 +16,7 @@
{% block header %}
- <header id="header">
+ <header id="header1">
<h1>SciPy India 2016</h1>
<h2>Reset Password</h2>
</header>
@@ -26,20 +26,15 @@
{% block nav %}
- <nav id="nav" class="alt">
- <ul>
- <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li>
-
- {% if user and not user.is_anonymous %}
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
-
- </ul>
- {% endif %}
- </ul>
- </nav>
+<div id="navbar-main">
+ <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="{% url 'website:home' %}" class="active">Home</a></li>
+ </ul>
+ </div>
+ </div>
+</div>
{% endblock %}
diff --git a/website/templates/registration/password_reset_complete.html b/website/templates/register/password_reset_complete.html
index c2a765e..ef6496f 100755
--- a/website/templates/registration/password_reset_complete.html
+++ b/website/templates/register/password_reset_complete.html
@@ -16,7 +16,7 @@
{% block header %}
- <header id="header">
+ <header id="header1">
<h1>SciPy India 2016</h1>
<h2>Reset Password</h2>
</header>
@@ -26,20 +26,15 @@
{% block nav %}
- <nav id="nav" class="alt">
- <ul>
- <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li>
-
- {% if user and not user.is_anonymous %}
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
-
- </ul>
- {% endif %}
- </ul>
- </nav>
+<div id="navbar-main">
+ <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="{% url 'website:home' %}" class="active">Home</a></li>
+ </ul>
+ </div>
+ </div>
+</div>
{% endblock %}
@@ -49,7 +44,7 @@
<div id="main">
<section id="content" class="main">
<p>Your password has been reset. </p>
-<p><a href="{% url 'website:cfp' %}">Log in</a></p>
+<p>Please <a href="{% url 'website:cfp' %}">Log in</a> with your new password.</p>
</section>
</div>
</div>
diff --git a/website/templates/registration/password_reset_confirm.html b/website/templates/register/password_reset_confirm.html
index 86d5cdb..db880b7 100755
--- a/website/templates/registration/password_reset_confirm.html
+++ b/website/templates/register/password_reset_confirm.html
@@ -16,7 +16,7 @@
{% block header %}
- <header id="header">
+ <header id="header1">
<h1>SciPy India 2016</h1>
<h2>Reset Password</h2>
</header>
@@ -26,20 +26,15 @@
{% block nav %}
- <nav id="nav" class="alt">
- <ul>
- <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li>
-
- {% if user and not user.is_anonymous %}
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
-
- </ul>
- {% endif %}
- </ul>
- </nav>
+<div id="navbar-main">
+ <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="{% url 'website:home' %}" class="active">Home</a></li>
+ </ul>
+ </div>
+ </div>
+</div>
{% endblock %}
@@ -50,8 +45,7 @@
<section id="content" class="main">
{% if validlink %}
<br>
- <p>Please enter your new password twice.
- So we can verify you typed it in correctly.</p>
+ <p>Please enter your new password twice.</p>
<br>
<form action="" method="post">
<div style="display:none">
@@ -76,10 +70,9 @@
</table>
</form>
{% else %}
- <h1>Password reset unsuccessful</h1>
- <p>The password reset link was invalid, <br />
+ <p>The password reset link is invalid,
possibly because it has already been used. <br />
- Please request a new password reset.</p>
+ Please request a new password reset.</p><br/>
{% endif %}
</section>
</div>
diff --git a/website/templates/registration/password_reset_done.html b/website/templates/register/password_reset_done.html
index 64e28aa..723f43b 100755
--- a/website/templates/registration/password_reset_done.html
+++ b/website/templates/register/password_reset_done.html
@@ -16,7 +16,7 @@
{% block header %}
- <header id="header">
+ <header id="header1">
<h1>SciPy India 2016</h1>
<h2>Reset Password</h2>
</header>
@@ -26,29 +26,23 @@
{% block nav %}
- <nav id="nav" class="alt">
- <ul>
- <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li>
-
- {% if user and not user.is_anonymous %}
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
-
- </ul>
- {% endif %}
- </ul>
- </nav>
+<div id="navbar-main">
+ <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="{% url 'website:home' %}" class="active">Home</a></li>
+ </ul>
+ </div>
+ </div>
+</div>
{% endblock %}
-
{% block content %}
<div id="wrapper">
<div id="main">
<section id="content" class="main">
- If an account exists with this email, you would receive the password reset instructions shortly. Please check your spam folder too.
+ If an account exists with this email, you would receive the password reset instructions shortly. Please check your spam folder too.<br/>
</section>
</div>
</div>
diff --git a/website/templates/registration/password_reset_form.html b/website/templates/register/password_reset_form.html
index 7f1d67c..d2ac4f8 100755
--- a/website/templates/registration/password_reset_form.html
+++ b/website/templates/register/password_reset_form.html
@@ -16,7 +16,7 @@
{% block header %}
- <header id="header">
+ <header id="header1">
<h1>SciPy India 2016</h1>
<h2>Reset Password</h2>
</header>
@@ -26,20 +26,15 @@
{% block nav %}
- <nav id="nav" class="alt">
- <ul>
- <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li>
-
- {% if user and not user.is_anonymous %}
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
-
- </ul>
- {% endif %}
- </ul>
- </nav>
+<div id="navbar-main">
+ <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="{% url 'website:home' %}" class="active">Home</a></li>
+ </ul>
+ </div>
+ </div>
+</div>
{% endblock %}
@@ -50,7 +45,7 @@
<section id="content" class="main">
<div><h2> Recovery Email </h2></div>
<br>
-Kindly Enter Your Email ID used for Registration. The password Reset link wll be mailed to the same.
+Kindly enter your email ID used for registration. The password reset link will be mailed to the same.
<br> <br>
<form action="" method="post">
{% csrf_token %}
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 %}
-
-<!DOCTYPE HTML>
-<html>
- <head>
- <title>Call for Proposal</title>
- <meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1" />
- <!--[if lte IE 8]><script src="assets/js/ie/html5shiv.js"></script><![endif]-->
- <link rel="stylesheet" href="assets/css/main.css" />
- <!--[if lte IE 9]><link rel="stylesheet" href="assets/css/ie9.css" /><![endif]-->
- <!--[if lte IE 8]><link rel="stylesheet" href="assets/css/ie8.css" /><![endif]-->
- </head>
- <body>
-
-
- {% block header %}
- <header id="header">
- <h1>SciPy India 2016</h1>
- <h2>Reset Password</h2>
-</header>
-{% endblock %}
-
-<div id="wrapper">
-
-{% block nav %}
-
- <nav id="nav" class="alt">
- <ul>
- <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li>
-
- {% if user and not user.is_anonymous %}
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
-
- </ul>
- {% endif %}
- </ul>
- </nav>
-{% endblock %}
-
-
-
-{% block content %}
-<div id="wrapper">
-<div id="main">
-<section id="content" class="main">
-
-<script type="text/javascript">
- window.setTimeout(function()
- {
- location.href="{{ URL_ROOT }}/accounts/"
- }, 2000);
-</script>
-<h3>Your password has been changed successfully.</h3>
-<h4>Redirecting ...</h4>
-</section>
-</div>
-</div>
-{% endblock %} \ No newline at end of file
generated by cgit (git 2.34.1) at 2024-12-20 14:51:59 +0000