Fixed merge conflict

5 files changed, 35 insertions, 33 deletions

diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index a96716b..461c5f5 100755
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -52,9 +52,9 @@
                 <h2><u>Important Dates</u></h2>
             </span>
             <ul>
-                <li>Call for proposals opens: <b>TBD</b></li>
-                <li>Last date for submission of proposals: <b>TBD</b></li>
-                <li>Announcement of selected proposals: <b>TBD</b></li>
+                <li>Call for proposals opens: <b>15 Sept. 2017</b></li>
+                <li>Last date for submission of proposals: <b>1st Nov. 2017</b></li>
+                <li>Announcement of selected proposals: <b>15 Nov. 2017</b></li>
             </ul>
             <br/>
             {% if user.is_superuser %}
@@ -97,9 +97,9 @@
                     <h2><u>Important Dates</u></h2>
                 
                 <ul>
-                    <li>Call for proposal opens: <b>TBD</b></li>
-                    <li>Last date for submission of proposals: <b>TBD</b></li>
-                    <li>Announcement of selected proposals: <b>TBD</b></li>
+                    <li>Call for proposals opens: <b>15 Sept. 2017</b></li>
+                <li>Last date for submission of proposals: <b>1st Nov. 2017</b></li>
+                <li>Announcement of selected proposals: <b>15 Nov. 2017</b></li>
                 </ul>
             </div>
             </div>
diff --git a/website/templates/footer.html b/website/templates/footer.html
index ab01f50..6470a6b 100644
--- a/website/templates/footer.html
+++ b/website/templates/footer.html
@@ -80,7 +80,7 @@
         var n2 = Math.round(Math.random() * 10 + 1);
         $("#a").val(n1 + " + " + n2 + " = ");
         var add = n1 + n2;
-        $("#b").on('change', function (){
+        $("#b").on('keyup', function (){
             if (this.value == add){
                  $('#myButton').removeAttr('disabled');
                  document.getElementById("error").innerHTML = "";    
diff --git a/website/templates/home.html b/website/templates/home.html
index 926bcdb..5688036 100644
--- a/website/templates/home.html
+++ b/website/templates/home.html
@@ -561,11 +561,12 @@
                 <hr>
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <form id="contact_us" action='#' class="form" role="form" method=POST  enctype="multipart/form-data">
+
+                        <form id="contact_us" action='#' class="form" role="form" method=POST onSubmit="alert('Thank you for your feedback.');" enctype="multipart/form-data" data-toggle="validator">
                             {% csrf_token %}
                             <div class="col-md-15 form-group">
-                                <input class="form-control" id="name" name="name" placeholder="Name" type="text" required />
-                            </div>
+                                <input class="form-control" id="name" name="name" placeholder="Name" type="text" data-minlength="6" required />
+</div>
                             <div class="col-md-15 form-group">
                                 <input class="form-control" id="email" name="email" placeholder="Email" type="email" required />
                             </div>
diff --git a/website/templates/navbar.html b/website/templates/navbar.html
index 426ca77..e181fb8 100644
--- a/website/templates/navbar.html
+++ b/website/templates/navbar.html
@@ -12,7 +12,7 @@
         <div class="collapse navbar-collapse" id="navbarResponsive">
             <ul class="navbar-nav">
                 <li class="nav-item">
-                    <a class="nav-link" href="#home" class="nav-link js-scroll-trigger" >
+                    <a class="nav-link" href="/#home" class="nav-link js-scroll-trigger" >
                         Home
                         <!--<span class="sr-only">(current)</span>-->
                     </a>
@@ -21,7 +21,7 @@
                     <a class="nav-link" href="#about" class="nav-link js-scroll-trigger" >About</a>
                     </li> -->
                 <li class="nav-item">
-                    <a class="nav-link" href="#speakers" class="nav-link js-scroll-trigger" >Speakers</a>
+                    <a class="nav-link" href="/#speakers" class="nav-link js-scroll-trigger" >Speakers</a>
                 </li>
                 <!--
                     <li class="nav-item">
@@ -34,13 +34,13 @@
                        <a class="nav-link" href="{% url 'website:cfp' %}">Submit</a>
                     </li> -->
                 <li class="nav-item">
-                    <a class="nav-link" href="#schedule" class="nav-link js-scroll-trigger" >Schedule</a>
+                    <a class="nav-link" href="/#schedule" class="nav-link js-scroll-trigger" >Schedule</a>
                 </li>
                 <!-- <li class="nav-item">
                     <a class="nav-link" href="#instructions" class="nav-link js-scroll-trigger" >Instructions</a>
                     </li> -->
                 <li class="nav-item">
-                    <a class="nav-link" href="#venue" class="nav-link js-scroll-trigger" >Venue</a>
+                    <a class="nav-link" href="/#venue" class="nav-link js-scroll-trigger" >Venue</a>
                 </li>
                 <!-- <li class="nav-item">
                     <a class="nav-link" href="#" class="nav-link js-scroll-trigger" >Satellite Conference</a>
@@ -49,7 +49,7 @@
                     <a class="nav-link" href="#gallery" class="nav-link js-scroll-trigger" >Gallery</a>
                     </li> -->
                 <li class="nav-item">
-                    <a class="nav-link" href="#contact" class="nav-link js-scroll-trigger" >Contact</a>
+                    <a class="nav-link" href="/#contact" class="nav-link js-scroll-trigger" >Contact</a>
                 </li>
             </ul>
             <ul class="navbar-nav" style="margin-left: auto;">
diff --git a/website/views.py b/website/views.py
index d000e73..bd96143 100755
--- a/website/views.py
+++ b/website/views.py
@@ -17,6 +17,7 @@ from django.db.models import F
 import csv
 from django.core.mail import EmailMultiAlternatives
 import os
+from scipy2017.local import SENDER_EMAIL
 
 from website.forms import ProposalForm, UserRegisterForm, UserLoginForm, WorkshopForm, ContactForm
 from website.models import Proposal, Comments, Ratings
@@ -157,9 +158,9 @@ def submitcfp(request):
                 data.save()
                 context['proposal_submit'] = True
                 sender_name = "SciPy India 2017"
-                sender_email = "scipy@fossee.in"
+                sender_email = SENDER_EMAIL
                 subject = "SciPy India 2017 – Talk Proposal Submission Acknowledgment"
-                to = (social_user.email, "scipy@fossee.in")
+                to = (social_user.email, SENDER_EMAIL)
                 message = """
                 Dear {0}, <br><br>
                 Thank you for showing interest & submitting a talk proposal at SciPy India 2017 conference for the talk titled <b>“{1}”</b>. Reviewal of the proposals will start once the CFP closes.
@@ -210,9 +211,9 @@ def submitcfw(request):
                 data.save()
                 context['proposal_submit'] = True
                 sender_name = "SciPy India 2017"
-                sender_email = "scipy@fossee.in"
+                sender_email = SENDER_EMAIL
                 subject = "SciPy India 2017 – Workshop Proposal Submission Acknowledgment"
-                to = (social_user.email, "scipy@fossee.in")
+                to = (social_user.email, SENDER_EMAIL)
                 message = """
                 Dear {0}, <br><br>
                 Thank you for showing interest & submitting a workshop proposal at SciPy India 2017 conference for the workshop titled <b>“{1}”</b>. Reviewal of the proposals will start once the CFP closes.
@@ -409,8 +410,8 @@ def comment_abstract(request, proposal_id = None):
                     comment.save()
                     comments = Comments.objects.filter(proposal=proposal)
                     sender_name = "SciPy India 2017"
-                    sender_email = "scipy@fossee.in"
-                    to = (proposal.user.email, "scipy@fossee.in" )
+                    sender_email = SENDER_EMAIL
+                    to = (proposal.user.email, SENDER_EMAIL )
                     if proposal.proposal_type == 'ABSTRACT':
                         subject = "SciPy India 2017 - Comment on Your talk Proposal"
                         message = """
@@ -483,8 +484,8 @@ def status(request, proposal_id= None):
                 proposal.status="Accepted"
                 proposal.save()
                 sender_name = "SciPy India 2017"
-                sender_email = "scipy@fossee.in"
-                to = (proposal.user.email, "scipy@fossee.in")
+                sender_email = SENDER_EMAIL
+                to = (proposal.user.email, SENDER_EMAIL)
                 if proposal.proposal_type == 'ABSTRACT':
                     subject = "SciPy India 2017 - Talk Proposal Accepted"
                     message = """Dear """+proposal.user.first_name+""",
@@ -501,8 +502,8 @@ def status(request, proposal_id= None):
                 proposal.status="Rejected"
                 proposal.save()
                 sender_name = "SciPy India 2017"
-                sender_email = "scipy@fossee.in"
-                to = (proposal.user.email,"scipy@fossee.in", )
+                sender_email = SENDER_EMAIL
+                to = (proposal.user.email,SENDER_EMAIL, )
                 if proposal.proposal_type == 'ABSTRACT':
                     subject = "SciPy India 2017 - Talk Proposal Rejected"
                     message = """Dear """+proposal.user.first_name+""",
@@ -518,9 +519,9 @@ def status(request, proposal_id= None):
                 send_mail(subject, message, sender_email, to)
                 context.update(csrf(request))  
             elif 'resubmit' in request.POST:
-                to = (proposal.user.email, "scipy@fossee.in" )
+                to = (proposal.user.email, SENDER_EMAIL )
                 sender_name = "SciPy India 2017"
-                sender_email = "scipy@fossee.in"
+                sender_email = SENDER_EMAIL
                 if proposal.proposal_type == 'ABSTRACT':
                     subject = "SciPy India 2017 - Talk Proposal Resumbmission"
                     message = """
@@ -646,8 +647,8 @@ def status_change(request):
                     proposal.status = "Accepted"
                     proposal.save()
                     sender_name = "SciPy India 2017"
-                    sender_email = "scipy@fossee.in"
-                    to = (proposal.user.email, "scipy@fossee.in")
+                    sender_email = SENDER_EMAIL
+                    to = (proposal.user.email, SENDER_EMAIL)
                     if proposal.proposal_type == 'ABSTRACT':
                         subject = "SciPy India 2017 - Talk Proposal Accepted"
                         message = """Dear """+proposal.user.first_name+""",
@@ -671,8 +672,8 @@ def status_change(request):
                     proposal.status="Rejected"
                     proposal.save()
                     sender_name = "SciPy India 2017"
-                    sender_email = "scipy@fossee.in"
-                    to = (proposal.user.email, "scipy@fossee.in")
+                    sender_email = SENDER_EMAIL
+                    to = (proposal.user.email, SENDER_EMAIL)
                     if proposal.proposal_type == 'ABSTRACT':
                         subject = "SciPy India 2017 - Talk Proposal Rejected"
                         message = """Dear """+proposal.user.first_name+""",
@@ -696,8 +697,8 @@ def status_change(request):
                 for proposal_id in delete_proposal:
                     proposal = Proposal.objects.get(id = proposal_id)
                     sender_name = "SciPy India 2017"
-                    sender_email = "scipy@fossee.in"
-                    to = (proposal.user.email, "scipy@fossee.in" )
+                    sender_email = SENDER_EMAIL
+                    to = (proposal.user.email, SENDER_EMAIL )
                     if proposal.proposal_type == 'ABSTRACT':
                         subject = "SciPy India 2017 - Talk Proposal Resumbmission"
                         message = """