diff --git a/comments/templates/comments/_comment_identifier.html b/comments/templates/comments/_comment_identifier.html
index 3407a7c0bdd69ec7dc9a6b8b613de50112a87dd9..f30c460f3925344561cf1272f2c3c705523c92c9 100644
--- a/comments/templates/comments/_comment_identifier.html
+++ b/comments/templates/comments/_comment_identifier.html
@@ -11,20 +11,21 @@
{% endblock comment_author %}
on {{comment.date_submitted|date:'Y-m-d'}}
</h3>
- <h4>
- {% if comment.in_reply_to_comment %}
- (in reply to <a href="#comment_id{{comment.in_reply_to_comment.id}}">{{comment.in_reply_to_comment.comment.get_author_str}}</a> on {{comment.in_reply_to_comment.date_submitted|date:'Y-m-d'}})
- {% elif comment.in_reply_to_report %}
- (in reply to <a href="#report_id{{comment.in_reply_to_report.id}}">
+ {% if comment.in_reply_to_comment or comment.in_reply_to_report %}
+ <h4>
+ {% if comment.in_reply_to_comment %}
+ (in reply to <a href="#comment_id{{comment.in_reply_to_comment.id}}">{{comment.in_reply_to_comment.comment.get_author_str}}</a> on {{comment.in_reply_to_comment.date_submitted|date:'Y-m-d'}})
+ {% elif comment.in_reply_to_report %}
+ (in reply to <a href="#report_id{{comment.in_reply_to_report.id}}">
- {% if not comment.in_reply_to_report.anonymous %}
- {{comment.in_reply_to_report.get_author_str}}
- {% else %}
- Report {{comment.in_reply_to_report.id}}
- {% endif %}
+ {% if not comment.in_reply_to_report.anonymous %}
+ {{comment.in_reply_to_report.get_author_str}}
+ {% else %}
+ Report {{comment.in_reply_to_report.id}}
+ {% endif %}
- </a> on {{comment.in_reply_to_report.date_submitted|date:'Y-m-d'}})
- {% endif %}
-
- </h4>
+ </a> on {{comment.in_reply_to_report.date_submitted|date:'Y-m-d'}})
+ {% endif %}
+ </h4>
+ {% endif %}
</div>
diff --git a/journals/behaviors.py b/journals/behaviors.py
new file mode 100644
index 0000000000000000000000000000000000000000..eca874354c8a6458dd3fa6804c38f7770c65e2a7
--- /dev/null
+++ b/journals/behaviors.py
@@ -0,0 +1,12 @@
+from django.core.validators import RegexValidator
+
+doi_journal_validator = RegexValidator(r'^[a-zA-Z]+$',
+ 'Only valid DOI expressions are allowed ([a-zA-Z]+).')
+doi_volume_validator = RegexValidator(r'^[a-zA-Z]+.[0-9]+$',
+ 'Only valid DOI expressions are allowed ([a-zA-Z]+.[0-9]+).')
+doi_issue_validator = RegexValidator(r'^[a-zA-Z]+.[0-9]+.[0-9]+$',
+ ('Only valid DOI expressions are allowed '
+ '([a-zA-Z]+.[0-9]+.[0-9]+).'))
+doi_publication_validator = RegexValidator(r'^[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,}$',
+ ('Only valid DOI expressions are allowed '
+ '([a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,}).'))
diff --git a/journals/migrations/0013_auto_20170407_0954.py b/journals/migrations/0013_auto_20170407_0954.py
index 77ee437c0e53d1a6bf6e1ae2259915fe9218f446..d7cd736a6e66999c7334d9b51180a446e24cb7ea 100644
--- a/journals/migrations/0013_auto_20170407_0954.py
+++ b/journals/migrations/0013_auto_20170407_0954.py
@@ -10,37 +10,55 @@ def auto_remove_scipost_physics_proc(apps, schema_editor):
try:
journal = Journal.objects.get(name='SciPostPhysProc')
journal.delete()
- print('\n...SciPost Physics Proceedings deleted.')
+ print('\n - SciPost Physics Proceedings deleted...')
except Journal.DoesNotExist:
- print('\n...No SciPost Physics Proceedings does not exist.')
+ print(' - No SciPost Physics Proceedings does not exist...')
def auto_add_scipost_physics_proc(apps, schema_editor):
Journal = apps.get_model('journals', 'Journal')
Journal.objects.create(name='SciPostPhysProc', doi_string='SciPostPhysProc')
- print('\n...SciPost Physics Proceedings created.')
+ print(' - SciPost Physics Proceedings created...')
def alter_existing_journal_name(apps, schema_editor):
Journal = apps.get_model('journals', 'Journal')
+ Submission = apps.get_model('submissions', 'Submission')
try:
journal = Journal.objects.get(name='SciPost Physics')
journal.name = 'SciPostPhys'
journal.save()
- print('\n...SciPost Physics name updated.')
+ print('\n - SciPost Physics name updated...')
+
+ Submission.objects.filter(submitted_to_journal='SciPost Physics').update(
+ submitted_to_journal='SciPostPhys'
+ )
+ Submission.objects.filter(submitted_to_journal='SciPost Physics Lecture Notes').update(
+ submitted_to_journal='SciPostPhysLectNotes'
+ )
+ print(' - Submission `submitted_to_journal` keys updated...')
except Journal.DoesNotExist:
- print('\n...No Journal Names altered.')
+ print(' - No Journal Names altered...')
def reverse_alter_existing_journal_name(apps, schema_editor):
Journal = apps.get_model('journals', 'Journal')
+ Submission = apps.get_model('submissions', 'Submission')
try:
journal = Journal.objects.get(name='SciPostPhys')
journal.name = 'SciPost Physics'
journal.save()
- print('\n...SciPost Physics name updated.')
+ print(' - SciPost Physics name updated...')
+
+ Submission.objects.filter(submitted_to_journal='SciPostPhys').update(
+ submitted_to_journal='SciPost Physics'
+ )
+ Submission.objects.filter(submitted_to_journal='SciPostPhysLectNotes').update(
+ submitted_to_journal='SciPost Physics Lecture Notes'
+ )
+ print(' - Submission `submitted_to_journal` keys updated...')
except Journal.DoesNotExist:
- print('\n...No Journal Names altered.')
+ print(' - No Journal Names altered...')
class Migration(migrations.Migration):
diff --git a/journals/migrations/0014_journal_active.py b/journals/migrations/0014_journal_active.py
index bbfa86cd917497bdab207288c86a6a98c5dfc696..a4e7c58cc5f41469f58e3be4ac248347f63957ea 100644
--- a/journals/migrations/0014_journal_active.py
+++ b/journals/migrations/0014_journal_active.py
@@ -15,7 +15,7 @@ def auto_deactivate_scipost_physics_proc(apps, schema_editor):
journal = Journal.objects.get(name='SciPostPhysProc', doi_string='SciPostPhysProc')
journal.active = False
journal.save()
- print('\n...SciPost Physics Proceedings deactivated.')
+ print('\n - SciPost Physics Proceedings deactivated...')
except Journal.DoesNotExist:
pass
diff --git a/journals/migrations/0015_auto_20170408_1758.py b/journals/migrations/0015_auto_20170408_1758.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ece95f4450f48a1e80c89daba6bb14980fd219b
--- /dev/null
+++ b/journals/migrations/0015_auto_20170408_1758.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-04-08 15:58
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0014_journal_active'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='issue',
+ name='doi_string',
+ field=models.CharField(db_index=True, max_length=200, unique=True, validators=[django.core.validators.RegexValidator('^[a-zA-Z]+.[0-9]+.[0-9]+$', 'Only valid DOI expressions are allowed ([a-zA-Z]+.[0-9]+.[0-9]+).')]),
+ ),
+ migrations.AlterField(
+ model_name='journal',
+ name='doi_string',
+ field=models.CharField(db_index=True, max_length=200, unique=True, validators=[django.core.validators.RegexValidator('^[a-zA-Z]+$', 'Only valid DOI expressions are allowed ([a-zA-Z]+).')]),
+ ),
+ migrations.AlterField(
+ model_name='publication',
+ name='doi_string',
+ field=models.CharField(db_index=True, max_length=200, unique=True, validators=[django.core.validators.RegexValidator('^[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,}$', 'Only valid DOI expressions are allowed ([a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,}).')]),
+ ),
+ migrations.AlterField(
+ model_name='volume',
+ name='doi_string',
+ field=models.CharField(db_index=True, max_length=200, unique=True, validators=[django.core.validators.RegexValidator('^[a-zA-Z]+.[0-9]+$', 'Only valid DOI expressions are allowed ([a-zA-Z]+.[0-9]+).')]),
+ ),
+ ]
diff --git a/journals/models.py b/journals/models.py
index 28a3404ae7271c2361979d9cb2a1ca13672207a8..3d4077434d3b50ccbe061b5799ce9bd6bb355419 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -4,6 +4,8 @@ from django.template import Template, Context
from django.utils import timezone
from django.urls import reverse
+from .behaviors import doi_journal_validator, doi_volume_validator,\
+ doi_issue_validator, doi_publication_validator
from .constants import SCIPOST_JOURNALS, SCIPOST_JOURNALS_DOMAINS,\
STATUS_DRAFT, STATUS_PUBLISHED, ISSUE_STATUSES
from .helpers import paper_nr_string, journal_name_abbrev_citation
@@ -24,7 +26,8 @@ class UnregisteredAuthor(models.Model):
class Journal(models.Model):
name = models.CharField(max_length=100, choices=SCIPOST_JOURNALS, unique=True)
- doi_string = models.CharField(max_length=200, blank=True, unique=True)
+ doi_string = models.CharField(max_length=200, unique=True, db_index=True,
+ validators=[doi_journal_validator])
issn = models.CharField(max_length=16, default='2542-4653')
active = models.BooleanField(default=True)
@@ -43,7 +46,8 @@ class Volume(models.Model):
number = models.PositiveSmallIntegerField()
start_date = models.DateField(default=timezone.now)
until_date = models.DateField(default=timezone.now)
- doi_string = models.CharField(max_length=200, blank=True, unique=True)
+ doi_string = models.CharField(max_length=200, unique=True, db_index=True,
+ validators=[doi_volume_validator])
class Meta:
unique_together = ('number', 'in_journal')
@@ -58,7 +62,8 @@ class Issue(models.Model):
start_date = models.DateField(default=timezone.now)
until_date = models.DateField(default=timezone.now)
status = models.CharField(max_length=20, choices=ISSUE_STATUSES, default=STATUS_PUBLISHED)
- doi_string = models.CharField(max_length=200, blank=True, unique=True)
+ doi_string = models.CharField(max_length=200, unique=True, db_index=True,
+ validators=[doi_issue_validator])
# absolute path on filesystem: (JOURNALS_DIR)/journal/vol/issue/
path = models.CharField(max_length=200)
@@ -122,8 +127,8 @@ class Publication(models.Model):
metadata = JSONField(default={}, blank=True, null=True)
metadata_xml = models.TextField(blank=True, null=True) # for Crossref deposit
BiBTeX_entry = models.TextField(blank=True, null=True)
- doi_string = models.CharField(max_length=200, blank=True, unique=True) # Used for file name
- # doi_string = models.CharField(max_length=200, blank=True, null=True)
+ doi_string = models.CharField(max_length=200, unique=True, db_index=True,
+ validators=[doi_publication_validator])
submission_date = models.DateField(verbose_name='submission date')
acceptance_date = models.DateField(verbose_name='acceptance date')
publication_date = models.DateField(verbose_name='publication date')
diff --git a/journals/templates/journals/SciPostPhysProc_about.html b/journals/templates/journals/SciPostPhysProc_about.html
index a988e17d5204b314dacba85515cf6683901653ea..ea76b42877b54c128b18a9d1d453bbae0213b0ad 100644
--- a/journals/templates/journals/SciPostPhysProc_about.html
+++ b/journals/templates/journals/SciPostPhysProc_about.html
@@ -16,14 +16,35 @@
{{block.super}}
{% endwith %}
- <div class="row">
+
+ <div class="row">
<div class="col-md-6">
- <h2>Neque porro quisquam</h2>
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ultrices tristique ligula. Praesent id odio mollis, egestas est blandit, tempus nisi. Nulla facilisi. Donec a consequat magna. In pulvinar libero laoreet finibus rhoncus. Vestibulum sodales risus in ornare ultricies. Donec vitae euismod sem, vitae finibus purus. Vestibulum vehicula, orci pellentesque congue sodales, leo nulla pellentesque elit, in interdum enim dui quis urna. Etiam at lectus sit amet risus sollicitudin faucibus.</p>
+ <h2>Aims and Scope</h2>
+ <p>SciPost Physics Proceedings is a premium-quality, two-way open access, peer-witnessed refereed Journal for the general field of Physics.</p>
+ <p>It aims at providing a high-quality, openly accessible publishing venue for conference/workshop/school proceedings.</p>
+ <p>SciPost Physics Proceedings publishes articles in the domains of Experimental, Theoretical and Computational physics, in all specializations.</p>
</div>
<div class="col-md-6">
- <h2>Mauris vel dolor lacus</h2>
- <p>Phasellus dapibus euismod rutrum. Aliquam gravida nisl nulla. Sed et hendrerit mauris. Curabitur pulvinar turpis sed orci eleifend sodales. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Donec ut luctus nunc. Nulla rhoncus mattis magna, at tincidunt purus ullamcorper eu. Duis sem nisl, porttitor ac dui a, rutrum dictum mi.</p>
+ <h2>Setup</h2>
+ <p>Each Issue of SciPost Physics Proceedings corresponds to a distinct event (<i>e.g.</i> conference, workshop, school).</p>
+ <p>A set of guest Editors is appointed by the event's organizing committee. These guest Editors participate in the refereeing process of all submissions considered for publication in the Issue. Publication decisions are taken jointly by the set of guest Editors and the Editorial College (Physics).</p>
+ <p>Opening of a Proceedings Issue can be requested by <a href="mailto:proceedings@scipost.org">contacting our proceedings administrators</a>.</p>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-md-6">
+ <h2>Submission and Editorial Process</h2>
+ <p>Submission to a particular Issue of SciPost Physics Proceedings is by invitation of the guest Editors only.</p>
+ <p>Authors should follow the <a href="{% url 'submissions:author_guidelines' %}">submission guidelines</a> to ensure seamless processing of their manuscript. The <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a> apply to all Submissions to SciPost Physics Proceedings.</p>
+ <p>All incoming Submissions are checked for plagiarism and follow the peer-witnessed refereeing procedures outlined in <a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and Refereeing procedure</a>.</p>
+ <p>All publication decisions are taken jointly by the guest Editors and the <a href="{% url 'scipost:about' %}#editorial_college_physics">Editorial College (Physics)</a>, following the rules set out in the <a href="{% url 'scipost:EdCol_by-laws' %}">Editorial College by-laws</a>.</p>
+ </div>
+
+ <div class="col-md-6">
+ <h2>Publication: Open Access</h2>
+ <p>Publications in SciPost Physics Proceedings are published under the terms of the <a href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International (CC BY 4.0) License</a>, allowing freedom to use, reproduce and distribute the articles and related content (unless otherwise noted), for commercial and noncommercial purposes, subject to the citation of the original source.</p>
</div>
</div>
+
{% endblock %}
diff --git a/journals/templates/journals/SciPostPhysProc_info_for_authors.html b/journals/templates/journals/SciPostPhysProc_info_for_authors.html
index 11b787586823658db3f6b96a473673cbe575ebce..84dc61b298716804bc32c415ac7e678a0e0248f4 100644
--- a/journals/templates/journals/SciPostPhysProc_info_for_authors.html
+++ b/journals/templates/journals/SciPostPhysProc_info_for_authors.html
@@ -26,7 +26,7 @@
<h3>Submission and Refereeing</h3>
<ul>
<li>Make sure you have read and agree with the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions.</a></li>
- <li>All Submissions to SciPost Physics follow the peer-witnessed refereeing procedures outlined in
+ <li>All Submissions to SciPost Physics Proceedings follow the peer-witnessed refereeing procedures outlined in
<a href="{% url 'submissions:sub_and_ref_procedure' %}">Submission and Refereeing procedure</a>.
</li>
</ul>
diff --git a/journals/templates/journals/_base.html b/journals/templates/journals/_base.html
index 6d7c6e157845bb455fe581b7a28b85f6b7cb2783..a78ad65eea9567e99fb5743ba4a8d5fc81467c9f 100644
--- a/journals/templates/journals/_base.html
+++ b/journals/templates/journals/_base.html
@@ -4,7 +4,6 @@
{% block body_class %}{{block.super}} journals{% endblock %}
{% block breadcrumb %}
-
<nav class="breadcrumb py-md-2 px-0">
<div class="container">
{% block breadcrumb_items %}
@@ -46,7 +45,7 @@
<footer class="secondary container-fluid py-2">
<div class="row my-1">
<div class="col-12">
- SciPost Physics is published by the SciPost Foundation under the journal doi: 10.21468/SciPostPhys and ISSN 2542-4653.
+ {{journal}} is published by the SciPost Foundation under the journal doi: 10.21468/{{journal.name}} and ISSN {{journal.issn}}.
</div>
</div>
</footer>
diff --git a/journals/templates/journals/journals.html b/journals/templates/journals/journals.html
index 6d8a9e2ad3454fd308d6fe2e882cdc32126d64f5..eb2059959792d64ac2e5424dd8e18a699f2f8ebc 100644
--- a/journals/templates/journals/journals.html
+++ b/journals/templates/journals/journals.html
@@ -34,7 +34,11 @@
<a href="{% url 'journal:about' 'SciPostPhysProc' %}">SciPost Physics Proceedings</a>
</h1>
<div class="py-2">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ultrices tristique ligula. Praesent id odio mollis, egestas est blandit, tempus nisi. Nulla facilisi. Donec a consequat magna. In pulvinar libero laoreet finibus rhoncus. Vestibulum sodales risus in ornare ultricies. Donec vitae euismod sem, vitae finibus purus. Vestibulum vehicula, orci pellentesque congue sodales, leo nulla pellentesque elit, in interdum enim dui quis urna. Etiam at lectus sit amet risus sollicitudin faucibus.</p>
+ <p style="color: red;">New!</p>
+ <p>SciPost Physics Proceedings is a premium-quality, two-way open access, peer-witnessed refereed Journal for the general field of Physics.</p>
+ <p>It aims at providing a high-quality, openly accessible publishing venue for conference/workshop/school proceedings.</p>
+ <p>SciPost Physics Proceedings publishes articles in the domains of Experimental, Theoretical and Computational physics, in all specializations.</p>
+ <p>Interested in setting up a Proceedings Issue? Contact our <a href="mailto:proceedings@scipost.org">proceedings administrators</a>.</p>
</div>
</div>
</div>
diff --git a/journals/urls/general.py b/journals/urls/general.py
index b9f90678b2d804bfb5982bb6e0292ae1ab7e2adf..65ec93055c1a17a79df250b73b5abe8aa03e8fef 100644
--- a/journals/urls/general.py
+++ b/journals/urls/general.py
@@ -6,7 +6,7 @@ from journals import views as journals_views
urlpatterns = [
# Journals
- url(r'^$', journals_views.journals, name='journals'),
+ url(r'^$', TemplateView.as_view(template_name='journals/journals.html'), name='journals'),
url(r'^journals_terms_and_conditions$',
TemplateView.as_view(template_name='journals/journals_terms_and_conditions.html'),
name='journals_terms_and_conditions'),
@@ -36,19 +36,19 @@ urlpatterns = [
url(r'^add_new_unreg_author/(?P<publication_id>[0-9]+)$',
journals_views.add_new_unreg_author,
name='add_new_unreg_author'),
- url(r'^create_citation_list_metadata/(?P<doi_string>10.21468/[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^create_citation_list_metadata/(?P<doi_string>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
journals_views.create_citation_list_metadata,
name='create_citation_list_metadata'),
- url(r'^create_funding_info_metadata/(?P<doi_string>10.21468/[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^create_funding_info_metadata/(?P<doi_string>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
journals_views.create_funding_info_metadata,
name='create_funding_info_metadata'),
- url(r'^create_metadata_xml/(?P<doi_string>10.21468/[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^create_metadata_xml/(?P<doi_string>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
journals_views.create_metadata_xml,
name='create_metadata_xml'),
- url(r'^metadata_xml_deposit/(?P<doi_string>10.21468/[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/(?P<option>[a-z]+)$',
+ url(r'^metadata_xml_deposit/(?P<doi_string>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/(?P<option>[a-z]+)$',
journals_views.metadata_xml_deposit,
name='metadata_xml_deposit'),
- url(r'^harvest_citedby_links/(?P<doi_string>10.21468/[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^harvest_citedby_links/(?P<doi_string>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
journals_views.harvest_citedby_links,
name='harvest_citedby_links'),
]
diff --git a/journals/views.py b/journals/views.py
index c7cea10a03cfac4dc3857169001eb12d429376cf..78e630e43c74249d3d3163422a152292b86cb7c3 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -28,10 +28,6 @@ from guardian.decorators import permission_required
# Journals
############
-def journals(request):
- return render(request, 'journals/journals.html')
-
-
def landing_page(request, doi_string):
journal = get_object_or_404(Journal, doi_string=doi_string)
diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss
index fab6e0f9c8376734b4e5028546d55ff677c6521b..e5b43ec35c21350f2adfc6ed11242801f0096bce 100644
--- a/scipost/static/scipost/assets/config/preconfig.scss
+++ b/scipost/static/scipost/assets/config/preconfig.scss
@@ -72,6 +72,8 @@ $font-size-h4: 0.8rem;
$font-size-h5: 0.8rem;
$font-size-h6: 0.8rem;
+$close-font-weight: 100;
+
// Tables
//
$table-cell-padding: 0.25rem 0.5rem;
diff --git a/scipost/static/scipost/assets/css/_icons.scss b/scipost/static/scipost/assets/css/_icons.scss
new file mode 100644
index 0000000000000000000000000000000000000000..9f68baa05b0d0fa19482957e13d22c4a28a22dc3
--- /dev/null
+++ b/scipost/static/scipost/assets/css/_icons.scss
@@ -0,0 +1,18 @@
+[data-toggle="collapse"] {
+
+ > h3:after {
+ background: url("data:image/svg+xml;base64,PHN2ZyBmaWxsPSIjMDAwMDAwIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgICA8cGF0aCBkPSJNNy40MSA3Ljg0TDEyIDEyLjQybDQuNTktNC41OEwxOCA5LjI1bC02IDYtNi02eiIvPgogICAgPHBhdGggZD0iTTAtLjc1aDI0djI0SDB6IiBmaWxsPSJub25lIi8+Cjwvc3ZnPg==");
+ content: '';
+ display: inline-block;
+ height: 16px;
+ width: 16px;
+ vertical-align: baseline;
+ float: right;
+ }
+
+ &.collapsed > h3:after {
+ -ms-transform: rotate(180deg); /* IE 9 */
+ -webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */
+ transform: rotate(180deg);
+ }
+}
diff --git a/scipost/static/scipost/assets/css/style.scss b/scipost/static/scipost/assets/css/style.scss
index e717f876059d237822f47ba16cc1f8e670743513..860452d8c4ad327739acf3d66f3a890cac8f2327 100644
--- a/scipost/static/scipost/assets/css/style.scss
+++ b/scipost/static/scipost/assets/css/style.scss
@@ -42,6 +42,7 @@
@import "general";
@import "about";
@import "comments";
+@import "icons";
@import "journals";
@import "personal_page";
@import "submissions";
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index ad62a2b2c80bee10a5d4eed6d5756ed073bb0e7a..9d2c6a70dd2fafcb36deb25bb6cdc38004dd22f8 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -31,32 +31,32 @@
<!-- Nav tabs -->
<ul class="nav btn-group personal-page-nav" role="tablist">
<li class="nav-item btn btn-secondary">
- <a class="nav-link active" data-toggle="tab" href="#account" role="tab">Account</a>
+ <a href="#account" class="nav-link active" data-toggle="tab">Account</a>
</li>
{% if 'SciPost Administrators' in user_groups or 'Editorial Administrators' in user_groups or 'Editorial College' in user_groups or 'Advisory Board' in user_groups or 'Vetting Editors' in user_groups or 'Ambassadors' in user_groups or 'Junior Ambassadors' in user_groups %}
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#editorial-actions" role="tab">Editorial Actions</a>
+ <a href="#editorial-actions" class="nav-link" data-toggle="tab">Editorial Actions</a>
</li>
{% endif %}
{% if perms.scipost.can_referee %}
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#refereeing" role="tab">Refereeing</a>
+ <a class="nav-link" data-toggle="tab" href="#refereeing">Refereeing</a>
</li>
{% endif %}
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#submissions" role="tab">Submissions</a>
+ <a class="nav-link" data-toggle="tab" href="#submissions">Submissions</a>
</li>
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#commentaries" role="tab">Commentaries</a>
+ <a class="nav-link" data-toggle="tab" href="#commentaries">Commentaries</a>
</li>
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#theses" role="tab">Theses</a>
+ <a class="nav-link" data-toggle="tab" href="#theses">Theses</a>
</li>
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#comments" role="tab">Comments</a>
+ <a class="nav-link" data-toggle="tab" href="#comments">Comments</a>
</li>
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#author-replies" role="tab">Author Replies</a>
+ <a class="nav-link" data-toggle="tab" href="#author-replies">Author Replies</a>
</li>
</ul>
</div>
diff --git a/submissions/models.py b/submissions/models.py
index 6634308a3103d7e3a3dabf7cbbd91c1c979a12ac..0a14e4c8c8e683dc0473b6755d4819287a7d0a85 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -165,6 +165,7 @@ class Submission(ArxivCallable, models.Model):
arxiv_identifier_wo_vn_nr=self.arxiv_identifier_wo_vn_nr
).exclude(pk=self.id).order_by('-arxiv_vn_nr')
+ # Underneath: All very inefficient methods as they initiate a new query
def count_accepted_invitations(self):
return self.refereeinvitation_set.filter(accepted=True).count()
diff --git a/submissions/templates/submissions/_arxiv_queryresult.html b/submissions/templates/submissions/_arxiv_queryresult.html
new file mode 100644
index 0000000000000000000000000000000000000000..6d27ad83fbb256515ca15721c543eb0f860e2fd0
--- /dev/null
+++ b/submissions/templates/submissions/_arxiv_queryresult.html
@@ -0,0 +1,10 @@
+<div class="card-block">
+ <h3 class="card-title">{{ item.title }}</h3>
+ <div class="card-text">
+ {% for author in item.authors %}
+ {{ author.name }}{% if not forloop.last %},{% endif %}
+ {% endfor %}
+ - <a href="{{ item.id }}" target="_blank">{{ item.id }}</a>
+ </div>
+ <p class="card-text text-muted">Published: {{ item.published }}</p>
+</div>
diff --git a/submissions/templates/submissions/_pool_base.html b/submissions/templates/submissions/_pool_base.html
new file mode 100644
index 0000000000000000000000000000000000000000..a60e5b5b1129a08d124e3bc4a5c52d9719eee89f
--- /dev/null
+++ b/submissions/templates/submissions/_pool_base.html
@@ -0,0 +1,11 @@
+{% extends 'scipost/base.html' %}
+
+{% block breadcrumb %}
+ <nav class="breadcrumb py-md-2 px-0">
+ <div class="container">
+ {% block breadcrumb_items %}
+ <a href="{% url 'scipost:personal_page' %}" class="breadcrumb-item">Personal Page</a>
+ {% endblock %}
+ </div>
+ </nav>
+{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_in_pool.html b/submissions/templates/submissions/_submission_card_in_pool.html
index 3ccf44f0be92e89d3ff80c136841bbdb0e775895..9b5c3d28fff551614e67c8c4f0abb8df4bbf761a 100644
--- a/submissions/templates/submissions/_submission_card_in_pool.html
+++ b/submissions/templates/submissions/_submission_card_in_pool.html
@@ -20,7 +20,7 @@
{% endif %}
{% get_obj_perms request.user for submission as "sub_perms" %}
- {% if "can_take_editorial_actions" in sub_perms or request.user|is_in_group:'Editorial Administrators' %}
+ {% if "can_take_editorial_actions" in sub_perms or is_ECAdmin %}
{% if submission|required_actions %}
<div class="required-actions">
<h3 class="pt-0">Required actions:</h3>
@@ -55,7 +55,7 @@
{% endif %}
{% endif %}
- {% if request.user|is_in_group:'Editorial Administrators' %}
+ {% if is_ECAdmin %}
<h4>
<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>
</h4>
diff --git a/submissions/templates/submissions/assign_submission.html b/submissions/templates/submissions/assign_submission.html
index 8acc4864957858d3bf162895d21e6356951d71bd..92020ea3209549159a1087065e501131421d4247 100644
--- a/submissions/templates/submissions/assign_submission.html
+++ b/submissions/templates/submissions/assign_submission.html
@@ -1,9 +1,16 @@
-{% extends 'scipost/base.html' %}
+{% extends 'submissions/_pool_base.html' %}
{% load bootstrap %}
{% block pagetitle %}: assign submission{% endblock pagetitle %}
+{% block breadcrumb_items %}
+ {{block.super}}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ <a href="{% url 'submissions:editorial_page' submission_to_assign.arxiv_identifier_w_vn_nr %}" class="breadcrumb-item">Editorial Page ({{submission_to_assign.arxiv_identifier_w_vn_nr}})</a>
+ <span class="breadcrumb-item">Assign Submission</span>
+{% endblock %}
+
{% block content %}
<div class="row">
diff --git a/submissions/templates/submissions/communication.html b/submissions/templates/submissions/communication.html
index 55543c0c7385735c488eec54a203abbd1b28e34f..98a2ce31673380e5f57dfbca885036e2146b6dd6 100644
--- a/submissions/templates/submissions/communication.html
+++ b/submissions/templates/submissions/communication.html
@@ -1,57 +1,62 @@
-{% extends 'scipost/base.html' %}
+{% extends 'submissions/_pool_base.html' %}
{% block pagetitle %}: communication{% endblock pagetitle %}
{% load scipost_extras %}
-
{% load bootstrap %}
+{% block breadcrumb_items %}
+ {{block.super}}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ <a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}" class="breadcrumb-item">Editorial Page ({{submission.arxiv_identifier_w_vn_nr}})</a>
+ <span class="breadcrumb-item">Communication</span>
+{% endblock %}
+
{% block content %}
{% if errormessage %}
-<div class="row">
- <div class="col-12">
- <p>{{ errormessage }}</p>
- </div>
-</div>
-{% else %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Send a Communication</h1>
- {% if comtype == 'EtoA' %}
- <p>to the submitting Author of Submission</p>
- {% elif comtype == 'AtoE' or comtype == 'RtoE' or comtype == 'StoE' %}
- <h3>to the Editor-in-charge of Submission</h3>
- {% elif comtype == 'EtoR' %}
- <p>to Referee of Submission</p>
- {% elif comtype == 'EtoS' %}
- <p>to SciPost Editorial Administrators</p>
- {% endif %}
-
- <div class="card">
- {% include 'submissions/_submission_card_content.html' with submission=submission %}
+ <div class="row">
+ <div class="col-12">
+ <p>{{ errormessage }}</p>
</div>
</div>
-</div>
-
-<div class="row">
- <div class="col-12">
- {% if referee_id %}
- <form action="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype=comtype referee_id=referee_id %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap:'0,12' }}
- <input class="btn btn-secondary" type="submit" value="Send communication"/>
- </form>
- {% else %}
- <form action="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype=comtype %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap:'0,12' }}
- <input class="btn btn-secondary" type="submit" value="Send communication"/>
- </form>
+{% else %}
+ <div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Send a Communication</h1>
+ {% if comtype == 'EtoA' %}
+ <p>to the submitting Author of Submission</p>
+ {% elif comtype == 'AtoE' or comtype == 'RtoE' or comtype == 'StoE' %}
+ <h3>to the Editor-in-charge of Submission</h3>
+ {% elif comtype == 'EtoR' %}
+ <p>to Referee of Submission</p>
+ {% elif comtype == 'EtoS' %}
+ <p>to SciPost Editorial Administrators</p>
{% endif %}
- {% endif %}
+ <div class="card">
+ {% include 'submissions/_submission_card_content.html' with submission=submission %}
+ </div>
+ </div>
</div>
-</div>
+ <div class="row">
+ <div class="col-12">
+ {% if referee_id %}
+ <form action="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype=comtype referee_id=referee_id %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap:'0,12' }}
+ <input class="btn btn-secondary" type="submit" value="Send communication"/>
+ </form>
+ {% else %}
+ <form action="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype=comtype %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap:'0,12' }}
+ <input class="btn btn-secondary" type="submit" value="Send communication"/>
+ </form>
+ {% endif %}
+
+ {% endif %}
+ </div>
+ </div>
{% endblock content %}
diff --git a/submissions/templates/submissions/editorial_page.html b/submissions/templates/submissions/editorial_page.html
index 47cbf1ee3132cd51617112f4a0f5a14c09aa5191..fb3a8d7f9625743ac5b37c8addcfcf75c1ec235c 100644
--- a/submissions/templates/submissions/editorial_page.html
+++ b/submissions/templates/submissions/editorial_page.html
@@ -1,4 +1,4 @@
-{% extends 'scipost/base.html' %}
+{% extends 'submissions/_pool_base.html' %}
{% block pagetitle %}: editorial page for submission{% endblock pagetitle %}
@@ -6,6 +6,12 @@
{% load submissions_extras %}
{% load bootstrap %}
+{% block breadcrumb_items %}
+ {{block.super}}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ <span class="breadcrumb-item">Editorial Page ({{submission.arxiv_identifier_w_vn_nr}})</span>
+{% endblock %}
+
{% block content %}
<div class="row">
@@ -18,7 +24,7 @@
<p>Please go to the current version's page.</p>
{% endif %}
- <h3>(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments)</h3>
+ <p class="card-text">(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments)</h3>
</div>
</div>
{% if other_versions %}
diff --git a/submissions/templates/submissions/eic_recommendation.html b/submissions/templates/submissions/eic_recommendation.html
index 9017da4960eed47aaec65ae63a928efaa3dad583..2aecf69d1ac5224e8a70880140bf102a0bfd86b7 100644
--- a/submissions/templates/submissions/eic_recommendation.html
+++ b/submissions/templates/submissions/eic_recommendation.html
@@ -1,10 +1,17 @@
-{% extends 'scipost/base.html' %}
+{% extends 'submissions/_pool_base.html' %}
{% block pagetitle %}: editorial recommendation for submission{% endblock pagetitle %}
{% load scipost_extras %}
{% load bootstrap %}
+{% block breadcrumb_items %}
+ {{block.super}}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ <a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}" class="breadcrumb-item">Editorial Page ({{submission.arxiv_identifier_w_vn_nr}})</a>
+ <span class="breadcrumb-item">Formulate Editorial Recommendation</span>
+{% endblock %}
+
{% block content %}
<div class="row">
@@ -12,20 +19,19 @@
<div class="card card-grey">
<div class="card-block">
<h1 class="card-title">Formulate Editorial Recommendation for Submission</h1>
- <h3>
+ <p class="card-text">
(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">
Submissions Page</a> to view Reports and Comments)
- </h3>
- <h3>
+ </p>
+ <p class="card-text">
(go back to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">
Editorial Page</a> to take editorial actions)
- </h3>
+ </p>
</div>
</div>
</div>
</div>
- {# <hr class="hr12">#}
<div class="row">
<div class="col-12">
<h2>Submission</h2>
diff --git a/submissions/templates/submissions/pool.html b/submissions/templates/submissions/pool.html
index a481b1142cc49ceb899cc2773dedba1be34b20d7..e423edb669f18b21f19c00a4d2e2cb1af83a63e0 100644
--- a/submissions/templates/submissions/pool.html
+++ b/submissions/templates/submissions/pool.html
@@ -1,4 +1,4 @@
-{% extends 'scipost/base.html' %}
+{% extends 'submissions/_pool_base.html' %}
{% block pagetitle %}: Submissions Pool{% endblock pagetitle %}
@@ -7,223 +7,324 @@
{% load scipost_extras %}
{% load submissions_extras %}
+{% block breadcrumb_items %}
+ {{block.super}}
+ <span class="breadcrumb-item">Pool</span>
+{% endblock %}
+
{% block content %}
-{% if request.user|is_in_group:'Editorial Administrators' and recommendations_undergoing_voting %}
- <div class="row">
- <div class="col-12">
- <h3 class="highlight">Administrative actions on recommendations undergoing voting:</h3>
- <ul>
- <li>To send an email reminder to each Fellow with at least one voting duty, <a href="{% url 'submissions:remind_Fellows_to_vote' %}">click here</a></li>
- </ul>
- </div>
- </div>
+{% with is_ECAdmin=request.user|is_in_group:'Editorial Administrators' %}
- <div class="row">
- <div class="col-12">
- <h1 class="highlight d-block">Recommendations undergoing voting</h1>
- </div>
- </div>
+<!-- Page content -->
+<div class="row">
+ <div class="col-lg-8">
- {% for rec in recommendations_undergoing_voting %}
- {% if not forloop.first %}
- <hr>
- {% endif %}
+ {% if is_ECAdmin %}
+ {% if recommendations_undergoing_voting %}
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight mt-0">Administrative actions on recommendations undergoing voting:</h3>
+ <ul>
+ <li>To send an email reminder to each Fellow with at least one voting duty, <a href="{% url 'submissions:remind_Fellows_to_vote' %}">click here</a></li>
+ </ul>
+ </div>
+ </div>
- <div class="row">
- <div class="col-12">
- <div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
+ <div class="row">
+ <div class="col-12">
+ <h1 class="highlight mt-0">Recommendations undergoing voting</h1>
+ </div>
</div>
- <div class="card card-outline-secondary">
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
- <div class="card-block">
- {% if rec.remark_set.all %}
- <h3 class="card-title">Remarks by Fellows:</h3>
- <ul>
- {% for remark in rec.remark_set.all|sort_by:'date' %}
- {{ remark.as_li }}
- {% endfor %}
- </ul>
+ <div class="row">
+ {% for rec in recommendations_undergoing_voting %}
+ {% if not forloop.first %}
+ <hr>
{% endif %}
- <h3 class="card-title">Fellows eligible to vote:</h3>
- <ul>
- <li>
- {% for eligible in rec.eligible_to_vote.all|sort_by:'user__last_name' %}
- {{ eligible.user.last_name }},
- {% endfor %}
- </li>
- </ul>
+ <div class="col-12">
+ <div class="card card-outline-secondary">
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
+ </div>
- <h3 class="card-title">Voting results up to now:</h3>
- <ul>
- <li>
- Agreed: ({{ rec.voted_for.all.count }})
- {% for agreed in rec.voted_for.all|sort_by:'user__last_name' %}
- {{ agreed.user.last_name }},
- {% endfor %}
- </li>
- <li>
- Disagreed: ({{ rec.voted_against.all.count }})
- {% for disagreed in rec.voted_against.all|sort_by:'user__last_name' %}
- {{ disagreed.user.last_name }},
- {% endfor %}
- </li>
- <li>
- Abstained: ({{ rec.voted_abstain.all.count }})
- {% for abstained in rec.voted_abstain.all|sort_by:'user__last_name' %}
- {{ abstained.user.last_name }},
- {% endfor %}
- </li>
- </ul>
+ <div class="card card-outline-secondary">
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
+ <div class="card-block">
+ {% if rec.remark_set.all %}
+ <h3 class="card-title">Remarks by Fellows:</h3>
+ <ul>
+ {% for remark in rec.remark_set.all|sort_by:'date' %}
+ {{ remark.as_li }}
+ {% endfor %}
+ </ul>
+ {% endif %}
- {% if rec.remark_set %}
- <h3 class="card-title">Remarks:</h3>
- <ul>
- {% for rem in rec.remark_set.all %}
- <li>{{ rem }}</li>
- {% empty %}
- <li><em>No remarks</em></li>
- {% endfor %}
- </ul>
- {% endif %}
- </div>
- <div class="card-footer">
- <h3 class="card-title">Actions:</h3>
- <ul>
- <li>To fix the College decision and follow the Editorial Recommendation as is: <a href="{% url 'submissions:fix_College_decision' rec_id=rec.id %}">click here</a></li>
- <li>To request a modification of the Recommendation to request for revision: click here</li>
- </ul>
+ <h3 class="card-title">Fellows eligible to vote:</h3>
+ <ul>
+ <li>
+ {% for eligible in rec.eligible_to_vote.all|sort_by:'user__last_name' %}
+ {{ eligible.user.last_name }},
+ {% endfor %}
+ </li>
+ </ul>
+
+ <h3 class="card-title">Voting results up to now:</h3>
+ <ul>
+ <li>
+ Agreed: ({{ rec.voted_for.all.count }})
+ {% for agreed in rec.voted_for.all|sort_by:'user__last_name' %}
+ {{ agreed.user.last_name }},
+ {% endfor %}
+ </li>
+ <li>
+ Disagreed: ({{ rec.voted_against.all.count }})
+ {% for disagreed in rec.voted_against.all|sort_by:'user__last_name' %}
+ {{ disagreed.user.last_name }},
+ {% endfor %}
+ </li>
+ <li>
+ Abstained: ({{ rec.voted_abstain.all.count }})
+ {% for abstained in rec.voted_abstain.all|sort_by:'user__last_name' %}
+ {{ abstained.user.last_name }},
+ {% endfor %}
+ </li>
+ </ul>
+
+ {% if rec.remark_set %}
+ <h3 class="card-title">Remarks:</h3>
+ <ul>
+ {% for rem in rec.remark_set.all %}
+ <li>{{ rem }}</li>
+ {% empty %}
+ <li><em>No remarks</em></li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </div>
+ <div class="card-footer">
+ <h3 class="card-title">Actions:</h3>
+ <ul>
+ <li>To fix the College decision and follow the Editorial Recommendation as is: <a href="{% url 'submissions:fix_College_decision' rec_id=rec.id %}">click here</a></li>
+ <li>To request a modification of the Recommendation to request for revision: click here</li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ <hr>
+ {% endif %}
+
+ {% if recommendations_to_prepare_for_voting %}
+ <div class="row">
+ <div class="col-12">
+ <h1 class="highlight mt-0">Recommendations to prepare for voting</h1>
</div>
</div>
- </div>
- {% endfor %}
- </div>
- <hr>
-{% endif %}
+ {% for rec in recommendations_to_prepare_for_voting %}
+ {% if not forloop.first %}
+ <hr>
+ {% endif %}
-{% if assignments_to_consider %}
- <div class="row">
- <div class="col-12">
- <div class="highlight d-block p-3">
- <h1 class="p-0">Assignment request</h1>
- <h3 class="p-0 mt-1 d-block text-muted">Can you act as Editor-in-charge? (see below to accept/decline)</h3>
- </div>
- </div>
- </div>
- {% for assignment_to_consider in assignments_to_consider %}
- <div class="row">
- <div class="col-12">
- <div class="card">
- {% include 'submissions/_submission_assignment_request.html' with assignment=assignment_to_consider %}
+ <div class="row">
+ <div class="col-12" id="prepare_rec_{{rec.id}}">
+ <div class="card card-outline-secondary">
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
+ </div>
+
+ <div class="card card-outline-secondary">
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
+ <div class="card-footer">
+ <h3>Actions:</h3>
+ <ul>
+ <li><a href="{% url 'submissions:prepare_for_voting' rec_id=rec.id %}">Prepare for voting</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ <hr>
+ {% endif %}
+ {% endif %}
+
+ {% if assignments_to_consider %}
+ <div class="row">
+ <div class="col-12">
+ <div class="highlight p-3">
+ <h1 class="p-0">Assignment request</h1>
+ <h3 class="p-0 mt-1 d-block text-muted">Can you act as Editor-in-charge? (see below to accept/decline)</h3>
+ </div>
</div>
</div>
- </div>
- {% endfor %}
- <hr>
-{% endif %}
-
-{% if request.user|is_in_group:'Editorial Administrators' and recommendations_to_prepare_for_voting %}
- <div class="row">
- <div class="col-12">
- <h1 class="highlight d-block">Recommendations to prepare for voting</h1>
- </div>
- </div>
-
- {% for rec in recommendations_to_prepare_for_voting %}
- {% if not forloop.first %}
+ {% for assignment_to_consider in assignments_to_consider %}
+ <div class="row">
+ <div class="col-12">
+ <div class="card">
+ {% include 'submissions/_submission_assignment_request.html' with assignment=assignment_to_consider %}
+ </div>
+ </div>
+ </div>
+ {% endfor %}
<hr>
{% endif %}
- <div class="row">
- <div class="col-12">
- <div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
+ {% if recs_to_vote_on %}
+ <div class="row">
+ <div class="col-12">
+ <h1 class="highlight mt-0">Recommendations to vote on</h1>
</div>
+ </div>
+ {% for rec in recs_to_vote_on %}
+ {% if not forloop.first %}
+ <hr>
+ {% endif %}
- <div class="card card-outline-secondary">
- <div class="card-block">
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
- </div>
- <div class="card-footer">
- <h3>Actions:</h3>
- <ul>
- <li><a href="{% url 'submissions:prepare_for_voting' rec_id=rec.id %}">Prepare for voting</a></li>
- </ul>
+ <div class="row">
+ <div class="col-12">
+ <div class="card card-outline-secondary">
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
+ </div>
+
+ <div class="card card-outline-secondary">
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
+ <div class="card-footer">
+ <h3>Your position on this recommendation</h3>
+ <form action="{% url 'submissions:vote_on_rec' rec_id=rec.id %}" method="post">
+ {% csrf_token %}
+ {{ rec_vote_form|bootstrap:'0,12' }}
+ <input type="submit" name="submit" value="Cast your vote" class="btn btn-primary submitButton" id="submit-id-submit">
+ </form>
+ </div>
+ </div>
</div>
</div>
- </div>
- </div>
- {% endfor %}
- <hr>
-{% endif %}
-
-{% if recs_to_vote_on %}
- <div class="row">
- <div class="col-12">
- <h1 class="highlight d-block">Recommendations to vote on</h1>
- </div>
- </div>
- {% for rec in recs_to_vote_on %}
- {% if not forloop.first %}
+ {% endfor %}
<hr>
{% endif %}
<div class="row">
<div class="col-12">
- <div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
- </div>
+ <h1 class="highlight mt-0">SciPost Submissions Pool</h1>
+ </div>
+ </div>
+
+ <div class="row hidden-lg-up">
+ <div class="col-12">
+ <h3>Submissions by status:</h3>
+ <ul>
+ {% for key, val in submission_status %}
+ <li>
+ <a href="{% url 'submissions:submissions_by_status' status=key %}">{{ val }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+
+ <hr class="hidden-lg-up">
- <div class="card card-outline-secondary">
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
- <div class="card-footer">
- <h3>Your position on this recommendation</h3>
- <form action="{% url 'submissions:vote_on_rec' rec_id=rec.id %}" method="post">
- {% csrf_token %}
- {{ rec_vote_form|bootstrap:'0,12' }}
- <input type="submit" name="submit" value="Cast your vote" class="btn btn-primary submitButton" id="submit-id-submit">
- </form>
+ <div class="row">
+ <div class="col-12">
+ <!-- Submissions list -->
+ {% for sub in submissions_in_pool %}
+ <div class="card card-outline-secondary mt-1" id="pool_submission_{{sub.id}}">
+ {% include 'submissions/_submission_card_in_pool.html' with submission=sub remark_form=remark_form is_ECAdmin=is_ECAdmin user=request.user %}
</div>
- </div>
+ {% endfor %}
</div>
</div>
- {% endfor %}
- <hr>
-{% endif %}
+ </div><!-- End page content -->
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">SciPost Submissions Pool</h1>
- </div>
-</div>
+ <!-- Sidebar -->
+ <div class="col-lg-4 hidden-md-down">
+ <div class="card card-outline-secondary">
+ <div class="card-block">
+ <h2 class="card-title">Pool</h2>
+ <!-- Status -->
+ <a href="#pool_filter_status" data-toggle="collapse" class="collapsed">
+ <h3 class="card-title text-gray-dark">Submissions by status</h3>
+ </a>
+ <div id="pool_filter_status" class="collapse">
+ <ul class="pl-4">
+ {% for key, val in submission_status %}
+ <li>
+ <a href="{% url 'submissions:submissions_by_status' status=key %}">{{ val }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </div><!-- end status -->
-<div class="row">
- <div class="col-12">
- <h3>Submissions by status:</h3>
- <ul>
- {% for key, val in submission_status %}
- <li>
- <a href="{% url 'submissions:submissions_by_status' status=key %}">{{ val }}</a>
- </li>
- {% endfor %}
- </ul>
- </div>
-</div>
+ {% if is_ECAdmin %}
+ {% if recommendations_undergoing_voting %}
+ <!-- Preparing -->
+ <a href="#rec_filter_voting" data-toggle="collapse" class="collapsed">
+ <h3 class="card-title text-gray-dark">Recommendations undergoing voting ({{recommendations_undergoing_voting|length}})</h3>
+ </a>
+ <div id="rec_filter_voting" class="collapse">
+ <ul class="list-group list-group-flush">
+ {% for recommendation in recommendations_undergoing_voting %}
+ <li class="list-group-item">
+ <div class="card-block">
+ <a href="#prepare_rec_{{recommendation.id}}">{{recommendation.submission.title}}</a>
+ <p class="text-muted my-0">{{recommendation.submission.author_list}}</p>
+ <p class="my-0">Formulated on {{recommendation.date_submitted}}</p>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
+ </div><!-- end preparing -->
+ {% endif %}
-<hr>
-<div class="row">
- <div class="col-12">
- <!-- Submissions list -->
- {% for sub in submissions_in_pool %}
- <div class="card card-outline-secondary mt-1">
- {% include 'submissions/_submission_card_in_pool.html' with submission=sub remark_form=remark_form %}
+ {% if recommendations_to_prepare_for_voting %}
+ <!-- Preparing -->
+ <a href="#rec_filter_prepare" data-toggle="collapse" class="collapsed">
+ <h3 class="card-title text-gray-dark">Recommendations to prepare ({{recommendations_to_prepare_for_voting|length}})</h3>
+ </a>
+ <div id="rec_filter_prepare" class="collapse">
+ <ul class="list-group list-group-flush">
+ {% for recommendation in recommendations_to_prepare_for_voting %}
+ <li class="list-group-item">
+ <div class="card-block">
+ <a href="#prepare_rec_{{recommendation.id}}">{{recommendation.submission.title}}</a>
+ <p class="text-muted my-0">{{recommendation.submission.author_list}}</p>
+ <p class="my-0">Formulated on {{recommendation.date_submitted}}</p>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
+ </div><!-- end preparing -->
+ {% endif %}
+ {% endif %}
+
+ <!-- Pool -->
+ <a href="#pool_filter_submissions" data-toggle="collapse">
+ <h3 class="card-title text-gray-dark">Submissions in pool ({{submissions_in_pool|length}})</h3>
+ </a>
+ <div id="pool_filter_submissions" class="collapse show">
+ <ul class="list-group list-group-flush">
+ {% for submission in submissions_in_pool %}
+ <li class="list-group-item">
+ <div class="card-block">
+ <a href="#pool_submission_{{submission.id}}">{{submission.title}}</a>
+ <p class="text-muted mb-1">{{submission.author_list}}</p>
+ <p class="label label-secondary label-sm my-2">{{submission.get_status_display}}</p>
+ </div>
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ <h4 class="card-title"><em>No submission in the pool</em></h4>
+ </li>
+ {% endfor %}
+ </ul>
+ </div><!-- end pool -->
</div>
- {% endfor %}
+ </div>
</div>
</div>
-{% endblock content %}
+{% endwith %}
+
+{% endblock %}
diff --git a/submissions/templates/submissions/prepare_for_voting.html b/submissions/templates/submissions/prepare_for_voting.html
index bb9b8af8999559b01a46ce8fd115e0fd08feb7a5..cf1e8af3936202f0377943aaaac21ab9f6db4ce9 100644
--- a/submissions/templates/submissions/prepare_for_voting.html
+++ b/submissions/templates/submissions/prepare_for_voting.html
@@ -1,101 +1,105 @@
-{% extends 'scipost/base.html' %}
+{% extends 'submissions/_pool_base.html' %}
{% block pagetitle %}: prepare recommendation for voting{% endblock pagetitle %}
-{% block headsup %}
-
{% load scipost_extras %}
-
-{% endblock headsup %}
-
-{% block bodysup %}
-
-
-<section>
- <div class="flex-greybox">
- <h1>Prepare Editorial Recommendation for Voting</h1>
- <h3>(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=recommendation.submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments)</h3>
- <h3>(go back to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=recommendation.submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions)</h3>
- </div>
-
- <hr class="hr12">
- <div class="row">
- <div class="col-4">
- <h2>Submission:</h2>
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+ {{block.super}}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ <a href="{% url 'submissions:editorial_page' recommendation.submission.arxiv_identifier_w_vn_nr %}" class="breadcrumb-item">Editorial Page ({{recommendation.submission.arxiv_identifier_w_vn_nr}})</a>
+ <span class="breadcrumb-item">Prepare recommendation for voting</span>
+{% endblock %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-block">
+ <h1 class="card-title">Prepare Editorial Recommendation for Voting</h1>
+ <p class="card-text">(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=recommendation.submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments)</p>
+ <p class="card-text">(go back to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=recommendation.submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions)</p>
+ </div>
+ </div>
</div>
- </div>
- {{ recommendation.submission.header_as_table }}
-
- {% if recommendation.submission.referees_flagged %}
- <h3>Referees flagged upon submission (treat reports with caution):</h3>
- <p>{{ recommendation.submission.referees_flagged }}</p>
- {% endif %}
+</div>
- <div class="flex-greybox">
- <h3>Editorial recommendation:</h3>
- <ul>
- <li>
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
- </li>
- </ul>
- </div>
+<div class="row">
+ <div class="col-12">
+ <h2>Submission:</h2>
+ {% include 'submissions/_submission_summary.html' with submission=recommendation.submission %}
-</section>
+ {% if recommendation.submission.referees_flagged %}
+ <h3>Referees flagged upon submission (treat reports with caution):</h3>
+ <p>{{ recommendation.submission.referees_flagged }}</p>
+ {% endif %}
+ </div>
+</div>
-<section>
- <div class="flex-greybox">
- <h1>Select Fellows eligible to vote</h1>
- </div>
- <div class="row">
- <div class="col-6">
- <p>Fellows with expertise matching the Submission's subject area:</p>
- <ul>
- {% for Fellow in Fellows_with_expertise %}
- <li>{{ Fellow.user.last_name }}</li>
- {% endfor %}
- </ul>
+<div class="row">
+ <div class="col-12">
+ <div class="card card-outline-secondary">
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
+ </div>
</div>
- <div class="col-6">
+</div>
- <form action="{% url 'submissions:prepare_for_voting' rec_id=recommendation.id %}" method="post">
- {% csrf_token %}
- {{ eligibility_form.as_table }}
- <input type="submit" value="Submit" />
- </form>
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Select Fellows eligible to vote</h1>
</div>
- </div>
-
- {% if coauthorships %}
- <div style="background-color: #ffdddd">
- <h3 style="color: red">The system identified the following potential coauthorships (from arXiv database)</h3>
- <p style="color: red">(only up to 5 most recent shown; if within the last 3 years, referee is disqualified):</p>
- <ul>
- {% for key, value in coauthorships.items %}
- <li>For Fellow {{ key }}:
- <ul>
- {% for entry in value.entries %}
- <li>
- <p><a href="{{ entry.id }}">{{ entry.id }}</a></p>
- <p>{{ entry.title }}</p>
- <p>
- {% for author in entry.authors %}
- {{ author.name }},
- {% endfor %}
- </p>
- <p>{{ entry.published }}</p>
- </li>
- {% endfor %}
- </ul>
- {% endfor %}
- </ul>
- </div>
- {% else %}
- <h3 style="color: green">The system has not identified any coauthorships (from arXiv database)</h3>
- {% endif %}
-
-</section>
-
+</div>
+<div class="row">
+ <div class="col-md-6">
+ <p>Fellows with expertise matching the Submission's subject area:</p>
+ <ul>
+ {% for Fellow in Fellows_with_expertise %}
+ <li>{{ Fellow.user.last_name }}</li>
+ {% endfor %}
+ </ul>
+ </div>
+ <div class="col-md-6">
+ <form action="{% url 'submissions:prepare_for_voting' rec_id=recommendation.id %}" method="post">
+ {% csrf_token %}
+ {{ eligibility_form|bootstrap }}
+ <input class="btn btn-secondary" type="submit" value="Submit" />
+ </form>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ {% if coauthorships %}
+ <div class="card card-outline-danger">
+ <div class="card-block">
+ <h3 class="card-title text-danger">The system identified the following potential coauthorships (from arXiv database)</h3>
+ <p class="card-text text-danger">(only up to 5 most recent shown; if within the last 3 years, referee is disqualified):</p>
+ </div>
+ <div class="card-block">
+ <ul class="list-group list-group-flush">
+ {% for key, value in coauthorships.items %}
+ <li class="list-group-item pt-3">
+ <div class="card-content">
+ <h3>For Fellow {{key}}:</h3>
+ </div>
+ </li>
+ {% for entry in value.entries %}
+ <li class="list-group-item">
+ {% include 'submissions/_arxiv_queryresult.html' with item=entry %}
+ </li>
+ {% endfor %}
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+ {% else %}
+ <h3 class="text-success">The system has not identified any coauthorships (from arXiv database)</h3>
+ {% endif %}
+ </div>
+</div>
-{% endblock bodysup %}
+{% endblock %}
diff --git a/submissions/templates/submissions/select_referee.html b/submissions/templates/submissions/select_referee.html
index 0b2adc2fda311fde8245506dc01fd5a39e419dd1..cab69461c7334ba36edd8b40e48000b5ce8eb4dd 100644
--- a/submissions/templates/submissions/select_referee.html
+++ b/submissions/templates/submissions/select_referee.html
@@ -1,87 +1,100 @@
-{% extends 'scipost/base.html' %}
+{% extends 'submissions/_pool_base.html' %}
{% block pagetitle %}: select referee for submission{% endblock pagetitle %}
-{% block headsup %}
-
{% load scipost_extras %}
+{% load bootstrap %}
-{% endblock headsup %}
+{% block breadcrumb_items %}
+ {{block.super}}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ <a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}" class="breadcrumb-item">Editorial Page ({{submission.arxiv_identifier_w_vn_nr}})</a>
+ <span class="breadcrumb-item">Select Referee</span>
+{% endblock %}
-{% block bodysup %}
+{% block content %}
+<div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-block">
+ <h1 class="card-text">Referee Selection Page for Submission</h1>
+ <p class="card-text">(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments)</p>
+ <p class="card-text">(go back to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions)</p>
+ </div>
+ </div>
+ </div>
+</div>
-<section>
- <div class="flex-greybox">
- <h1>Referee Selection Page for Submission</h1>
- <h3>(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments)</h3>
- <h3>(go back to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions)</h3>
- </div>
+<div class="row">
+ <div class="col-12">
+ <h2>Submission:</h2>
+ {% include 'submissions/_submission_summary.html' with submission=submission %}
- <hr class="hr12">
- <div class="row">
- <div class="col-4">
- <h2>Submission:</h2>
+ {% if submission.referees_flagged %}
+ <h3>Referees flagged upon submission (treat reports with caution):</h3>
+ <p>{{ submission.referees_flagged }}</p>
+ {% endif %}
</div>
- </div>
- {{ submission.header_as_table }}
+</div>
- {% if submission.referees_flagged %}
- <h3>Referees flagged upon submission (treat reports with caution):</h3>
- <p>{{ submission.referees_flagged }}</p>
- {% endif %}
-</section>
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight" id="form">Select an additional Referee</h1>
+ <form action="{% url 'submissions:select_referee' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}#form" method="post">
+ {% csrf_token %}
+ {{ ref_search_form|bootstrap }}
+ <input class="btn btn-secondary" type="submit" value="Find referee">
+ </form>
+ </div>
+</div>
-<section>
- <div class="flex-greybox">
- <h1>Select an additional Referee</h1>
- </div>
- <form action="{% url 'submissions:select_referee' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}" method="post" id="refereeSearch">
- {% csrf_token %}
- {{ ref_search_form }}
- <input type="submit" value="Find referee">
- </form>
-
- {% if queryresults.entries %}
- <div style="background-color: #ffdddd">
- <h3 style="color: red">The system identified the following potential coauthorships (from arXiv database)</h3>
- <p style="color: red">(only up to 5 most recent shown; if within the last 3 years, referee is disqualified):</p>
- <ul>
- {% for entry in queryresults.entries %}
- <li>
- <p><a href="{{ entry.id }}">{{ entry.id }}</a></p>
- <p>{{ entry.title }}</p>
- <p>{% for author in entry.authors %}
- {{ author.name }},
- {% endfor %}
- </p>
- <p>{{ entry.published }}</p>
- </li>
- {% endfor %}
- </ul>
- </div>
- {% endif %}
+{% if queryresults.entries %}
+<div class="row">
+ <div class="col-12">
+ <div class="card card-outline-danger">
+ <div class="card-block">
+ <h3 class="card-title text-danger">The system identified the following potential coauthorships (from arXiv database)</h3>
+ <p class="card-text text-danger">(only up to 5 most recent shown; if within the last 3 years, referee is disqualified):</p>
+ </div>
+ <div class="card-block">
+ <ul class="list-group list-group-flush">
+ {% for entry in queryresults.entries %}
+ <li class="list-group-item">
+ {% include 'submissions/_arxiv_queryresult.html' with item=entry %}
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>
+{% endif %}
- {% if contributors_found %}
- <h3>Identified as contributor:</h3>
- <table>
+{% if contributors_found %}
+ <h3>Identified as contributor:</h3>
+ <table>
{% for contributor in contributors_found %}
<tr><td>{{ contributor.user.first_name }} {{ contributor.user.last_name }}</td><td> </td>
- <td><a href="{% url 'submissions:send_refereeing_invitation' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr contributor_id=contributor.id %}">Send refereeing invitation</a></td></tr>
+ <td><a href="{% url 'submissions:send_refereeing_invitation' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr contributor_id=contributor.id %}">Send refereeing invitation</a></td></tr>
{% endfor %}
- </table>
- {% elif ref_search_form.has_changed %}
- <p>No Contributor with this last name could be identified.</p>
- {% endif %}
- <br/>
- <p>You can send a registration and refereeing invitation by filling this form:</p>
- <form action="{% url 'submissions:recruit_referee' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}" method="post">
- {% csrf_token %}
- {% load crispy_forms_tags %}
- {% crispy ref_recruit_form %}
- </form>
-</section>
+ </table>
+ {% elif ref_search_form.has_changed %}
+ <p>No Contributor with this last name could be identified.</p>
+{% endif %}
+
+
+<div class="row">
+ <div class="col-12">
+ <p>You can send a registration and refereeing invitation by filling this form:</p>
+ <form action="{% url 'submissions:recruit_referee' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}" method="post">
+ {% csrf_token %}
+ {{ ref_recruit_form|bootstrap }}
+ <input type="submit" name="submit" value="Send invitation" class="btn btn-primary">
+ </form>
+ </div>
+</div>
-{% endblock bodysup %}
+{% endblock %}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 1c991586d4650c5b19e02382f95c9cce9cb1854c..c10ff311dbc77527b3a1fd60c593d843f299b907 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -42,9 +42,9 @@
<div class="card-block">
<h1>SciPost Submission Page</h1>
{% if not submission.is_current %}
- <h3 style="color: red;">This is not the current version.</h3>
+ <h3 class="text-danger">This is not the current version.</h3>
{% endif %}
- {% if user.contributor == submission.editor_in_charge %}
+ {% if submission.editor_in_charge and request.user.contributor == submission.editor_in_charge %}
<h3>(You are the Editor-in-charge, go to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions)</h3>
{% endif %}
</div>
diff --git a/submissions/templates/submissions/submissions_by_status.html b/submissions/templates/submissions/submissions_by_status.html
index 260620dec68e83973eb23b1916aa969299c4545c..f6e10422fd989f7627f263ff9e8d2659901ec62c 100644
--- a/submissions/templates/submissions/submissions_by_status.html
+++ b/submissions/templates/submissions/submissions_by_status.html
@@ -1,4 +1,4 @@
-{% extends 'scipost/base.html' %}
+{% extends 'submissions/_pool_base.html' %}
{% load guardian_tags %}
{% load scipost_extras %}
@@ -6,11 +6,18 @@
{% block pagetitle %}: Submissions by status{% endblock pagetitle %}
+{% block breadcrumb_items %}
+ {{block.super}}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ <span class="breadcrumb-item">Status: {{status}}</span>
+{% endblock %}
+
{% block content %}
+{% with is_ECAdmin=request.user|is_in_group:'Editorial Administrators' %}
<div class="row">
<div class="col-12">
- <h1 class="highlight">SciPost Submissions with status {{ submissions_of_status.first.get_status_display }}</h1>
+ <h1 class="highlight">SciPost Submissions with status {{status}}</h1>
</div>
</div>
@@ -19,10 +26,11 @@
<!-- Submissions list -->
{% for sub in submissions_of_status %}
<div class="card card-outline-secondary mt-1">
- {% include 'submissions/_submission_card_in_pool.html' with submission=sub remark_form=remark_form %}
+ {% include 'submissions/_submission_card_in_pool.html' with submission=sub remark_form=remark_form is_ECAdmin=is_ECAdmin %}
</div>
{% endfor %}
</div>
</div>
+{% endwith %}
{% endblock content %}
diff --git a/submissions/templates/submissions/vet_submitted_reports.html b/submissions/templates/submissions/vet_submitted_reports.html
index d545a3b09ebd6488f70b8ce3632a806e9b6c2c98..d8fe13476f55abced58e18b00decfd07cbd72976 100644
--- a/submissions/templates/submissions/vet_submitted_reports.html
+++ b/submissions/templates/submissions/vet_submitted_reports.html
@@ -1,4 +1,4 @@
-{% extends 'scipost/base.html' %}
+{% extends 'submissions/_pool_base.html' %}
{% block pagetitle %}: vet reports{% endblock pagetitle %}
@@ -24,6 +24,12 @@ $(document).ready(function(){
{% endblock headsup %}
+{% block breadcrumb_items %}
+ {{block.super}}
+ <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+ <span class="breadcrumb-item">Vet Reports</span>
+{% endblock %}
+
{% block content %}
<div class="row">
diff --git a/submissions/views.py b/submissions/views.py
index 7a95c7025a7270d9d4cf9e56b03a49ff3c557b4b..2e28d88ef2d30f64a3c7f2df08b0f5f1ad0139be 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1,6 +1,7 @@
import datetime
import feedparser
+from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.auth.models import Group
from django.core.exceptions import PermissionDenied
@@ -342,7 +343,8 @@ def pool(request):
to publication acceptance or rejection.
All members of the Editorial College have access.
"""
- submissions_in_pool = Submission.objects.get_pool(request.user)
+ submissions_in_pool = (Submission.objects.get_pool(request.user)
+ .prefetch_related('refereeinvitation_set', 'remark_set', 'comment_set'))
recommendations_undergoing_voting = (EICRecommendation.objects
.get_for_user_in_pool(request.user)
.filter(submission__status__in=['put_to_EC_voting']))
@@ -379,7 +381,8 @@ def pool(request):
@login_required
@permission_required('scipost.can_view_pool', raise_exception=True)
def submissions_by_status(request, status):
- if status not in dict(SUBMISSION_STATUS).keys():
+ status_dict = dict(SUBMISSION_STATUS)
+ if status not in status_dict.keys():
errormessage = 'Unknown status.'
return render(request, 'scipost/error.html', {'errormessage': errormessage})
submissions_of_status = (Submission.objects.get_pool(request.user)
@@ -387,6 +390,7 @@ def submissions_by_status(request, status):
context = {
'submissions_of_status': submissions_of_status,
+ 'status': status_dict[status],
'remark_form': RemarkForm()
}
return render(request, 'submissions/submissions_by_status.html', context)
@@ -1171,8 +1175,9 @@ def prepare_for_voting(request, rec_id):
recommendation.save()
recommendation.submission.status = 'put_to_EC_voting'
recommendation.submission.save()
- return render(request, 'scipost/acknowledgement.html',
- context={'ack_message': 'We have registered your selection.'})
+ messages.success(request, 'We have registered your selection.')
+ return redirect(reverse('submissions:editorial_page',
+ args=[recommendation.submission.arxiv_identifier_w_vn_nr]))
else:
# Identify possible co-authorships in last 3 years, disqualifying Fellow from voting:
if recommendation.submission.metadata is not None: