From fe2423840d49f02f1c0a898b82d3b4062a27fbfe Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 20 Sep 2016 21:49:12 +0200
Subject: [PATCH] Correct links de Jong and Essler; partial work on html emails
---
scipost/templates/scipost/about.html | 4 +-
scipost/utils.py | 50 ++++++++++++-----
submissions/utils.py | 83 ++++++++++++++++++++++++++--
3 files changed, 115 insertions(+), 22 deletions(-)
diff --git a/scipost/templates/scipost/about.html b/scipost/templates/scipost/about.html
index 70d2f1a78..0fe85e577 100644
--- a/scipost/templates/scipost/about.html
+++ b/scipost/templates/scipost/about.html
@@ -123,7 +123,7 @@
<ul>
<li>Prof. <a href="http://www.nwo.nl/en/about-nwo/organisation/governing+board/Jos+Engelen">J. J. Engelen</a><br/>(Chairman NWO;<br/> U. van Amsterdam)</li>
<li>Prof. <a href="https://www.asc.ox.ac.uk/person/18">P. Fendley</a><br/>(Oxford; <a href="https://www.asc.ox.ac.uk/all-souls-college-oxford">All Souls College</a>)</li>
- <li>Prof. <a href="www.ru.nl/highenergyphysics/ehep/persons/sijbrand_de_jong/">S. J. de Jong</a><br/>(Radboud Univ. Nijmegen,<br/>President CERN Council)</li>
+ <li>Prof. <a href="http://www.ru.nl/highenergyphysics/ehep/persons/sijbrand_de_jong/">S. J. de Jong</a><br/>(Radboud Univ. Nijmegen,<br/>President CERN Council)</li>
</ul>
</div>
<div class="flex-whitebox">
@@ -163,7 +163,7 @@
</div>
<div class="flex-whitebox">
<ul>
- <li>Prof. <a href="www-thphys.physics.ox.ac.uk/people/FabianEssler/">F. H. L. Essler</a><br/>(U. of Oxford)</li>
+ <li>Prof. <a href="http://www-thphys.physics.ox.ac.uk/people/FabianEssler/">F. H. L. Essler</a><br/>(U. of Oxford)</li>
<li>Prof. <a href="http://www.ms.unimelb.edu.au/~jdgier@unimelb/">J. de Gier</a><br/>(U. of Melbourne)</li>
<li>Prof. <a href="http://www.ens-lyon.fr/PHYSIQUE/presentation/annuaire/maillet-jean-michel">J.M. Maillet</a><br/>(ENS Lyon)</li>
<li>Prof. <a href="https://www.mpg.de/343435/physik_komplexer_systeme_wissM28">R. Moessner</a><br/>(MPIPKS Dresden)</li>
diff --git a/scipost/utils.py b/scipost/utils.py
index 586c271c2..567678d6a 100644
--- a/scipost/utils.py
+++ b/scipost/utils.py
@@ -118,13 +118,33 @@ class Utils(object):
' has been received. You now need to validate your email by visiting ' +
'this link within the next 48 hours: \n\n' + 'https://scipost.org/activation/' +
cls.contributor.activation_key +
- '\n\nYour registration will thereafter be vetted. Many thanks for your interest. \n\nThe SciPost Team.')
- emailmessage = EmailMessage(
+ '\n\nYour registration will thereafter be vetted. Many thanks for your interest.'
+ '\n\nThe SciPost Team.')
+ email_text_html = (
+ 'Dear {{ title }} {{ last_name }},<br/>'
+ '\n<p>Your request for registration to the SciPost publication portal'
+ ' has been received. You now need to validate your email by visiting ' +
+ 'this link within the next 48 hours:</p>'
+ '<p><a href="https://scipost.org/activation/{{ actiation_key }}">'
+ 'Activate your account</a></p>'
+ '\n<p>Your registration will thereafter be vetted. Many thanks for your interest.</p>'
+ '<p>The SciPost Team.</p>')
+ email_context = Context({
+ 'title': title_dict[cls.contributor.title],
+ 'last_name': cls.contributor.user.last_name,
+ 'activation_key': cls.contributor.activation_key,
+ })
+ email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ html_template = Template(email_text_html)
+ html_version = html_template.render(email_context)
+ #emailmessage = EmailMessage(
+ emailmessage = EmailMultiAlternatives(
'SciPost registration request received', email_text,
'SciPost registration <registration@scipost.org>',
[cls.contributor.user.email],
['registration@scipost.org'],
reply_to=['registration@scipost.org'])
+ emailmessage.attach_alternative(html_version, 'text/html')
emailmessage.send(fail_silently=False)
@@ -223,34 +243,34 @@ class Utils(object):
'\nfax: +31 (0)20 5255778\n---------------------------------------------')
summary_text_html = (
- '<br/><br/>In summary, SciPost.org is a publication portal managed by '
+ '\n<br/><p>In summary, SciPost.org is a publication portal managed by '
'professional scientists, offering (among others) high-quality '
'Open Access journals with innovative forms of refereeing, and a '
'means of commenting on all existing literature. SciPost is established as '
'a not-for-profit foundation devoted to serving the interests of the '
- 'international scientific community.\n'
- '<br/><br/>The site is anchored at <a href="https://scipost.org">scipost.org</a>. '
+ 'international scientific community.</p>'
+ '\n<p>The site is anchored at <a href="https://scipost.org">scipost.org</a>. '
'Many further details '
'about SciPost, its principles, ideals and implementation can be found at '
'the <a href="https://scipost.org/about">about</a> '
- 'and <a href="https://scipost.org/FAQ">FAQ</a> pages.'
- '<br/><br/>As a professional academic, you can register at the '
+ 'and <a href="https://scipost.org/FAQ">FAQ</a> pages.</p>'
+ '<p>As a professional academic, you can register at the '
'<a href="https://scipost.org/register">registration page</a>, '
'enabling you to contribute to the site\'s '
- 'contents, for example by offering submissions, reports and comments.\n'
- '<br/><br/>For your convenience, I have prepared a partly pre-filled '
+ 'contents, for example by offering submissions, reports and comments.</p>'
+ '\n<p>For your convenience, I have prepared a partly pre-filled '
'<a href="https://scipost.org/invitation/{{ invitation_key }}">registration form</a>'
' (you can in any case still register at the '
- '<a href="https://scipost.org/register">registration page</a>).<br/><br/>\n'
- 'If you do develop sympathy for the initiative, besides participating in the '
+ '<a href="https://scipost.org/register">registration page</a>).</p>'
+ '\n<p>If you do develop sympathy for the initiative, besides participating in the '
'online platform, I would be very grateful if you considered submitting a '
'publication to one of the journals within the near future, in order to help '
'establish their reputation. I\'ll also be looking forward to your reaction, '
'comments and suggestions about the initiative, which I hope you will find '
- 'useful to your work as a professional scientist.\n'
- '<br/><br/>Many thanks in advance for taking a few minutes to look into it,'
- '<br/><br/>On behalf of the SciPost Foundation,<br/><br/>'
- 'Prof. dr Jean-Sébastien Caux<br/>'
+ 'useful to your work as a professional scientist.</p>'
+ '\n<p>Many thanks in advance for taking a few minutes to look into it,</p>'
+ '<p>On behalf of the SciPost Foundation,</p>'
+ '<p>Prof. dr Jean-Sébastien Caux</p>'
'---------------------------------------------'
'<br/>Institute for Theoretical Physics'
'<br/>University of Amsterdam'
diff --git a/submissions/utils.py b/submissions/utils.py
index 14652908e..7a2bc034f 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -1,6 +1,7 @@
import datetime
-from django.core.mail import EmailMessage
+from django.core.mail import EmailMessage, EmailMultiAlternatives
+from django.template import Context, Template
from journals.models import journals_submit_dict
from scipost.models import title_dict
@@ -55,13 +56,35 @@ class SubmissionUtils(object):
'from your personal page https://scipost.org/personal_page.' +
'\n\nWith many thanks,' +
'\n\nThe SciPost Team.')
- emailmessage = EmailMessage(
+ email_text_html = (
+ 'Dear {{ title }} {{ last_name }},<br/>'
+ '<p>We have received your Submission to SciPost,</p>'
+ '<p>{{ sub_title }}</p>'
+ '<p>by {{ author_lit }}.</p>'
+ '<p>We will update you on the results of the pre-screening process '
+ 'within the next 5 working days.</p>'
+ '<p>You can track your Submission at any time '
+ 'from your <a href="https://scipost.org/personal_page">personal page</a>.</p>'
+ '<p>With many thanks,</p>'
+ '<p>The SciPost Team.</p>')
+ email_context = Context({
+ 'title': title_dict[cls.submission.submitted_by.title],
+ 'last_name': cls.submission.submitted_by.user.last_name,
+ 'sub_title': cls.submission.title,
+ 'author_list': cls.submission.author_list,
+ })
+ email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ html_template = Template(email_text_html)
+ html_version = html_template.render(email_context)
+ #emailmessage = EmailMessage(
+ emailmessage = EmailMultiAlternatives(
'SciPost: Submission received', email_text,
'SciPost Editorial Admin <submissions@scipost.org>',
[cls.submission.submitted_by.user.email, 'submissions@scipost.org'],
reply_to=['submissions@scipost.org'])
+ emailmessage.attach_alternative(html_version, 'text/html')
emailmessage.send(fail_silently=False)
-
+
@classmethod
def send_authors_resubmission_ack_email(cls):
@@ -74,11 +97,31 @@ class SubmissionUtils(object):
'from your personal page https://scipost.org/personal_page.' +
'\n\nWith many thanks,' +
'\n\nThe SciPost Team.')
- emailmessage = EmailMessage(
+ email_text_html = (
+ 'Dear {{ title }} {{ last_name}},<br/>'
+ '<p>We have received your Resubmission to SciPost,</p>'
+ '<p>{{ sub_title }}</p>'
+ '<p>by {{ author_list }}.</p>'
+ '<p>You can track your Submission at any time '
+ 'from your <a href="https://scipost.org/personal_page">personal page</a>.</p>'
+ '<p>With many thanks,</p>'
+ '<p>The SciPost Team</p>')
+ email_context = Context({
+ 'title': title_dict[cls.submission.submitted_by.title],
+ 'last_name': cls.submission.submitted_by.user.last_name,
+ 'sub_title': cls.submission.title,
+ 'author_list': cls.submission.author_list,
+ })
+ email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ html_template = Template(email_text_html)
+ html_version = html_template.render(email_context)
+ #emailmessage = EmailMessage(
+ emailmessage = EmailMultiAlternatives(
'SciPost: Resubmission received', email_text,
'SciPost Editorial Admin <submissions@scipost.org>',
[cls.submission.submitted_by.user.email, 'submissions@scipost.org'],
reply_to=['submissions@scipost.org'])
+ emailmessage.attach_alternative(html_version, 'text/html')
emailmessage.send(fail_silently=False)
@@ -102,12 +145,42 @@ class SubmissionUtils(object):
'https://scipost.org/EdCol_by-laws.'
'\n\nMany thanks in advance for your collaboration,'
'\n\nThe SciPost Team.')
- emailmessage = EmailMessage(
+ email_text_html = (
+ 'Dear {{ title }} {{ last_name }},<br/>'
+ '<p>Thank you for accepting to become Editor-in-charge '
+ 'of the SciPost Submission</p>'
+ '<p>{{ sub_title }}</p>'
+ '<p>by {{ author_list }}.</p>'
+ '<p>You can take your editorial actions from the '
+ '<a href="https://scipost.org/submission/editorial_page/'
+ '{{ arxiv_identifier_w_vn_nr }}">editorial page</a> '
+ '(also accessible from your '
+ '<a href="https://scipost.org/personal_page">personal page</a> '
+ 'under the Editorial Actions tab).</p>'
+ '<p>In particular, you should now invite at least 3 referees; you might want to '
+ 'make sure you are aware of the '
+ 'detailed procedure described in the '
+ 'a href="https://scipost.org/EdCol_by-laws">Editorial College by-laws</a>.</p>'
+ '<p>Many thanks in advance for your collaboration,</p>'
+ '<p>The SciPost Team.</p>')
+ email_context = Context({
+ 'title': title_dict[cls.assignment.to.title],
+ 'last_name': cls.assignment.to.user.last_name,
+ 'sub_title': cls.assignment.submission.title,
+ 'author_list': cls.assignment.submission.author_list,
+ 'arxiv_identifier_w_vn_nr': cls.assignment.submission.arxiv_identifier_w_vn_nr,
+ })
+ email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ html_template = Template(email_text_html)
+ html_version = html_template.render(email_context)
+ #emailmessage = EmailMessage(
+ emailmessage = EmailMultiAlternatives(
'SciPost: assignment as EIC', email_text,
'SciPost Editorial Admin <submissions@scipost.org>',
[cls.assignment.to.user.email],
['submissions@scipost.org'],
reply_to=['submissions@scipost.org'])
+ emailmessage.attach_alternative(html_version, 'text/html')
emailmessage.send(fail_silently=False)
--
GitLab