diff --git a/journals/models.py b/journals/models.py
index 28a3404ae7271c2361979d9cb2a1ca13672207a8..c0747db2a26d169784dd4afc747bec195f08b618 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -123,7 +123,6 @@ class Publication(models.Model):
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)
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/_base.html b/journals/templates/journals/_base.html
index 4e2522bd0cd7e8c4439e59498dfe7a597d12bebb..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 %}
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/_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..537cdffcae1ed8f9c50be9d86237f2baeb54a625 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,322 @@
{% 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">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>
- {% 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>
+ {% for rec in recommendations_undergoing_voting %}
+ {% if not forloop.first %}
+ <hr>
+ {% endif %}
- <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="row">
+ <div class="col-12">
+ <div class="card card-outline-secondary">
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
+ </div>
- {% 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 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 %}
+
+ <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="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 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="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 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_to_prepare_for_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 %}
+
+ <!-- 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..def94b0e4949850f24b5bd6499d01ed8d43db0a9 100644
--- a/submissions/templates/submissions/prepare_for_voting.html
+++ b/submissions/templates/submissions/prepare_for_voting.html
@@ -1,101 +1,106 @@
-{% 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 b077b09f3e16c28cb30179bd6d1bf2c402340c03..c10ff311dbc77527b3a1fd60c593d843f299b907 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -42,7 +42,7 @@
<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 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>
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..1c82f1e7281768999ae32cec52832213649458e3 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -342,7 +342,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 +380,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 +389,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)