Merge branch 'master' of https://github.com/FOSSEE/nccps-2018

7 files changed, 24 insertions, 23 deletions

diff --git a/static/website/templates/login.html b/static/website/templates/login.html
index 65da512..2dd3418 100644
--- a/static/website/templates/login.html
+++ b/static/website/templates/login.html
@@ -20,7 +20,7 @@
                                 <a style="padding-right : 20px;" href="{% url 'website:user_register' %}" class="btn btn btn-primary">Create an Account
                                 </a>
                                 <br>
-                                <a href="/2018/forgotpassword/">Forgot Password?</a>
+                                <a href="/nccps-2018/forgotpassword/">Forgot Password?</a>
                             </form> 
                             </p>
                     </div>
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..b1eb62a 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> 
@@ -34,7 +34,7 @@
 <section id="content" class="main">
 <br>
 <p>Your password has been reset. </p>
-<p>Please <a href="{% url 'website:cfp' %}">Log in</a> with your new password.</p>
+<p>Please <a href="{% url 'auth:login' %}">Log in</a> with your new password.</p>
 </section>
 </div>
 </div>
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  %}