summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKomal Sheth2016-10-03 13:27:08 +0530
committerGitHub2016-10-03 13:27:08 +0530
commit97f241a5d2092a6a19278804a356172ff22df6d4 (patch)
tree214dfc2a85832ec8b68073794cbccb36e1435066
parent1e068f583fe75e212df108438227081295ba624e (diff)
parenta78f7e60e1f6eca111fe36d6a2fb26231bbc0634 (diff)
downloadSciPy2016-97f241a5d2092a6a19278804a356172ff22df6d4.tar.gz
SciPy2016-97f241a5d2092a6a19278804a356172ff22df6d4.tar.bz2
SciPy2016-97f241a5d2092a6a19278804a356172ff22df6d4.zip
Merge pull request #11 from FOSSEE/Home_page
Change in Email Template
Diffstat
-rwxr-xr-xwebsite/templates/base.html2
-rwxr-xr-xwebsite/templates/view-abstracts.html6
-rwxr-xr-xwebsite/views.py45
3 files changed, 28 insertions, 25 deletions
diff --git a/website/templates/base.html b/website/templates/base.html
index 6fa6c88..18464a5 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -150,7 +150,7 @@
<h9 style="color:white;">(Till 30 Nov 2016)</h9>
</td>
<td>
- This Ticket allows you to ONLY attend the conference for 2 Days (snacks and dinner for the first day will be served). Does not include any conference amenities (Accommodation, Kit, Lunch, Dinner & T-shirt). This is a non-refundable ticket.
+ This Ticket allows you to ONLY attend the conference for 2 Days (snacks for two days will be served). Does not include any conference amenities (Accommodation, Lunch, Dinner & T-shirt).This is a non-refundable ticket.
</td>
diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html
index aaf4fca..c1f6968 100755
--- a/website/templates/view-abstracts.html
+++ b/website/templates/view-abstracts.html
@@ -88,7 +88,7 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
{% if not user.is_superuser %}
<th> View
{% endif %}
- <th> Comments
+ <th> Ratings
<th> Status
{% for proposal in proposals %}
<tr>
@@ -107,7 +107,9 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
<td style="white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:.5px;"> {{proposal.title}}</td>
<td ><a href="{% url 'website:abstract_details' proposal.id %}">View</a> </td>
{% endif %}
- <td><center> {{ proposal.comments_set.count }} </center></td>
+ <td>{{proposal.rating}}
+
+ <!-- <center> {{ proposal.comments_set.count }} </center> --></td>
<td>
{% if proposal.status = 'Accepted' %}
diff --git a/website/views.py b/website/views.py
index 559b30b..e889798 100755
--- a/website/views.py
+++ b/website/views.py
@@ -152,16 +152,16 @@ def submitcfp(request):
sender_name = "SciPy India 2016"
sender_email = "scipy@fossee.in"
subject = "SciPy India 2016 – Talk Proposal Submission Acknowledgment"
- to = (social_user.email, )
+ to = (social_user.email, "scipy@fossee.in")
message = """
Dear {0}, <br><br>
Thank you for showing interest & submitting a talk proposal at SciPy India 2016 conference for the talk titled “{1}”. Reviewal of the proposals will start once the CFP closes.
<br><br>You will be notified regarding comments/selection/rejection of your talk via email.
- Visit this <a href = “http://scipy.in/2016/view-abstracts/”>link </a> to view status of your submission.
+ Visit this <html><body><a herf = 'http://scipy.in/2016/view-abstracts/'> link </a></html></body> to view status of your submission.
Thank You ! <br><br>Regards,<br>SciPy India 2016,<br>FOSSEE - IIT Bombay.
""".format(
social_user.first_name,
- request.POST['title'] )
+ request.POST['title'], )
email = EmailMultiAlternatives(
subject,'',
sender_email, to,
@@ -201,16 +201,17 @@ def submitcfw(request):
sender_name = "SciPy India 2016"
sender_email = "scipy@fossee.in"
subject = "SciPy India 2016 – Workshop Proposal Submission Acknowledgment"
- to = (social_user.email, )
+ to = (social_user.email, "scipy@fossee.in")
message = """
Dear {0}, <br><br>
Thank you for showing interest & submitting a workshop proposal at SciPy India 2016 conference for the workshop titled “{1}”. Reviewal of the proposals will start once the CFP closes.
<br><br>You will be notified regarding comments/selection/rejection of your workshop via email.
- Visit this <a href = “http://scipy.in/2016/view-abstracts/”>link </a> to view status of your submission.
+ Visit this <a href = {2}>link </a> to view status of your submission.
Thank You ! <br><br>Regards,<br>SciPy India 2016,<br>FOSSEE - IIT Bombay.
""".format(
social_user.first_name,
- request.POST['title'] )
+ request.POST['title']
+ 'http://scipy.in/2016/view-abstracts/', )
email = EmailMultiAlternatives(
subject,'',
sender_email, to,
@@ -362,14 +363,14 @@ def comment_abstract(request, proposal_id = None):
comments = Comments.objects.filter(proposal=proposal)
sender_name = "SciPy India 2016"
sender_email = "scipy@fossee.in"
- to = (proposal.user.email, )
+ to = (proposal.user.email, "scipy@fossee.in" )
if proposal.proposal_type == 'ABSTRACT':
subject = "SciPy India 216 - Comment on Your talk Proposal"
message = """
Dear {0}, <br><br>
There is a comment posted on your proposal for the talk titled {1}.<br>
Once we receive your response, you will be notified regarding further comments/acceptance/ rejection of your talk/workshop via email.
- Visit this <a herf = "{2}"> link </a>to view comments on your submission.<br><br>
+ Visit this link {2} to view comments on your submission.<br><br>
Thank You ! <br><br>Regards,<br>SciPy India 2016,<br>FOSSEE - IIT Bombay.
""".format(
proposal.user.first_name,
@@ -431,16 +432,16 @@ def status(request, proposal_id= None):
proposal.save()
sender_name = "SciPy India 2016"
sender_email = "scipy@fossee.in"
- to = (proposal.user.email, )
+ to = (proposal.user.email, "scipy@fossee.in")
if proposal.proposal_type == 'ABSTRACT':
subject = "SciPy India 2016 - Talk Proposal Accepted"
message = """Dear """+proposal.user.first_name+""",
- Congratulations. Your proposal for the talk titled '"""+ proposal.title+ """'is accepted.
+ Congratulations. Your proposal for the talk titled '"""+ proposal.title+ """' is accepted.
You shall present the talk at the conference.\n\nYou will be notified regarding instructions of your talk via email.\n\nThank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay"""
elif proposal.proposal_type == 'WORKSHOP':
subject = "SciPy India 2016 - Workshop Proposal Accepted"
message = """Dear """+proposal.user.first_name+""",
- Congratulations. Your proposal for the workshop titled '"""+ proposal.title+ """'is accepted.
+ Congratulations. Your proposal for the workshop titled '"""+ proposal.title+ """' is accepted.
You shall conduct the workshop at the conference.\n\nYou will be notified regarding instructions of your workshop via email.\n\nThank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay"""
send_mail(subject, message, sender_email, to)
context.update(csrf(request))
@@ -449,18 +450,18 @@ def status(request, proposal_id= None):
proposal.save()
sender_name = "SciPy India 2016"
sender_email = "scipy@fossee.in"
- to = (proposal.user.email, )
+ to = (proposal.user.email,"scipy@fossee.in", )
if proposal.proposal_type == 'ABSTRACT':
subject = "SciPy India 2016 - Talk Proposal Rejected"
message = """Dear """+proposal.user.first_name+""",
- We regret to inform you that your proposal for the talk titled '"""+ proposal.title+ """'as not been shortlisted.<br>
- You may register and attend the conference by clicking <a herf=""http://scipyindia2016.doattend.com/> here</a>
+ We regret to inform you that your proposal for the talk titled '"""+ proposal.title+ """' as not been shortlisted.<br>
+ You may register and attend the conference by clicking <a herf= http://scipyindia2016.doattend.com/> here</a>
\n\nThank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay"""
elif proposal.proposal_type == 'WORKSHOP':
subject = "SciPy India 2016 - Workshop Proposal Rejected"
message = """Dear """+proposal.user.first_name+""",
- We regret to inform you that your proposal for the workshop titled '"""+ proposal.title+ """'as not been shortlisted.<br>
- You may register and attend the conference by clicking <a herf=""http://scipyindia2016.doattend.com/> here</a>
+ We regret to inform you that your proposal for the workshop titled '"""+ proposal.title+ """' as not been shortlisted.<br>
+ You may register and attend the conference by clicking <a herf= http://scipyindia2016.doattend.com/> here</a>
\n\n Thank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay"""
send_mail(subject, message, sender_email, to)
context.update(csrf(request))
@@ -470,7 +471,7 @@ def status(request, proposal_id= None):
sender_name = "SciPy India 2016"
sender_email = "scipy@fossee.in"
subject = "SciPy India - Resubmit"
- to = (proposal.user.email, )
+ to = (proposal.user.email, "scipy@fossee.in")
message = """Dear """+proposal.user.first_name+""",\n\nThank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay"""
send_mail(subject, message, sender_email, to)
context.update(csrf(request))
@@ -547,7 +548,7 @@ def status_change(request):
proposal.save()
sender_name = "SciPy India 2016"
sender_email = "scipy@fossee.in"
- to = (proposal.user.email, )
+ to = (proposal.user.email, "scipy@fossee.in")
if proposal.proposal_type == 'ABSTRACT':
subject = "SciPy India 2016 - Talk Proposal Accepted"
message = """Dear """+proposal.user.first_name+""",
@@ -572,18 +573,18 @@ def status_change(request):
proposal.save()
sender_name = "SciPy India 2016"
sender_email = "scipy@fossee.in"
- to = (proposal.user.email, )
+ to = (proposal.user.email, "scipy@fossee.in")
if proposal.proposal_type == 'ABSTRACT':
subject = "SciPy India 2016 - Talk Proposal Rejected"
message = """Dear """+proposal.user.first_name+""",
We regret to inform you that your proposal for the talk titled '"""+ proposal.title+ """'as not been shortlisted.<br>
- You may register and attend the conference by clicking <a herf=""http://scipyindia2016.doattend.com/> here</a>
+ You may register and attend the conference by clicking http://scipyindia2016.doattend.com/
\n\nThank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay"""
elif proposal.proposal_type == 'WORKSHOP':
subject = "SciPy India 2016 - Workshop Proposal Rejected"
message = """Dear """+proposal.user.first_name+""",
We regret to inform you that your proposal for the workshop titled '"""+ proposal.title+ """'as not been shortlisted.<br>
- You may register and attend the conference by clicking <a herf=""http://scipyindia2016.doattend.com/> here</a>
+ You may register and attend the conference by clicking http://scipyindia2016.doattend.com/
\n\n Thank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay"""
send_mail(subject, message, sender_email, to)
context.update(csrf(request))
@@ -597,7 +598,7 @@ def status_change(request):
proposal = Proposal.objects.get(id = proposal_id)
sender_name = "SciPy India 2016"
sender_email = "scipy@fossee.in"
- to = (proposal.user.email, )
+ to = (proposal.user.email, "scipy@fossee.in" )
if proposal.proposal_type == 'ABSTRACT':
subject = "SciPy India 216 - Talk Proposal Resumbmission"
message = """
generated by cgit (git 2.34.1) at 2024-12-20 08:51:03 +0000