diff --git a/journals/utils.py b/journals/utils.py
index ccb5852064de8ae78db09de828d791749e7b5b0b..bda96d34647ef5620842afed9113749834afe348 100644
--- a/journals/utils.py
+++ b/journals/utils.py
@@ -21,7 +21,7 @@ class JournalUtils(object):
'\n\nhas been published online with reference '
+ cls.publication.citation() + '.'
'\n\nThe publication page is located at the permanent link '
- 'https://scipost.org/' + cls.publication.doi_string + '.'
+ 'https://scipost.org/' + cls.publication.doi_label + '.'
'\n\nTo facilitate dissemination of your paper, we greatly encourage '
'you to update the arXiv Journal-ref with this information.'
'\n\nWe warmly congratulate you on this achievement and thank you '
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 97119aa60fb3085746cf7d6bdbacf21f591e1c31..0fdefd67db08f4abf334fe25cb86c9b37b9239c1 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -337,7 +337,7 @@
{% include 'submissions/_refereeing_invitation_card_content.html' with invitation=task %}
</li>
{% empty %}
- <li class="list-group-item"><em>You do not have pending Refereering Tasks</em></li>
+ <li class="list-group-item"><em>You do not have any pending refereeing task</em></li>
{% endfor %}
</ul>
</div>
diff --git a/submissions/templates/submissions/refereeing_overview.html b/submissions/templates/submissions/refereeing_overview.html
index a7e09c540820a90a020a229f3f8bad204736186a..fcf452bd6193f3df996a4b2a08ccc0f1db01281b 100644
--- a/submissions/templates/submissions/refereeing_overview.html
+++ b/submissions/templates/submissions/refereeing_overview.html
@@ -31,12 +31,13 @@
<div class="card-block">
<h3><a href="{{ submission.get_absolute_url }}">{{ submission.title }}</a></h3>
<p>{{ submission.author_list }}</p>
+ <h4>Editor-in-charge: {{ submission.editor_in_charge }}</h4>
<h4>Refereeing deadline: {{ submission.reporting_deadline }}</h4>
<h4>Refereeing status summary:</h4>
{% include 'submissions/_submission_refereeing_status.html' with submission=submission %}
<h3 class="mb-2">Detail of refereeing invitations:</h3>
{% include 'submissions/_submission_refereeing_invitations.html' with submission=submission invitations=submission.referee_invitations.all %}
- <a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='StoE' %}">Send a communication to the Editor-in-charge</a>
+ <a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='StoE' %}" target="_blank">Send a communication to the Editor-in-charge</a>
</div>
</div>
</div>
diff --git a/submissions/utils.py b/submissions/utils.py
index cc2b18dc5187cead257b2f2b1f582963b3dca43c..d713236f3f2b66dab3fd04300962da4ece33e9a6 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -995,6 +995,13 @@ class SubmissionUtils(BaseMailUtil):
[cls._context['report'].submission.editor_in_charge.user.email],
'Report delivered')
+ @classmethod
+ def email_referee_report_delivered(cls):
+ """ Requires loading 'report' attribute. """
+ cls._send_mail(cls, 'report_delivered_referee',
+ [cls._context['report'].author.user.email],
+ 'Report delivered')
+
@classmethod
def acknowledge_report_email(cls):
""" Requires loading 'report' attribute. """
diff --git a/submissions/views.py b/submissions/views.py
index 387ac0debb92a8bfbbf80734ef0d87d1e22dd4e3..ce94d8f6cecd0b88133cd1c32a4914b707cbaeff 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1126,6 +1126,7 @@ def submit_report(request, arxiv_identifier_w_vn_nr):
author.save()
SubmissionUtils.load({'report': newreport}, request)
SubmissionUtils.email_EIC_report_delivered()
+ SubmissionUtils.email_referee_report_delivered()
# Why is this session update?
request.session['arxiv_identifier_w_vn_nr'] = arxiv_identifier_w_vn_nr
diff --git a/templates/email/referee_in_response_to_decision.html b/templates/email/referee_in_response_to_decision.html
index 4e3b8502223fa7402894ea9aa1f935c1923eeae8..bda9d8047d9b26663921017842aba421d7b75274 100644
--- a/templates/email/referee_in_response_to_decision.html
+++ b/templates/email/referee_in_response_to_decision.html
@@ -1,8 +1,9 @@
-Dear {{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}},\n\n
+Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},\n\n
-We hereby confirm your choice to {% if invitation.accepted %}accept{% else %}decline (due to reason: {{invitation.get_refusal_reason_display}}){% endif %} to referee Submission\n\n
+We hereby confirm your choice to {% if invitation.accepted %}accept{% else %}decline (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission\n\n
-{{invitation.submission.title}} by {{invitation.submission.author_list}}\n\n
+{{invitation.submission.title}}\n
+by {{ invitation.submission.author_list }}\n\n
{% if invitation.accepted %}
We will look forward to receiving your Report by the reporting deadline {{ invitation.submission.reporting_deadline|date:'Y-m-d' }}.\n\n
diff --git a/templates/email/referee_in_response_to_decision_html.html b/templates/email/referee_in_response_to_decision_html.html
index a03d4016d1c678f15ff31952e4213fbf2ad4ff24..b8363b5b524d6dae43ea5b8ac9d27cbc4325bff1 100644
--- a/templates/email/referee_in_response_to_decision_html.html
+++ b/templates/email/referee_in_response_to_decision_html.html
@@ -1,20 +1,23 @@
-<p>Dear {{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}},</p>
+<p>Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},</p>
<p>
- We hereby confirm your choice to {% if invitation.accepted %}accept{% else %}decline (due to reason: {{invitation.get_refusal_reason_display}}){% endif %} to referee Submission
+ We hereby confirm your choice to {% if invitation.accepted %}accept{% else %}decline (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission
</p>
<p>
- "{{invitation.submission.title}} by {{invitation.submission.author_list}}".
+ {{ invitation.submission.title }}
+ <br/>
+ by {{ invitation.submission.author_list }}.
</p>
<p>
{% if invitation.accepted %}
We will look forward to receiving your Report by the reporting deadline {{ invitation.submission.reporting_deadline|date:'Y-m-d' }}.
+ <br/>
Many thanks for your collaboration,
{% else %}
Nonetheless, we thank you very much for considering this refereeing invitation,
{% endif %}
- <br>The SciPost Team.
+ <br/>The SciPost Team.
</p>
{% include 'email/_footer.html' %}
diff --git a/templates/email/referee_response_to_EIC.html b/templates/email/referee_response_to_EIC.html
index ec83b01a926e698efba0718fa1048bee497fc25c..fdc5c1dc553aaf855fbb959bc1d9d1b62b861ede 100644
--- a/templates/email/referee_response_to_EIC.html
+++ b/templates/email/referee_response_to_EIC.html
@@ -1,8 +1,8 @@
-Dear {{invitation.submission.editor_in_charge.get_title_display}} {{invitation.submission.editor_in_charge.user.last_name}},\n\n
+Dear {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }},\n\n
-Referee {% if invitation.referee %}{{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}}{% else %}{{ invitation.title }} {{ invitation.first_name }} {{ invitation.last_name }}{% endif %} has {% if invitation.accepted %}accepted{% else %}declined (due to reason: {{invitation.get_refusal_reason_display}}){% endif %} to referee Submission\n\n
+Referee {% if invitation.referee %}{{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }}{% else %}{{ invitation.title }} {{ invitation.first_name }} {{ invitation.last_name }}{% endif %} has {% if invitation.accepted %}accepted{% else %}declined (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission\n\n
-{{invitation.submission.title}} by {{invitation.submission.author_list}}\n\n
+{{ invitation.submission.title }}\n by {{ invitation.submission.author_list }}\n\n
{% if not invitation.accepted %}
Please invite another referee from the Submission\'s editorial page at https://scipost.org{% url 'submissions:editorial_page' invitation.submission.arxiv_identifier_w_vn_nr %}.\n\n
diff --git a/templates/email/referee_response_to_EIC_html.html b/templates/email/referee_response_to_EIC_html.html
index 2b04551f5d7ca52e502fb3fc40a849a210f24702..f932f38e7a200cd79e0d2ee29674c205d365acd1 100644
--- a/templates/email/referee_response_to_EIC_html.html
+++ b/templates/email/referee_response_to_EIC_html.html
@@ -1,10 +1,12 @@
-<p>Dear {{invitation.submission.editor_in_charge.get_title_display}} {{invitation.submission.editor_in_charge.user.last_name}},</p>
+<p>Dear {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }},</p>
<p>
- Referee {% if invitation.referee %}{{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}}{% else %}{{ invitation.title }} {{ invitation.first_name }} {{ invitation.last_name }}{% endif %} has {% if invitation.accepted %}accepted{% else %}declined (due to reason: {{invitation.get_refusal_reason_display}}){% endif %} to referee Submission
+ Referee {% if invitation.referee %}{{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }}{% else %}{{ invitation.title }} {{ invitation.first_name }} {{ invitation.last_name }}{% endif %} has {% if invitation.accepted %}accepted{% else %}declined (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission
</p>
<p>
- "{{invitation.submission.title}} by {{invitation.submission.author_list}}".
+ {{ invitation.submission.title }}
+ <br/>
+ by {{ invitation.submission.author_list }}.
</p>
{% if not invitation.accepted %}
@@ -14,7 +16,7 @@
{% endif %}
<p>
- Many thanks for your collaboration,<br>
+ Many thanks for your collaboration,<br/>
The SciPost Team.
</p>
diff --git a/templates/email/report_delivered_eic.html b/templates/email/report_delivered_eic.html
index 2bd15d68d595c048d689f63b9fbde35408e68121..fe01130b3d6c39bc41a02242ebecfe67d395da0a 100644
--- a/templates/email/report_delivered_eic.html
+++ b/templates/email/report_delivered_eic.html
@@ -1,11 +1,13 @@
-Dear {{report.submission.editor_in_charge.get_title_display}} {{report.submission.editor_in_charge.user.last_name}},\n\n
+Dear {{ report.submission.editor_in_charge.get_title_display }} {{ report.submission.editor_in_charge.user.last_name }},\n\n
-Referee {{report.author.get_title_display}} {{report.author.user.last_name}} has delivered a Report for Submission "{{report.submission.title}} by {{report.submission.author_list}}".
+Referee {{ report.author.get_title_display }} {{ report.author.user.last_name }} has delivered a Report for Submission\n\n
+{{ report.submission.title }}\n
+by {{ report.submission.author_list }}.
\n\n
-Please vet this Report via your personal page under the Editorial Actions tab.\n
-https://scipost.org{% url 'scipost:personal_page' %}
-\n\n\n
+Please vet this Report via your personal page at
+https://scipost.org{% url 'scipost:personal_page' %}, under the Editorial Actions tab.\n
+\n\n
Many thanks in advance for your collaboration,\n
The SciPost Team.
diff --git a/templates/email/report_delivered_eic_html.html b/templates/email/report_delivered_eic_html.html
index f13181d938b77bb6ecd12fcbbfa27cd6ff41f9f4..11d7d9f82e48e1ca640829b453dd495d531c386f 100644
--- a/templates/email/report_delivered_eic_html.html
+++ b/templates/email/report_delivered_eic_html.html
@@ -1,10 +1,12 @@
-<p>Dear {{report.submission.editor_in_charge.get_title_display}} {{report.submission.editor_in_charge.user.last_name}},</p>
+<p>Dear {{ report.submission.editor_in_charge.get_title_display }} {{ report.submission.editor_in_charge.user.last_name }},</p>
<p>
- Referee {{report.author.get_title_display}} {{report.author.user.last_name}} has delivered a Report for Submission:
+ Referee {{ report.author.get_title_display }} {{ report.author.user.last_name }} has delivered a Report for Submission:
</p>
<p>
- "{{report.submission.title}} by {{report.submission.author_list}}"
+ {{report.submission.title}}
+ <br/>
+ by {{ report.submission.author_list }}.
</p>
<p>
Please vet this Report via your <a href="https://scipost.org{% url 'scipost:personal_page' %}">personal page</a> under the Editorial Actions tab.
diff --git a/templates/email/report_delivered_referee.html b/templates/email/report_delivered_referee.html
new file mode 100644
index 0000000000000000000000000000000000000000..ecff9be7a20b5597ccc9684b7d849915b8e7a610
--- /dev/null
+++ b/templates/email/report_delivered_referee.html
@@ -0,0 +1,11 @@
+Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }},\n\n
+
+We hereby confirm reception of your Report on Submission\n\n
+
+{{ report.submission.title }}\n
+by {{ report.submission.author_list }}.\n\n
+
+We are immensely grateful for your time and effort. Your Report will soon be vetted by the Submission's Editor-in-charge, at which point you will receive an email update from us.\n\n
+
+Many thanks again,\n
+The SciPost Team.
diff --git a/templates/email/report_delivered_referee_html.html b/templates/email/report_delivered_referee_html.html
new file mode 100644
index 0000000000000000000000000000000000000000..9e50b5f4b9c9063c83433de22bd000034faa27fd
--- /dev/null
+++ b/templates/email/report_delivered_referee_html.html
@@ -0,0 +1,21 @@
+<p>
+ Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }},
+</p>
+
+<p>We hereby confirm reception of your Report on Submission</p>
+
+<p>
+ {{ report.submission.title }}
+ <br/>
+ by {{ report.submission.author_list }}.
+</p>
+
+<p>
+ We are immensely grateful for your time and effort. Your Report will soon be vetted by the Submission's Editor-in-charge, at which point you will receive an email update from us.
+</p>
+
+<p>
+ Many thanks again,
+ <br/>
+ The SciPost Team.
+</p>