From 93547abe1ec141ad6fdb19ec080b44828dd7986e Mon Sep 17 00:00:00 2001
From: Sashi20
Date: Mon, 24 Sep 2018 12:01:35 +0530
Subject: Modified links for forgot password and added BCC email in paper
 submission acknowledgement email

---
 nccps2018/urls.py                                            | 12 ++++++------
 .../website/templates/registration/password_change_done.html |  8 ++++----
 .../website/templates/registration/password_change_form.html |  8 ++++----
 .../templates/registration/password_reset_complete.html      |  8 ++++----
 .../templates/registration/password_reset_confirm.html       |  8 ++++----
 .../website/templates/registration/password_reset_done.html  |  9 +++++----
 static/website/templates/view-proposals.html                 |  2 +-
 website/views.py                                             |  4 ++--
 8 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/nccps2018/urls.py b/nccps2018/urls.py
index a688f8b..8cbd91a 100644
--- a/nccps2018/urls.py
+++ b/nccps2018/urls.py
@@ -26,16 +26,16 @@ urlpatterns = [
 
     re_path(r'^', include('social.apps.django_app.urls', namespace='social')),
 
-    re_path(r'^forgotpassword/$', auth_views.PasswordResetView.as_view(
+    re_path(r'^nccps-2018/forgotpassword/$', auth_views.PasswordResetView.as_view(
         template_name='registration/password_reset_form.html'), name="password_reset"),
-    re_path(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', auth_views.PasswordResetConfirmView.as_view(
+    re_path(r'^nccps-2018/password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', auth_views.PasswordResetConfirmView.as_view(
         template_name='registration/password_reset_confirm.html'), name='password_reset_confirm'),
-    re_path(r'^password_reset/mail_sent/$', auth_views.PasswordResetDoneView.as_view(template_name='registration/password_reset_done.html'),
+    re_path(r'^nccps-2018/password_reset/mail_sent/$', auth_views.PasswordResetDoneView.as_view(template_name='registration/password_reset_done.html'),
             name='password_reset_done'),
-    re_path(r'^password_reset/complete/$', auth_views.PasswordResetCompleteView.as_view(template_name='registration/password_reset_complete.html'),
+    re_path(r'^nccps-2018/password_reset/complete/$', auth_views.PasswordResetCompleteView.as_view(template_name='registration/password_reset_complete.html'),
             name='password_reset_complete'),
-    re_path(r'^changepassword/$', auth_views.PasswordChangeView.as_view(template_name='registration/password_change_form.html'),
+    re_path(r'^nccps-2018/changepassword/$', auth_views.PasswordChangeView.as_view(template_name='registration/password_change_form.html'),
             name='password_change'),
-    re_path(r'^password_change/done/$', auth_views.PasswordChangeDoneView.as_view(template_name='registration/password_change_done.html'),
+    re_path(r'^nccps-2018/password_change/done/$', auth_views.PasswordChangeDoneView.as_view(template_name='registration/password_change_done.html'),
             name='password_change_done'),
 ]
\ No newline at end of file
diff --git a/static/website/templates/registration/password_change_done.html b/static/website/templates/registration/password_change_done.html
index 67fd9a6..118a40c 100755
--- a/static/website/templates/registration/password_change_done.html
+++ b/static/website/templates/registration/password_change_done.html
@@ -8,8 +8,8 @@
       <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
       <meta name="description" content="">
       <meta name="author" content="">
-      <link rel="icon" href="{% static 'img/fevicon.png'%}" type="icon">
-      <title>SciPy India 2017</title>
+      <link rel="icon" href="{% static 'website/bootstrap-css/assets/images/favicon.png' %}" type="icon">
+      <title>NCCPS 2018</title>
       <!-- Bootstrap core CSS -->
       <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
       <link href="{% static 'vendor/bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
@@ -20,9 +20,9 @@
 
 
       {% block header %}
-       <header id="header1" style="background-color: #01c3d9;">
+       <header id="header1" style="background-color: #b3a366;">
         <center>
-            <h1>SciPy India 2017</h1>
+            <h1>NCCPS 2018</h1>
             <h2>Reset Password</h2>
         </center>
        </header> 
diff --git a/static/website/templates/registration/password_change_form.html b/static/website/templates/registration/password_change_form.html
index a27c585..b6d5404 100755
--- a/static/website/templates/registration/password_change_form.html
+++ b/static/website/templates/registration/password_change_form.html
@@ -8,8 +8,8 @@
       <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
       <meta name="description" content="">
       <meta name="author" content="">
-      <link rel="icon" href="{% static 'img/fevicon.png'%}" type="icon">
-      <title>SciPy India 2017</title>
+      <link rel="icon" href="{% static 'website/bootstrap-css/assets/images/favicon.png' %}" type="icon">
+      <title>NCCPS 2018</title>
       <!-- Bootstrap core CSS -->
       <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
       <link href="{% static 'vendor/bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
@@ -20,9 +20,9 @@
 
 
       {% block header %}
-       <header id="header1" style="background-color: #01c3d9;">
+       <header id="header1" style="background-color: #b3a366;">
         <center>
-            <h1>SciPy India 2017</h1>
+            <h1>NCCPS 2018</h1>
             <h2>Reset Password</h2>
         </center>
 </header> 
diff --git a/static/website/templates/registration/password_reset_complete.html b/static/website/templates/registration/password_reset_complete.html
index b8a6131..3a9b023 100755
--- a/static/website/templates/registration/password_reset_complete.html
+++ b/static/website/templates/registration/password_reset_complete.html
@@ -8,8 +8,8 @@
       <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
       <meta name="description" content="">
       <meta name="author" content="">
-      <link rel="icon" href="{% static 'img/fevicon.png'%}" type="icon">
-      <title>SciPy India 2017</title>
+      <link rel="icon" href="{% static 'website/bootstrap-css/assets/images/favicon.png' %}" type="icon">
+      <title>NCCPS 2018</title>
       <!-- Bootstrap core CSS -->
       <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
       <link href="{% static 'vendor/bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
@@ -20,9 +20,9 @@
 
 
       {% block header %}
-       <header id="header1" style="background-color: #01c3d9;">
+       <header id="header1" style="background-color: #b3a366;">
         <center>
-            <h1>SciPy India 2017</h1>
+            <h1>NCCPS 2018</h1>
             <h2>Reset Password</h2>
         </center>
         </header> 
diff --git a/static/website/templates/registration/password_reset_confirm.html b/static/website/templates/registration/password_reset_confirm.html
index 895e30d..df64ac6 100755
--- a/static/website/templates/registration/password_reset_confirm.html
+++ b/static/website/templates/registration/password_reset_confirm.html
@@ -7,8 +7,8 @@
       <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
       <meta name="description" content="">
       <meta name="author" content="">
-      <link rel="icon" href="{% static 'img/fevicon.png'%}" type="icon">
-      <title>SciPy India 2017</title>
+      <link rel="icon" href="{% static 'website/bootstrap-css/assets/images/favicon.png' %}" type="icon">
+      <title>NCCPS 2018</title>
       <!-- Bootstrap core CSS -->
       <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
       <link href="{% static 'vendor/bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
@@ -19,9 +19,9 @@
 
 
       {% block header %}
-       <header id="header1" style="background-color: #01c3d9;">
+       <header id="header1" style="background-color: #b3a366;">
        <center>
-            <h1>SciPy India 2017</h1>
+            <h1>NCCPS 2018</h1>
             <h2>Reset Password</h2>
        </center>
        </header> 
diff --git a/static/website/templates/registration/password_reset_done.html b/static/website/templates/registration/password_reset_done.html
index e161e5e..0188162 100755
--- a/static/website/templates/registration/password_reset_done.html
+++ b/static/website/templates/registration/password_reset_done.html
@@ -1,3 +1,4 @@
+
 {% load static %}
 
 <!DOCTYPE HTML>
@@ -7,8 +8,8 @@
       <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
       <meta name="description" content="">
       <meta name="author" content="">
-      <link rel="icon" href="{% static 'img/fevicon.png'%}" type="icon">
-      <title>SciPy India 2017</title>
+      <link rel="icon" href="{% static 'website/bootstrap-css/assets/images/favicon.png' %}" type="icon">
+      <title>NCCPS 2018</title>
       <!-- Bootstrap core CSS -->
       <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
       <link href="{% static 'vendor/bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
@@ -19,9 +20,9 @@
 
 <center>
       {% block header %}
-       <header id="header1"  style="background-color: #01c3d9;">
+       <header id="header1"  style="background-color: #b3a366;">
        <br>
-            <h1>SciPy India 2017</h1>
+            <h1>NCCPS 2018</h1>
             <h2>Reset Password</h2>
             <br>
 </header>
diff --git a/static/website/templates/view-proposals.html b/static/website/templates/view-proposals.html
index f2b1f64..269690e 100755
--- a/static/website/templates/view-proposals.html
+++ b/static/website/templates/view-proposals.html
@@ -17,7 +17,7 @@
             {% if not proposals %}
             <center>
                 <h3>You have not submitted any paper.</h3>
-
+                <a href="{% url 'website:proposal' %}" class="btn btn-primary">Back</a>
             </center>
             {% else %}
             {% if user.is_superuser  %}
diff --git a/website/views.py b/website/views.py
index 71c8f8f..3238837 100644
--- a/website/views.py
+++ b/website/views.py
@@ -224,11 +224,11 @@ def submitcfp(request):
                 sender_name = "NCCPS 2018"
                 sender_email = TO_EMAIL
                 subject = "NCCPS 2018 – Paper Submission Acknowledgement "
-                to = (social_user.email, TO_EMAIL)
+                to = (social_user.email, TO_EMAIL, BCC_EMAIL)
                 message = """
                 Dear {0}, <br><br>
                 Thank you for showing interest & submitting a paper proposal at NCCPS-2018 
-                for the paper titled “test title paper”. Reviewal of the proposals will start 
+                for the paper titled {1}. Reviewal of the proposals will start 
                 once the CFP closes.
                 You will be notified regarding comments/selection/rejection of your paper via email. 
                 Visit this {2} link to view the status of your submission.
-- 
cgit