From e9a38c975e4f6aa9cf8418924b95717d9e6672af Mon Sep 17 00:00:00 2001 From: komalsheth286 Date: Fri, 30 Sep 2016 17:31:49 +0530 Subject: Home Page to be made live --- scipy2016/settings.py | 8 +++++++ website/templates/base.html | 17 ++++++++------- website/templates/cfp.html | 4 ++-- website/templates/view-abstracts.html | 4 ++-- website/views.py | 39 +++++++++++++++++++++++++++++++++-- 5 files changed, 58 insertions(+), 14 deletions(-) diff --git a/scipy2016/settings.py b/scipy2016/settings.py index 09c5e46..d3af3d3 100755 --- a/scipy2016/settings.py +++ b/scipy2016/settings.py @@ -153,3 +153,11 @@ MEDIA_URL = "/downloads/" LOGIN_REDIRECT_URL = '/cfp' # smtp + +ACCOUNT_ACTIVATION_DAYS = 7 +EMAIL_HOST = 'localhost' +EMAIL_PORT = 1025 +EMAIL_HOST_USER = '' +EMAIL_HOST_PASSWORD = '' +EMAIL_USE_TLS = False +DEFAULT_FROM_EMAIL = 'komal@gmail.com' \ No newline at end of file diff --git a/website/templates/base.html b/website/templates/base.html index 8bc660c..6fa6c88 100755 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -169,7 +169,7 @@ Accomodation

₹500

- Add Ons + Add On Accommodation is provided on a shared basis (twin sharing) inside IIT-B campus (Boys/Girls hostel). Accommodation will be provided for 2 days, i.e, 10-11 and 11-12 December. Accommodation does not include other amenities like dinner, etc. Extension of period of stay is not available. This is a non-refundable ticket. @@ -179,7 +179,7 @@ T-Shirt

₹350

- Add Ons + Add On Change of size, exchange at the venue is not available. This is a non-refundable ticket. @@ -192,7 +192,7 @@

@@ -203,7 +203,7 @@
-

CODE FOR CONDUCT

+

CODE OF CONDUCT

We appreciate your participation in SciPy 2016. We want you to have an enjoyable and enriching experience in the conference. For this all the attendees are required to conform to the following Code of Conduct. Organisers will ensure that it is enforced throughout the event.

@@ -248,7 +248,7 @@

If a participant engages in behavior that violates this code of conduct, the conference organizers may take any action they deem appropriate, including warning the offender or expulsion from the conference with no refund.

-

Thank you for helping to make SciPy India 2016 a welcoming, friendly event for all.

+

Thank you for helping to make SciPy India a welcoming, friendly event for all.

Contact Information:

@@ -427,9 +427,10 @@
    • - Visit SciPy.in/ 2009/ - 2010/ - 2011/ + Visit SciPy.in/ + + + 2012/ 2013/ 2014/ diff --git a/website/templates/cfp.html b/website/templates/cfp.html index f028086..2a0d1f4 100755 --- a/website/templates/cfp.html +++ b/website/templates/cfp.html @@ -71,11 +71,11 @@ {% if user.is_superuser %}
    View Proposals
    {% else %} - + > {% endif %} {% else %} diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html index b5804f1..aaf4fca 100755 --- a/website/templates/view-abstracts.html +++ b/website/templates/view-abstracts.html @@ -116,7 +116,7 @@ You have not submitted any proposal. To submit proposal click {{proposal.status}} {% elif proposal.status = 'Commented' %}
    {{proposal.status}}
    - {% elif proposal.status = 'Resubmit' %} + {% elif proposal.status = 'Edit' %} {% if user.is_superuser %}
    {{proposal.status}}
    {% else %} @@ -132,7 +132,7 @@ You have not submitted any proposal. To submit proposal click     -
    +
    diff --git a/website/views.py b/website/views.py index 2ae7684..e404929 100755 --- a/website/views.py +++ b/website/views.py @@ -465,7 +465,7 @@ def status(request, proposal_id= None): send_mail(subject, message, sender_email, to) context.update(csrf(request)) elif 'resubmit' in request.POST: - proposal.status="Resubmit" + proposal.status="Edit" proposal.save() sender_name = "SciPy India 2016" sender_email = "scipy@fossee.in" @@ -595,7 +595,42 @@ def status_change(request): delete_proposal = request.POST.getlist('delete_proposal') for proposal_id in delete_proposal: proposal = Proposal.objects.get(id = proposal_id) - proposal.status="Resubmit" + sender_name = "SciPy India 2016" + sender_email = "scipy@fossee.in" + to = (proposal.user.email, ) + if proposal.proposal_type == 'ABSTRACT': + subject = "SciPy India 216 - Talk Proposal Resumbmission" + message = """ + Dear {0},

    + Thank you for showing interest & submitting a talk proposal at SciPy India 2016 conference for the talk titled "{1}". You are requested to submit this talk proposal once again.
    + You will be notified regarding comments/selection/rejection of your talk/workshop via email. + Visit this     link to view comments on your submission.

    + Thank You !

    Regards,
    SciPy India 2016,
    FOSSEE - IIT Bombay. + """.format( + proposal.user.first_name, + proposal.title, + 'http://scipy.in/2016/view-abstracts/' + ) + elif proposal.proposal_type =='WORKSHOP': + subject = "SciPy India 216 - Workshop Proposal Resubmission" + message = """ + Thank you for showing interest & submitting a workshop proposal at SciPy India 2016 conference for the workshop titled "{1}". You are requested to submit this talk proposal once again.
    + You will be notified regarding comments/selection/rejection of your talk/workshop via email. + Visit this link to view comments on your submission.

    + Thank You !

    Regards,
    SciPy India 2016,
    FOSSEE - IIT Bombay. + """.format( + proposal.user.first_name, + proposal.title, + 'http://scipy.in/2016/view-abstracts/' + ) + email = EmailMultiAlternatives( + subject,'', + sender_email, to, + headers={"Content-type":"text/html;charset=iso-8859-1"} + ) + email.attach_alternative(message, "text/html") + email.send(fail_silently=True) + proposal.status="Edit" proposal.save() context.update(csrf(request)) proposals = Proposal.objects.all() -- cgit