From 5ddfdd9e2c09a8f66e350c272c93d4067b026329 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 22 Sep 2016 07:42:15 +0200
Subject: [PATCH] Little cleanup
---
journals/models.py | 2 +-
scipost/utils.py | 12 +++----
.../submissions/submission_detail.html | 2 +-
submissions/utils.py | 34 +++++++++----------
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/journals/models.py b/journals/models.py
index 40e8244ac..8be8e5913 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -257,7 +257,7 @@ class Publication(models.Model):
'</li>'
'<li><a href="#openModal">BiBTeX</a></li>'
'<li><a href="{% url \'submissions:submission\' arxiv_identifier_w_vn_nr='
- 'arxiv_identifier_w_vn_nr %}">Submission</a></li>'
+ 'arxiv_identifier_w_vn_nr %}">Submissions/Reports</a></li>'
'</ul><br/><hr class="hr6"/>'
'<h3>Abstract:</h3>'
'<p class="publicationAbstract">{{ abstract }}</p>'
diff --git a/scipost/utils.py b/scipost/utils.py
index 057a5eef5..1d7fda1ba 100644
--- a/scipost/utils.py
+++ b/scipost/utils.py
@@ -134,7 +134,7 @@ class Utils(object):
'last_name': cls.contributor.user.last_name,
'activation_key': cls.contributor.activation_key,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -334,7 +334,7 @@ class Utils(object):
'about SciPost, its principles, ideals and implementation can be found at '
'https://scipost.org/about and https://scipost.org/FAQ.</p>')
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -372,7 +372,7 @@ class Utils(object):
email_text += summary_text
email_text_html += summary_text_html
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -410,7 +410,7 @@ class Utils(object):
email_context['citation'] = cls.invitation.cited_in_publication.citation
email_text += summary_text
email_text_html += summary_text_html
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -431,7 +431,7 @@ class Utils(object):
'<pI would hereby like to quickly introduce '
'you to a scientific publishing initiative I recently launched, '
'called SciPost, and to invite you to become an active Contributor.</p>')
- email_text_html += summary_text_html + '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += summary_text_html + '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -590,7 +590,7 @@ class Utils(object):
'<br/>tel.: +31 (0)20 5255775\nfax: +31 (0)20 5255778'
'<br/>---------------------------------------------\n')
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 6122a406a..f6b946e2a 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -38,7 +38,7 @@
</div>
{% if other_versions %}
- <h3>Other versions of this Submission exist:</h3>
+ <h3>Other versions of this Submission (with Reports) exist:</h3>
<ul>
{% for vn in other_versions %}
{{ vn.version_info_as_li }}
diff --git a/submissions/utils.py b/submissions/utils.py
index 1630c2c26..a6cc87bca 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -74,7 +74,7 @@ class SubmissionUtils(object):
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -114,7 +114,7 @@ class SubmissionUtils(object):
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -168,7 +168,7 @@ class SubmissionUtils(object):
'sub_title': cls.assignment.submission.title,
'author_list': cls.assignment.submission.author_list,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -227,7 +227,7 @@ class SubmissionUtils(object):
'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
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -291,7 +291,7 @@ class SubmissionUtils(object):
'author_list': cls.submission.author_list,
'arxiv_identifier_w_vn_nr': cls.submission.arxiv_identifier_w_vn_nr,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
emailmessage = EmailMultiAlternatives(
@@ -344,7 +344,7 @@ class SubmissionUtils(object):
'deadline': datetime.datetime.strftime(cls.assignment.submission.reporting_deadline,
"%Y-%m-%d"),
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -390,7 +390,7 @@ class SubmissionUtils(object):
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -476,7 +476,7 @@ class SubmissionUtils(object):
'deadline': datetime.datetime.strftime(cls.invitation.submission.reporting_deadline,
"%Y-%m-%d"),
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -576,7 +576,7 @@ class SubmissionUtils(object):
"%Y-%m-%d"),
'invitation_key': cls.invitation.invitation_key,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -644,7 +644,7 @@ class SubmissionUtils(object):
'author_list': cls.invitation.submission.author_list,
'invitation_key': cls.invitation.invitation_key,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -706,7 +706,7 @@ class SubmissionUtils(object):
})
if cls.invitation.refusal_reason:
email_context['reason'] = assignment_refusal_reasons_dict[cls.invitation.refusal_reason]
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -752,7 +752,7 @@ class SubmissionUtils(object):
'sub_title': cls.report.submission.title,
'author_list': cls.report.submission.author_list,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -835,7 +835,7 @@ class SubmissionUtils(object):
})
if cls.report.status < 0:
email_context['refusal_reason'] = report_refusal_choices_dict[int(cls.report.status)]
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -879,7 +879,7 @@ class SubmissionUtils(object):
'author_list': cls.report.submission.author_list,
'arxiv_identifier_w_vn_nr': cls.report.submission.arxiv_identifier_w_vn_nr,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -923,7 +923,7 @@ class SubmissionUtils(object):
'author_list': cls.submission.author_list,
'arxiv_identifier_w_vn_nr': cls.submission.arxiv_identifier_w_vn_nr,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -1058,7 +1058,7 @@ class SubmissionUtils(object):
'author_list': cls.submission.author_list,
'arxiv_identifier_w_vn_nr': cls.submission.arxiv_identifier_w_vn_nr,
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
@@ -1142,7 +1142,7 @@ class SubmissionUtils(object):
'arxiv_identifier_w_vn_nr': cls.submission.arxiv_identifier_w_vn_nr,
'journal': journals_submit_dict[cls.submission.submitted_to_journal],
})
- email_text_html += '<br/><br/>' + EMAIL_FOOTER
+ email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
#emailmessage = EmailMessage(
--
GitLab