diff --git a/commentaries/templates/commentaries/vet_commentary_requests.html b/commentaries/templates/commentaries/vet_commentary_requests.html
index e6c77048113d89bf60598f70b270c15e25022a67..054c8bf06782c6dc32128bace37b2e33a6ffc176 100644
--- a/commentaries/templates/commentaries/vet_commentary_requests.html
+++ b/commentaries/templates/commentaries/vet_commentary_requests.html
@@ -11,31 +11,27 @@
{% block content %}
-<div class="row">
- <div class="col-12">
- {% if not commentary_to_vet %}
- <h1>There are no Commentary Page requests for you to vet.</h1>
- <h3><a href="{% url 'scipost:personal_page' %}">Return to personal page</a></h3>
- {% else %}
- <h1>SciPost Commentary Page request to vet:</h1>
-
- <hr>
- <div class="row">
- <div class="col-md-7">
- {% include 'commentaries/_commentary_summary.html' with commentary=commentary_to_vet %}
- <h3 class="mt-4">Abstract:</h3>
- <p>{{ commentary_to_vet.pub_abstract }}</p>
-
- </div>
- <div class="col-md-5">
- <form action="{% url 'commentaries:vet_commentary_requests_submit' commentary_id=commentary_to_vet.id %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input type="submit" class="btn btn-secondary" value="Submit" />
- </div>
- </div>
- {% endif %}
+{% if not commentary_to_vet %}
+ <h1>There are no Commentary Page requests for you to vet.</h1>
+ <h3><a href="{% url 'scipost:personal_page' %}">Return to personal page</a></h3>
+{% else %}
+ <h1 class="highlight">SciPost Commentary Page request to vet:</h1>
+
+
+ <div class="card">
+ <div class="card-body">
+ {% include 'commentaries/_commentary_summary.html' with commentary=commentary_to_vet %}
+ <h3 class="mt-4">Abstract:</h3>
+ <p>{{ commentary_to_vet.pub_abstract }}</p>
+
+ </div>
+ <div class="card-body">
+ <form action="{% url 'commentaries:vet_commentary_requests_submit' commentary_id=commentary_to_vet.id %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input type="submit" class="btn btn-primary" value="Submit" />
</div>
-</div>
+ </div>
+{% endif %}
{% endblock %}
diff --git a/comments/templates/comments/vet_submitted_comments.html b/comments/templates/comments/vet_submitted_comments.html
index 1854a83999f2c64849f4791ee3840077fa8c6e57..e53caae093879d9c9f61ab201d86ba90e82eed2f 100644
--- a/comments/templates/comments/vet_submitted_comments.html
+++ b/comments/templates/comments/vet_submitted_comments.html
@@ -14,83 +14,20 @@
{% block content %}
{% if not comments_to_vet %}
-<div class="row">
- <div class="col-12">
- <h1>There are no comments for you to vet.</h1>
- <h3><a href="{% url 'scipost:personal_page' %}">Return to personal page</a></h3>
+ <div class="row">
+ <div class="col-12">
+ <h1>There are no comments for you to vet.</h1>
+ <h3><a href="{% url 'scipost:personal_page' %}">Return to personal page</a></h3>
+ </div>
</div>
-</div>
{% else %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">SciPost Comments to vet:</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- {% for comment_to_vet in comments_to_vet %}
- <div class="card card-vetting">
- <div class="card-header">
-
- {% if comment_to_vet.commentary %}
- <h2>From Commentary (<a href="{% url 'commentaries:commentary' arxiv_or_DOI_string=comment_to_vet.commentary.arxiv_or_DOI_string %}">link</a>)</h2>
- {% include 'commentaries/_commentary_summary.html' with commentary=comment_to_vet.commentary %}
- {% endif %}
-
- {% if comment_to_vet.submission %}
- <h2>From Submission (<a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=comment_to_vet.submission.arxiv_identifier_w_vn_nr %}">link</a>)</h2>
- {% include 'submissions/_submission_summary_short.html' with submission=comment_to_vet.submission %}
- {% endif %}
- {% if comment_to_vet.thesislink %}
- <h2>From Thesis Link (<a href="{% url 'theses:thesis' comment_to_vet.thesislink.id %}">link</a>)</h2>
- {% include 'theses/_thesislink_information.html' with thesislink=comment_to_vet.thesislink %}
- {% endif %}
- </div>
- <div class="card-body">
+ <h1 class="highlight">SciPost Comments to vet:</h1>
- <h2 class="card-title">The Comment to be vetted:</h2>
+ {% for comment_to_vet in comments_to_vet %}
+ {% include 'comments/_vet_comment_form.html' with comment=comment_to_vet form=form %}
+ {% endfor %}
- <div class="row">
- <div class="col-md-6">
- {% include 'comments/_comment_identifier_vetting.html' with comment=comment_to_vet %}
- <hr class="small">
-
- <h3>Comment text:</h3>
- <p>{{ comment_to_vet.comment_text }}</p>
-
- {% if comment_to_vet.file_attachment %}
- <h3>Attachment:</h3>
- <p>
- <a target="_blank" href="{{ comment_to_vet.file_attachment.url }}">
- {% if comment_to_vet.file_attachment|is_image %}
- <img class="attachment attachment-comment" src="{{ comment_to_vet.file_attachment.url }}">
- {% else %}
- {{ comment_to_vet.file_attachment|filename }}<br><small>{{ comment_to_vet.file_attachment.size|filesizeformat }}</small>
- {% endif %}
- </a>
- </p>
- {% endif %}
-
- {% if comment_to_vet.remarks_for_editors %}
- <h3>Remarks for Editors only:</h3>
- <p>{{ comment_to_vet.remarks_for_editors }}</p>
- {% endif %}
- </div>
- <div class="col-md-6">
- <form action="{% url 'comments:vet_submitted_comment_ack' comment_id=comment_to_vet.id %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Submit" />
- </form>
- </div>
- </div>
- </div>
- </div>
- {% endfor %}
- </div>
-</div>
{% endif %}
{% endblock content %}
diff --git a/comments/templates/comments/vet_submitted_comments_list.html b/comments/templates/comments/vet_submitted_comments_list.html
deleted file mode 100644
index d58676554085260383dffe0c957a9578d7821357..0000000000000000000000000000000000000000
--- a/comments/templates/comments/vet_submitted_comments_list.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% block pagetitle %}: vet comments{% endblock pagetitle %}
-
-{% block content %}
-
-{% if not comments_to_vet %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">There are no comments for you to vet.</h1>
- </div>
-</div>
-{% else %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">SciPost Comments to vet:</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- {% for comment_to_vet in comments_to_vet %}
- {% include 'comments/_vet_comment_form.html' with comment=comment_to_vet form=form %}
- {% endfor %}
- </div>
-</div>
-{% endif %}
-
-{% endblock content %}
diff --git a/comments/views.py b/comments/views.py
index e4c909d39fca62cefd2dd7360672ce3291a789f8..97ec52a69e630c34b349003b46ea59048fb84afe 100644
--- a/comments/views.py
+++ b/comments/views.py
@@ -53,7 +53,7 @@ def vet_submitted_comments_list(request):
comments_to_vet = Comment.objects.awaiting_vetting().order_by('date_submitted')
form = VetCommentForm()
context = {'comments_to_vet': comments_to_vet, 'form': form}
- return(render(request, 'comments/vet_submitted_comments_list.html', context))
+ return(render(request, 'comments/vet_submitted_comments.html', context))
@login_required
diff --git a/scipost/templates/scipost/Fellow_activity_overview.html b/scipost/templates/scipost/Fellow_activity_overview.html
index e0515b48661fb8c87c7b2ca09f9a77260b286238..5b5ecac15bc8c0fa3e400575f5c2aad4aef99ae5 100644
--- a/scipost/templates/scipost/Fellow_activity_overview.html
+++ b/scipost/templates/scipost/Fellow_activity_overview.html
@@ -19,10 +19,9 @@
</div>
</div>
-<div class="row">
- <div class="col-12">
- <table class="assignments_listing w-100">
- <thead>
+<table class="assignments_listing w-100">
+ <thead class="">
+ <tr>
<th>Name</th>
<th>Expertises</th>
<th>Ongoing</th>
@@ -31,20 +30,19 @@
<th>Refused<br/>last yr / tot</th>
<th>Ignored<br/>last yr / tot</th>
<th>Fulfilled<br/>last yr / tot</th>
- </thead>
- <tbody>
- {% for fellow in fellows %}
- <tr>
- <td>
- <a href="{% url 'scipost:Fellow_activity_overview' %}?fellow={{fellow.id}}">{{ fellow.user.last_name }}, {{ fellow.user.first_name }}</a>
- </td>
- {% include 'partials/scipost/contributor_assignments_as_td.html' with contributor=fellow %}
- </tr>
- {% endfor %}
- </tbody>
- </table>
- </div>
-</div>
+ </tr>
+ </thead>
+ <tbody>
+ {% for fellow in fellows %}
+ <tr>
+ <td>
+ <a href="{% url 'scipost:Fellow_activity_overview' %}?fellow={{fellow.id}}">{{ fellow.user.last_name }}, {{ fellow.user.first_name }}</a>
+ </td>
+ {% include 'partials/scipost/contributor_assignments_as_td.html' with contributor=fellow %}
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
{% if fellow %}
<div class="row">
diff --git a/scipost/templates/scipost/vet_authorship_claims.html b/scipost/templates/scipost/vet_authorship_claims.html
index 54711cdaa79a973b44afc7c8b825d5830167b1e0..b22cb86df6c58e67e4b916efa33a435e0e6557c6 100644
--- a/scipost/templates/scipost/vet_authorship_claims.html
+++ b/scipost/templates/scipost/vet_authorship_claims.html
@@ -26,16 +26,12 @@
</div>
{% else %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Vet Authorship Claims</h1>
- </div>
-</div>
+<h1 class="highlight">Vet Authorship Claims</h1>
- <ul class="list-group list-group-flush">
+ {# <ul class="list-group list-group-flush">#}
{% for claim in claims_to_vet %}
- <li class="list-unstyled">
- <div class="card w-100">
+ {# <li class="list-group-item">#}
+ <div class="card ">
{% if claim.publication %}
<div class="card-header">
<h4>Contributor {{ claim.claimant.user.first_name }} {{ claim.claimant.user.last_name }} claims to be an author of Publication:</h4>
@@ -45,7 +41,9 @@
<div class="card-header">
<h4>Contributor {{ claim.claimant.user.first_name }} {{ claim.claimant.user.last_name }} claims to be an author of Submission:</h4>
</div>
- {% include 'submissions/_submission_card_content.html' with submission=claim.submission %}
+ <div class="card-body">
+ {% include 'submissions/_submission_card_content.html' with submission=claim.submission %}
+ </div>
{% elif claim.commentary %}
<div class="card-header">
<h4>Contributor {{ claim.claimant.user.first_name }} {{ claim.claimant.user.last_name }} claims to be an author of Commentary:</h4>
@@ -60,17 +58,17 @@
<div class="card-footer">
<form class="d-inline-block" action="{% url 'scipost:vet_authorship_claim' claim_id=claim.id claim=1%}" method="post">
{% csrf_token %}
- <input class="btn btn-secondary" type="submit" value="Accept" />
+ <input class="btn btn-secondary px-3" type="submit" value="Accept" />
</form>
<form class="d-inline-block ml-1" action="{% url 'scipost:vet_authorship_claim' claim_id=claim.id claim=0%}" method="post">
{% csrf_token %}
- <input class="btn btn-danger" type="submit" value="Deny" />
+ <input class="btn btn-danger px-3" type="submit" value="Deny" />
</form>
</div>
</div>
- </li>
+ {# </li>#}
{% endfor %}
- </ul>
+ {# </ul>#}
{% endif %}
diff --git a/submissions/templates/partials/submissions/pool/submission_assignment_request.html b/submissions/templates/partials/submissions/pool/submission_assignment_request.html
new file mode 100644
index 0000000000000000000000000000000000000000..4a96fa72d300958b7de5768b244a8ccd0ba72349
--- /dev/null
+++ b/submissions/templates/partials/submissions/pool/submission_assignment_request.html
@@ -0,0 +1,37 @@
+{% load bootstrap %}
+
+
+{% include 'submissions/_submission_summary.html' with submission=assignment.submission %}
+
+<h2 class="highlight">Accept or Decline this Assignment</h2>
+<h3 class="mb-2">By accepting, you will be required to start a refereeing round on the next screen.</h3>
+
+<form action="{% url 'submissions:assignment_request' assignment_id=assignment.id %}" method="post">
+ {% csrf_token %}
+ <div class="form-group row">
+ <div class="col-12">
+ {{ consider_assignment_form.accept|bootstrap:'0,12' }}
+ </div>
+ </div>
+ <div class="row" id="ref_reason">
+ <div class="col-12">
+ <p>Please select a reason for declining this assignment</p>
+ {{ consider_assignment_form.refusal_reason|bootstrap:'0,12' }}
+ </div>
+ </div>
+ <input class="btn btn-primary" type="submit" value="Submit" />
+</form>
+
+
+<script>
+ $(function() {
+ $('[name="accept"]').on('change', function() {
+ var val = $('[name="accept"]:checked').val();
+ if(val == 'True') {
+ $('#ref_reason').hide();
+ } else {
+ $('#ref_reason').show();
+ }
+ }).trigger('change');
+ });
+</script>
diff --git a/submissions/templates/submissions/_recommendation_author_content.html b/submissions/templates/submissions/_recommendation_author_content.html
index abfa95c3d32325ed7ad3eeaa56221bb539421f58..d1f4e69cab3d821efa589ee0f8635c866cb3d4b2 100644
--- a/submissions/templates/submissions/_recommendation_author_content.html
+++ b/submissions/templates/submissions/_recommendation_author_content.html
@@ -1,18 +1,20 @@
-<div class="card-body">
- <h2 class="pb-0 mb-0">Editorial Recommendation</h2>
+<div class="card">
+ <div class="card-body">
+ <h2 class="pb-0 mb-0">Editorial Recommendation</h2>
- {% block recommendation_header %}
- <h3 class="card-title text-muted">Date {{recommendation.date_submitted}}</h3>
- {% endblock %}
+ {% block recommendation_header %}
+ <h3 class="card-title text-muted">Date {{recommendation.date_submitted}}</h3>
+ {% endblock %}
- <h3 class="pb-0">Remarks for authors</h3>
- <p class="pl-md-3">{{recommendation.remarks_for_authors|default:'-'}}</p>
+ <h3 class="pb-0">Remarks for authors</h3>
+ <p class="pl-md-3">{{recommendation.remarks_for_authors|default:'-'}}</p>
- <h3 class="pb-0">Requested changes</h3>
- <p class="pl-md-3">{{recommendation.requested_changes|default:'-'}}</p>
+ <h3 class="pb-0">Requested changes</h3>
+ <p class="pl-md-3">{{recommendation.requested_changes|default:'-'}}</p>
- {% block recommendation_before_recommendation %}{% endblock %}
+ {% block recommendation_before_recommendation %}{% endblock %}
- <h3 class="pb-0">Recommendation</h3>
- <p class="pl-md-3 mb-0">{{recommendation.get_recommendation_display}}</p>
+ <h3 class="pb-0">Recommendation</h3>
+ <p class="pl-md-3 mb-0">{{recommendation.get_recommendation_display}}</p>
+ </div>
</div>
diff --git a/submissions/templates/submissions/_single_public_report_without_comments.html b/submissions/templates/submissions/_single_public_report_without_comments.html
index 8ffeb8b8f6f1e06bec568d9447ea72492154c18f..5f0a3cf451b00d72550a7e9da77a25270fbf617c 100644
--- a/submissions/templates/submissions/_single_public_report_without_comments.html
+++ b/submissions/templates/submissions/_single_public_report_without_comments.html
@@ -10,16 +10,16 @@
<h3>{% if report.anonymous %}(chose public anonymity) {% endif %}<a href="{{report.author.get_absolute_url}}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>
on {{ report.date_submitted|date:'Y-n-j' }}
</h3>
- <ul class="publicationClickables">
- {% if report.doi_string %}<li>doi: {{ report.doi_string }}</li>{% endif %}
- {% if report.pdf_report %}
- <li><a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a></li>
- {% endif %}
- {% if perms.scipost.can_manage_reports %}
- <li><a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a></li>
- {% endif %}
- </ul>
-</div>
+ <ul class="publicationClickables">
+ {% if report.doi_string %}<li>doi: {{ report.doi_string }}</li>{% endif %}
+ {% if report.pdf_report %}
+ <li><a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_reports %}
+ <li><a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a></li>
+ {% endif %}
+ </ul>
+ </div>
{% if report.flagged %}
<h4 class="text-danger font-weight-bold">CAUTION: check if this referee has been flagged by the authors</h4>
@@ -52,15 +52,15 @@
<h3>{% if report.anonymous %}Anonymous Report {{report.report_nr}}{% else %}<a href="{{report.author.get_absolute_url}}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>{% endif %}
on {{ report.date_submitted|date:'Y-n-j' }}</h3>
</h3>
- <ul class="publicationClickables">
- {% if report.doi_string %}<li>doi: {{ report.doi_string }}</li>{% endif %}
- {% if report.pdf_report %}
- <li><a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a></li>
- {% endif %}
- {% if perms.scipost.can_manage_reports %}
- <li><a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a></li>
- {% endif %}
- </ul>
+ <ul class="publicationClickables">
+ {% if report.doi_string %}<li>doi: {{ report.doi_string }}</li>{% endif %}
+ {% if report.pdf_report %}
+ <li><a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_reports %}
+ <li><a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a></li>
+ {% endif %}
+ </ul>
</div>
{% include 'submissions/_single_report_content.html' with report=report %}
diff --git a/submissions/templates/submissions/_submission_assignment_request.html b/submissions/templates/submissions/_submission_assignment_request.html
deleted file mode 100644
index 4f274474ef169f87858842bf39fdadcec8618868..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_assignment_request.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% load bootstrap %}
-
-<div class="card-body">
- {% include 'submissions/_submission_summary.html' with submission=assignment.submission %}
- <br />
-</div>
-<div class="card-footer">
- <h1>Accept or Decline this Assignment</h1>
- <h3 class="mb-2">By accepting, you will be required to start a refereeing round on the next screen.</h3>
-
- <form action="{% url 'submissions:assignment_request' assignment_id=assignment.id %}" method="post">
- {% csrf_token %}
- <div class="form-group row">
- <div class="col-12">
- {{ consider_assignment_form.accept }}
- </div>
- </div>
- <div class="row" id="ref_reason">
- <div class="col-12">
- <p>Please select a reason for declining this assignment</p>
- {{ consider_assignment_form.refusal_reason|bootstrap:'0,12' }}
- </div>
- </div>
- <input class="btn btn-secondary" type="submit" value="Submit" />
- </form>
-</div>
diff --git a/submissions/templates/submissions/_submission_card_base.html b/submissions/templates/submissions/_submission_card_base.html
index a9eb8cdba588f7f64360ad172ae0b56e45b01499..1d3be2c52c30e32892f05b473ad70a2ce46991b3 100644
--- a/submissions/templates/submissions/_submission_card_base.html
+++ b/submissions/templates/submissions/_submission_card_base.html
@@ -1,11 +1,8 @@
-<div class="card-body {% block cardblock_class_block %}{% endblock %} {{ cardblock_class }}">
-
- <div class="submission_title">
- <h5 class="pb-0">{{submission.get_subject_area_display}}</h5>
- <h3 class="card-title {% block title_class_block %}{% endblock %}">
- <a href="{{submission.get_absolute_url}}">{{submission.title}}</a>
- </h3>
- </div>
-
- {% block card_block_footer %}{% endblock %}
+<div class="submission_title">
+ <h5 class="pb-0">{{submission.get_subject_area_display}}</h5>
+ <h3 class="card-title {% block title_class_block %}{% endblock %}">
+ <a href="{{submission.get_absolute_url}}">{{submission.title}}</a>
+ </h3>
</div>
+
+{% block card_block_footer %}{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_fellow_content.html b/submissions/templates/submissions/_submission_card_fellow_content.html
index 3366946fb203e69221a20e44a718d536e6b52cf0..bbf4abf84b79b620a577f01a9acdbb2ed243beb8 100644
--- a/submissions/templates/submissions/_submission_card_fellow_content.html
+++ b/submissions/templates/submissions/_submission_card_fellow_content.html
@@ -1,7 +1,7 @@
{% extends 'submissions/_submission_card_base.html' %}
{% block card_block_footer %}
- <p class="card-text mb-3 author_list">by {{submission.author_list}}</p>
+ <p class="mb-3 author_list">by {{submission.author_list}}</p>
<table class="text-muted w-100 mb-1">
<tr>
diff --git a/submissions/templates/submissions/admin/eic_recommendation_detail.html b/submissions/templates/submissions/admin/eic_recommendation_detail.html
deleted file mode 100644
index f23a39ca8801f4f05d342ea65aab60d0368eaa4e..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/admin/eic_recommendation_detail.html
+++ /dev/null
@@ -1,93 +0,0 @@
-{% extends 'submissions/admin/base.html' %}
-
-{% block pagetitle %}: editorial recommendation for submission{% endblock pagetitle %}
-
-{% load scipost_extras %}
-{% load bootstrap %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Editorial Recommendation</span>
-{% endblock %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h1 class="card-title">Editorial Recommendation for Submission</h1>
- <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>
-
-<h2>Submission</h2>
-{% include 'submissions/_submission_summary.html' with submission=submission %}
-
-<div class="card card-outline-secondary">
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
- <div class="card-body">
- {% if object.remarks.all %}
- <h3 class="card-title">Remarks by Fellows:</h3>
- <ul>
- {% for remark in object.remarks.all|sort_by:'date' %}
- {% include 'partials/submissions/remark_as_li.html' with remark=remark %}
- {% endfor %}
- </ul>
- {% endif %}
-
- <h3 class="card-title">Fellows eligible to vote:</h3>
- <ul>
- <li>
- {% for eligible in object.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: ({{ object.voted_for.all.count }})
- {% for agreed in object.voted_for.all|sort_by:'user__last_name' %}
- {{ agreed.user.last_name }},
- {% endfor %}
- </li>
- <li>
- Disagreed: ({{ object.voted_against.all.count }})
- {% for disagreed in object.voted_against.all|sort_by:'user__last_name' %}
- {{ disagreed.user.last_name }},
- {% endfor %}
- </li>
- <li>
- Abstained: ({{ object.voted_abstain.all.count }})
- {% for abstained in object.voted_abstain.all|sort_by:'user__last_name' %}
- {{ abstained.user.last_name }},
- {% endfor %}
- </li>
- </ul>
-
- {% if object.remarks %}
- <h3 class="card-title">Remarks:</h3>
- <ul>
- {% for rem in object.remarks.all %}
- <li>{{ rem }}</li>
- {% empty %}
- <li><em>No remarks</em></li>
- {% endfor %}
- </ul>
- {% endif %}
-
- <h3>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=object.id %}">click here</a></li>
- <li>To request a modification of the Recommendation to request for revision: click here</li>
- </ul>
- </div>
-</div>
-{% endblock content %}
diff --git a/submissions/templates/submissions/admin/recommendation.html b/submissions/templates/submissions/admin/recommendation.html
index 43deb3def36289814b0ac16ef1e4d9e243765929..e40ed8c0d607cd2c7b64c1f19981d2a5bff09bd1 100644
--- a/submissions/templates/submissions/admin/recommendation.html
+++ b/submissions/templates/submissions/admin/recommendation.html
@@ -13,49 +13,50 @@
{% block content %}
<h1 class="highlight">Editorial Recommendation</h1>
- <div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content.html' with submission=object.submission %}
- </div>
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=object.submission %}
+
+ <br>
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
- <div class="card card-outline-secondary">
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
+ <br>
+ <div class="card">
<div class="card-body">
{% if object.remarks.exists %}
<h3 class="card-title">Remarks by Fellows:</h3>
<ul>
{% for remark in object.remarks.all|sort_by:'date' %}
{% include 'partials/submissions/remark_as_li.html' with remark=remark %}
+ {% empty %}
+ <li>No Remarks found.</li>
{% endfor %}
</ul>
{% endif %}
<h3 class="card-title">Fellows eligible to vote:</h3>
<ul>
- <li>
- {% for eligible in object.eligible_to_vote.all|sort_by:'user__last_name' %}
- {{ eligible.user.last_name }},
- {% endfor %}
- </li>
+ {% for eligible in object.eligible_to_vote.all|sort_by:'user__last_name' %}
+ <li>{{ eligible.user.first_name }} {{ eligible.user.last_name }}</li>
+ {% endfor %}
</ul>
<h3 class="card-title">Voting results up to now:</h3>
<ul>
<li>
- Agreed: ({{ object.voted_for.all.count }})
+ Agreed ({{ object.voted_for.all.count }}):
{% for agreed in object.voted_for.all|sort_by:'user__last_name' %}
- {{ agreed.user.last_name }},
+ {{ agreed.user.last_name }}{% if not forloop.last %},{% endif %}
{% endfor %}
</li>
<li>
- Disagreed: ({{ object.voted_against.all.count }})
+ Disagreed ({{ object.voted_against.all.count }}):
{% for disagreed in object.voted_against.all|sort_by:'user__last_name' %}
- {{ disagreed.user.last_name }},
+ {{ disagreed.user.last_name }}{% if not forloop.last %},{% endif %}
{% endfor %}
</li>
<li>
- Abstained: ({{ object.voted_abstain.all.count }})
+ Abstained ({{ object.voted_abstain.all.count }}):
{% for abstained in object.voted_abstain.all|sort_by:'user__last_name' %}
- {{ abstained.user.last_name }},
+ {{ abstained.user.last_name }}{% if not forloop.last %},{% endif %}
{% endfor %}
</li>
</ul>
@@ -71,9 +72,9 @@
</ul>
{% endif %}
</div>
- <div class="card-footer">
+ <div class="card-footer bg-light py-3">
<h3 class="card-title">Administrative actions on recommendations undergoing voting:</h3>
- <ul>
+ <ul class="mb-0">
<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>
<li>To fix the College decision and follow the Editorial Recommendation as is: <a href="{% url 'submissions:fix_College_decision' rec_id=object.id %}">click here</a></li>
<li>To request a modification of the Recommendation to request for revision: click here</li>
diff --git a/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html b/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
new file mode 100644
index 0000000000000000000000000000000000000000..2bfa56868b03435e2173d7a86be6077b7728a660
--- /dev/null
+++ b/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
@@ -0,0 +1,79 @@
+{% extends 'submissions/admin/base.html' %}
+
+{% block pagetitle %}: Prepare Editorial Recommendation for voting{% endblock pagetitle %}
+
+{% load scipost_extras %}
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+ {{block.super}}
+ <span class="breadcrumb-item">Prepare Editorial Recommendation for voting</span>
+{% endblock %}
+
+{% block content %}
+
+<h1 class="highlight">Prepare Editorial Recommendation for Voting</h1>
+
+{% include 'submissions/_submission_card_fellow_content.html' with submission=recommendation.submission %}
+
+<br>
+{% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
+
+{% if recommendation.submission.referees_flagged %}
+ <br>
+ <h3>Referees flagged upon submission (treat reports with caution):</h3>
+ <p>{{ recommendation.submission.referees_flagged|linebreaksbr }}</p>
+{% endif %}
+
+<br>
+<h2 class="highlight">Select Fellows eligible to vote</h2>
+<div class="row">
+ <div class="col-md-5">
+ <p>Fellows with expertise matching the Submission's subject area:</p>
+ <ul>
+ {% for fellow in fellows_with_expertise %}
+ <li>{{ fellow.contributor.user.first_name }} {{ fellow.contributor.user.last_name }}</li>
+ {% endfor %}
+ </ul>
+ </div>
+ <div class="col-md-7">
+ <form action="{% url 'submissions:prepare_for_voting' rec_id=recommendation.id %}" method="post">
+ {% csrf_token %}
+ {{ eligibility_form|bootstrap:'4,8' }}
+ <input class="btn btn-primary" 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-body">
+ <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-body">
+ <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 %}
diff --git a/submissions/templates/submissions/admin/refereeing_overview.html b/submissions/templates/submissions/admin/refereeing_overview.html
new file mode 100644
index 0000000000000000000000000000000000000000..398e14c535879434ed3fae731fc7bc8ba1e88f87
--- /dev/null
+++ b/submissions/templates/submissions/admin/refereeing_overview.html
@@ -0,0 +1,41 @@
+{% extends 'submissions/admin/base.html' %}
+
+{% block pagetitle %}: overview of refereeing{% endblock pagetitle %}
+
+{% load scipost_extras %}
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+ {{block.super}}
+ <span class="breadcrumb-item">Refereeing overview</span>
+{% endblock %}
+
+{% block content %}
+
+<h1 class="highlight">Refereeing overview</h1>
+
+{% for submission in submissions_under_refereeing %}
+ {% if not forloop.first %}<hr/>{% endif %}
+
+ <div class="row">
+ <div class="col-12">
+ <h3><a href="{{ submission.get_absolute_url }}">{{ submission.title }}</a></h3>
+ <p>{{ submission.author_list }}</p>
+
+ <div>
+ Editor-in-charge: {{ submission.editor_in_charge }}<br>
+ Refereeing deadline: {{ submission.reporting_deadline }}<br>
+ <br>
+ Refereeing status summary:<br>
+ {% include 'submissions/_submission_refereeing_status.html' with submission=submission %}
+ </div>
+
+ <p class="mb-2">Detail of refereeing invitations:</p>
+ {% include 'submissions/_submission_refereeing_invitations.html' with submission=submission invitations=submission.referee_invitations.all %}
+ <a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='StoE' %}" target="_blank">Send a communication to the Editor-in-charge</a>
+ </div>
+ </div>
+
+{% endfor %}
+
+{% endblock content %}
diff --git a/submissions/templates/submissions/assignments.html b/submissions/templates/submissions/assignments.html
deleted file mode 100644
index e94a003d88658ee021faa3881e201d6d3b16e55e..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/assignments.html
+++ /dev/null
@@ -1,80 +0,0 @@
-{% extends 'submissions/_pool_base.html' %}
-
-{% block pagetitle %}: Assignments{% endblock pagetitle %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
- <span class="breadcrumb-item">Your assignments</span>
-{% endblock %}
-
-{% block content %}
-
-<script>
-$(document).ready(function(){
-
- $('#ref_reason').hide();
-
- $('#id_accept').on('change', function() {
- if ($('#id_accept_1').is(':checked')) {
- $('#ref_reason').show();
- }
- else {
- $('#ref_reason').hide();
- }
- });
-});
-</script>
-
-{% 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>
- </div>
- </div>
- {% endfor %}
-<hr>
-{% endif %}
-
-
-{% if current_assignments %}
- <div class="row">
- <div class="col-12">
- <h1 class="highlight">Your current assignments:</h1>
- </div>
- </div>
- {% for assignment in current_assignments %}
- {% if not forloop.first %}<hr class="small">{% endif %}
- <div class="row ">
- <div class="col-lg-8">
- {% include 'submissions/_submission_card_fellow_content.html' with submission=assignment.submission %}
- </div>
- <div class="col-lg-4">
- {% include 'submissions/_required_actions_block.html' with submission=submission %}
- <h4 class="d-block mt-2">
- <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial Page</a>
- </h4>
- </div>
- </div>
- {% endfor %}
-{% else %}
- <div class="row">
- <div class="col-12">
- <p>You currently have no assignments to take care of.</p>
- </div>
- </div>
-{% endif %}
-
-
-{% endblock content %}
diff --git a/submissions/templates/submissions/communication.html b/submissions/templates/submissions/communication.html
index fa7fcf1a33412b4defc1a730ad2135b989f4ab47..345b299e194ebe8a1543145def237977e6e6b368 100644
--- a/submissions/templates/submissions/communication.html
+++ b/submissions/templates/submissions/communication.html
@@ -1,4 +1,4 @@
-{% extends 'submissions/_pool_base.html' %}
+{% extends 'submissions/pool/base.html' %}
{% block pagetitle %}: communication{% endblock pagetitle %}
@@ -7,7 +7,6 @@
{% 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 %}
@@ -15,38 +14,37 @@
{% block content %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Send a Communication</h1>
+<div class="card card-grey">
+ <div class="card-body">
+ <h1 class="pb-0">Send a Communication</h1>
{% if comtype == 'EtoA' %}
- <p>to the submitting Author of Submission</p>
+ <h3>to the submitting Author of Submission</h3>
{% 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>
+ <h3>to Referee of Submission</h3>
{% elif comtype == 'EtoS' %}
- <p>to SciPost Editorial Administrators</p>
+ <h3>to SciPost Editorial Administrators</h3>
{% endif %}
-
- <div class="card">
- {% include 'submissions/_submission_card_content.html' with submission=submission %}
- </div>
</div>
</div>
+{% include 'submissions/_submission_card_content.html' with submission=submission %}
+
+<br>
<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"/>
+ <input class="btn btn-primary" 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"/>
+ <input class="btn btn-primary" type="submit" value="Send communication"/>
</form>
{% endif %}
</div>
diff --git a/submissions/templates/submissions/editorial_page.html b/submissions/templates/submissions/editorial_page.html
index 770ec03c969d11a3c0e9f4999962ba5da8203300..2d00f95cf92b39b07187ae85627be9a9046c7b2f 100644
--- a/submissions/templates/submissions/editorial_page.html
+++ b/submissions/templates/submissions/editorial_page.html
@@ -1,6 +1,6 @@
-{% extends 'submissions/_pool_base.html' %}
+{% extends 'submissions/pool/base.html' %}
-{% block pagetitle %}: editorial page for submission{% endblock pagetitle %}
+{% block pagetitle %}: Editorial Page for Submission{% endblock pagetitle %}
{% load scipost_extras %}
{% load bootstrap %}
@@ -8,7 +8,6 @@
{% 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 %}
diff --git a/submissions/templates/submissions/eic_recommendation.html b/submissions/templates/submissions/eic_recommendation.html
deleted file mode 100644
index 180b5c17bfc3d82c593b3c6e58764177af43864a..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/eic_recommendation.html
+++ /dev/null
@@ -1,87 +0,0 @@
-{% 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">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h1 class="card-title">Formulate Editorial Recommendation 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>
-
-<div class="row">
- <div class="col-12">
- <h2>Submission</h2>
- {% include 'submissions/_submission_summary.html' with submission=submission %}
- </div>
-</div>
-
-
-<div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h1 class="card-title">Your Editorial Recommendation</h1>
- <p class="card-text">You recommendation will be processed by the Editorial Administration.</p>
- <ul class="mb-0">
- <li>acceptance or rejection: forwarded to the Editorial College for ratification</li>
- <li>request for revision: sent directly to the authors</li>
- </ul>
- </div>
- </div>
- </div>
-</div>
-
-{% if submission.editor_in_charge != request.user.contributor %}
- <div class="row">
- <div class="col-12">
- <div class="card border-danger">
- <div class="card-body d-flex flex-row">
- <div class="p-2">
- <i class="fa fa-2x fa-exclamation-triangle text-warning" aria-hidden="true"></i>
- </div>
- <div class="px-2">
- You are not assigned as Editor in charge. However, you can formulate an Editorial Recommendation because you are Editorial Administrator. <strong>This Editorial Recommendation will still be signed by the Editor-in-charge.</strong>
- </div>
-
- </div>
- </div>
- </div>
- </div>
-{% endif %}
-
-<div class="row">
- <div class="col-12">
- <form action="{% url 'submissions:eic_recommendation' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-secondary" type="submit" value="Submit"/>
- </form>
- </div>
-</div>
-
-
-{% endblock content %}
diff --git a/submissions/templates/submissions/pool.html b/submissions/templates/submissions/pool.html
index af4c97ff48b010362327f1a1b43852224d1f6704..fc8fc6035dfd14d64e5edffb31f63077ed65cfe0 100644
--- a/submissions/templates/submissions/pool.html
+++ b/submissions/templates/submissions/pool.html
@@ -163,7 +163,7 @@
<div class="row">
<div class="col-12">
<div class="card">
- {% include 'submissions/_submission_assignment_request.html' with assignment=assignment_to_consider %}
+ {% include 'partials/submissions/pool/submission_assignment_request.html' with assignment=assignment_to_consider %}
</div>
</div>
</div>
diff --git a/submissions/templates/submissions/pool/assignment_request.html b/submissions/templates/submissions/pool/assignment_request.html
index 2f0b46cde76c735220de426c609285ce8f891ef8..358d9711e69c5a40a4027235ce7eba41e3bea8b0 100644
--- a/submissions/templates/submissions/pool/assignment_request.html
+++ b/submissions/templates/submissions/pool/assignment_request.html
@@ -13,8 +13,15 @@
{% block pagetitle %}: Assignment Request{% endblock pagetitle %}
{% block content %}
- <h1 class="highlight">Assignment request</h1>
- <h3>Can you act as Editor-in-charge? (see below to accept/decline)</h3>
- {% include 'submissions/_submission_assignment_request.html' with assignment=assignment consider_assignment_form=form %}
+<div class="card card-grey">
+ <div class="card-body">
+ <h1>Assignment request</h1>
+ <h3 class="pt-0">Can you act as Editor-in-charge? (see below to accept/decline)</h3>
+ </div>
+</div>
+<br>
+
+{% include 'partials/submissions/pool/submission_assignment_request.html' with assignment=assignment consider_assignment_form=form %}
+
{% endblock %}
diff --git a/submissions/templates/submissions/pool/assignments.html b/submissions/templates/submissions/pool/assignments.html
new file mode 100644
index 0000000000000000000000000000000000000000..c3602200ef5f7804af5aff7ee71a30ed38b2b4d0
--- /dev/null
+++ b/submissions/templates/submissions/pool/assignments.html
@@ -0,0 +1,38 @@
+{% extends 'submissions/pool/base.html' %}
+
+{% block pagetitle %}: Your Assignments{% endblock pagetitle %}
+
+{% block breadcrumb_items %}
+ {{block.super}}
+ <span class="breadcrumb-item">Your Assignments</span>
+{% endblock %}
+
+{% block content %}
+
+{% if assignments_to_consider %}
+ <h1>Your open Assignment Requests <i class="fa fa-exclamation-circle text-warning"></i></h1>
+ <h3 class="pt-0 mb-2">Can you act as Editor-in-charge? (click to see details)</h3>
+ <ul>
+ {% for assignment in assignments_to_consider %}
+ <li>On submission: {{ assignment.submission }}<br>
+ <a href="{% url 'submissions:assignment_request' assignment.id %}">Accept or decline here</a>
+ </li>
+ {% endfor %}
+ </ul>
+{% endif %}
+
+
+<h1 class="highlight">Your current assignments:</h1>
+{% for assignment in current_assignments %}
+ {% if not forloop.first %}<hr class="small">{% endif %}
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=assignment.submission %}
+
+ {% include 'submissions/_required_actions_block.html' with submission=submission %}
+ <h4 class="d-block mt-2">
+ <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial Page</a>
+ </h4>
+{% empty %}
+ <p class="py-2">You currently have no assignments to take care of.</p>
+{% endfor %}
+
+{% endblock content %}
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index d7e0c9b4a58ea51079dbeb1bb755054099a58240..1607a04b15df42d6a004b7d1b9cc40f7413ee628 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -48,7 +48,7 @@
{% for recommendation in recommendations.put_to_voting %}
<li>{% include 'partials/submissions/admin/recommendation_tooltip.html' with classes='fa-li' recommendation=recommendation %}
On Editorial Recommendation: {{ recommendation }}<br>
- <a href="{% url 'submissions:admin_recommendation' recommendation.submission.arxiv_identifier_w_vn_nr %}">See Editorial Recommendation</a>
+ <a href="{% url 'submissions:eic_recommendation_detail' recommendation.submission.arxiv_identifier_w_vn_nr recommendation.id %}">See Editorial Recommendation</a>
</li>
{% endfor %}
</ul>
diff --git a/submissions/templates/submissions/pool/recommendation.html b/submissions/templates/submissions/pool/recommendation.html
index d2c050bbb0c1b3090e5f8c6d83a35bb2c81c6b24..ef62f309a2ef42f741699998540a65663237af6f 100644
--- a/submissions/templates/submissions/pool/recommendation.html
+++ b/submissions/templates/submissions/pool/recommendation.html
@@ -14,16 +14,12 @@
{% include 'submissions/_submission_card_fellow_content.html' with submission=recommendation.submission %}
- {# <div class="card card-outline-secondary">#}
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
- <div class="card-footer">
- <h3>Your position on this recommendation</h3>
- <form action="{% url 'submissions:vote_on_rec' rec_id=recommendation.id %}" method="post">
- {% csrf_token %}
- {{ 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>#}
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
+ <h3 class="mt-4">Your position on this recommendation</h3>
+ <form action="{% url 'submissions:vote_on_rec' rec_id=recommendation.id %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap:'0,12' }}
+ <input type="submit" name="submit" value="Cast your vote" class="btn btn-primary submitButton" id="submit-id-submit">
+ </form>
{% endblock %}
diff --git a/submissions/templates/submissions/pool/recommendation_formulate.html b/submissions/templates/submissions/pool/recommendation_formulate.html
new file mode 100644
index 0000000000000000000000000000000000000000..2ae4a3ce76cf271233f8012359db8eb607af13c7
--- /dev/null
+++ b/submissions/templates/submissions/pool/recommendation_formulate.html
@@ -0,0 +1,64 @@
+{% 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: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 %}
+
+<h1 class="highlight">Formulate Editorial Recommendation for Submission</h1>
+
+<br>
+{% include 'submissions/_submission_summary.html' with submission=submission %}
+
+<br>
+<div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title">Your Editorial Recommendation</h2>
+ <p class="card-text">You recommendation will be processed by the Editorial Administration.</p>
+ <ul class="mb-0">
+ <li>acceptance or rejection: forwarded to the Editorial College for ratification</li>
+ <li>request for revision: sent directly to the authors</li>
+ </ul>
+ </div>
+</div>
+
+{% if submission.editor_in_charge != request.user.contributor %}
+ <div class="row">
+ <div class="col-12">
+ <div class="card border-danger">
+ <div class="card-body d-flex flex-row">
+ <div class="p-2">
+ <i class="fa fa-2x fa-exclamation-triangle text-warning" aria-hidden="true"></i>
+ </div>
+ <div class="px-2">
+ You are not assigned as Editor in charge. However, you can formulate an Editorial Recommendation because you are Editorial Administrator. <strong>This Editorial Recommendation will still be signed by the Editor-in-charge.</strong>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+{% endif %}
+
+<br>
+
+<div class="row">
+ <div class="col-12">
+ <form action="{% url 'submissions:eic_recommendation' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input class="btn btn-primary" type="submit" value="Submit Recommendation"/>
+ </form>
+ </div>
+</div>
+
+
+{% endblock content %}
diff --git a/submissions/templates/submissions/prepare_for_voting.html b/submissions/templates/submissions/prepare_for_voting.html
deleted file mode 100644
index ce9a61aef742d4234b1f147f4e0e2f79e5d97c39..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/prepare_for_voting.html
+++ /dev/null
@@ -1,105 +0,0 @@
-{% extends 'submissions/_pool_base.html' %}
-
-{% block pagetitle %}: prepare recommendation for voting{% 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' 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-body">
- <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>
-
-<div class="row">
- <div class="col-12">
- <h2>Submission:</h2>
- {% include 'submissions/_submission_summary.html' with submission=recommendation.submission %}
-
- {% if recommendation.submission.referees_flagged %}
- <h3>Referees flagged upon submission (treat reports with caution):</h3>
- <p>{{ recommendation.submission.referees_flagged }}</p>
- {% endif %}
- </div>
-</div>
-
-
-
-<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>
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Select Fellows eligible to vote</h1>
- </div>
-</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.contributor.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-body">
- <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-body">
- <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 %}
diff --git a/submissions/templates/submissions/refereeing_overview.html b/submissions/templates/submissions/refereeing_overview.html
deleted file mode 100644
index cfa01d4dcd69fc930cb87cc111fb78465adfb70e..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/refereeing_overview.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% extends 'submissions/_pool_base.html' %}
-
-{% block pagetitle %}: overview of refereeing{% endblock pagetitle %}
-
-{% load scipost_extras %}
-{% load bootstrap %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Refereeing overview</span>
-{% endblock %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h1>Refereeing overview</h1>
- </div>
- </div>
- </div>
-</div>
-
-{% for submission in submissions_under_refereeing %}
-
-<hr/>
-<div class="row">
- <div class="col-12">
- <div class="card mx-1">
- <div class="card-body">
- <h3><a href="{{ submission.get_absolute_url }}">{{ submission.title }}</a></h3>
- <p>{{ submission.author_list }}</p>
- <h4>Editor-in-charge: {{ submission.editor_in_charge }}</h4>
- <h4>Refereeing deadline: {{ submission.reporting_deadline }}</h4>
- <h4>Refereeing status summary:</h4>
- {% include 'submissions/_submission_refereeing_status.html' with submission=submission %}
- <h3 class="mb-2">Detail of refereeing invitations:</h3>
- {% include 'submissions/_submission_refereeing_invitations.html' with submission=submission invitations=submission.referee_invitations.all %}
- <a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='StoE' %}" target="_blank">Send a communication to the Editor-in-charge</a>
- </div>
- </div>
- </div>
-</div>
-
-{% endfor %}
-
-
-
-{% endblock content %}
diff --git a/submissions/templates/submissions/select_referee.html b/submissions/templates/submissions/select_referee.html
index fa7cb6c8877c264bb6dd6b4ce715db1049fb21e6..ecaa27de42430dcc9483b18e0c3b2272a5597677 100644
--- a/submissions/templates/submissions/select_referee.html
+++ b/submissions/templates/submissions/select_referee.html
@@ -1,4 +1,4 @@
-{% extends 'submissions/_pool_base.html' %}
+{% extends 'submissions/pool/base.html' %}
{% block pagetitle %}: select referee for submission{% endblock pagetitle %}
@@ -7,7 +7,6 @@
{% 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 %}
@@ -40,12 +39,12 @@
<div class="row">
<div class="col-12">
- <h1 class="highlight" id="form">Select an additional Referee</h1>
+ <h2 class="highlight" id="form">Select an additional Referee</h2>
<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">
+ <input class="btn btn-primary" type="submit" value="Find referee">
</form>
</div>
</div>
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 891f73799991e18c7faf3bf55ae2ceee6a6f5d53..b49b09f69db0e8bdc3e39e3152757a9f4764f038 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -4,20 +4,7 @@
{% load submissions_extras %}
{% load bootstrap %}
-{% block pagetitle %}: submission detail{% endblock pagetitle %}
-
-{% block headsup %}
-
- <script>
- $(document).ready(function(){
- $("#invitedreportsbutton").click(function(){
- $("#invitedreportslist").toggle();
- });
-
- });
- </script>
-
-{% endblock headsup %}
+{% block pagetitle %} Submission: {{ submission.title|truncatechars:40 }}{% endblock pagetitle %}
{% block breadcrumb %}
<nav class="breadcrumb py-md-2 px-0">
@@ -30,7 +17,6 @@
{% block content %}
-
<div class="row">
<div class="col-12">
<h2>SciPost Submission Page</h2>
@@ -98,19 +84,12 @@
{% if is_author or user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' %}
{% for recommendation in recommendations %}
{% if user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' or recommendation|is_viewable_by_authors %}
- <div class="row">
- <div class="col-12">
- <div class="card card-outline-secondary">
- {% include 'submissions/_recommendation_author_content.html' with recommendation=recommendation %}
- </div>
- </div>
- </div>
+ {% include 'submissions/_recommendation_author_content.html' with recommendation=recommendation %}
{% endif %}
{% endfor %}
<div class="mb-4">
<h2>Events</h2>
- <a href="javascript:;" data-toggle="toggle" data-target="#eventslist">Show/hide events</a>
<div id="eventslist">
{% include 'submissions/submission_event_list.html' with events=submission.events.for_author %}
</div>
diff --git a/submissions/templates/submissions/vet_submitted_report.html b/submissions/templates/submissions/vet_submitted_report.html
index 64d36c03c9b7da45bd3285c4f4383d5bf3334f7f..3573610ada85ab771d66ff461358816098391cc2 100644
--- a/submissions/templates/submissions/vet_submitted_report.html
+++ b/submissions/templates/submissions/vet_submitted_report.html
@@ -57,7 +57,7 @@ $(document).ready(function(){
{{ form.refusal_reason|bootstrap }}
{{ form.email_response_field|bootstrap }}
</div>
- <input class="btn btn-secondary" type="submit" value="Submit" />
+ <input class="btn btn-primary" type="submit" value="Submit" />
</form>
{% endif %}
diff --git a/submissions/urls.py b/submissions/urls.py
index 63ba083da77f6d3e0da813b3389376a2f11dc871..1a10cce67d167e0ad3fa722d52c4c57d0188d9ad 100644
--- a/submissions/urls.py
+++ b/submissions/urls.py
@@ -39,8 +39,6 @@ urlpatterns = [
views.report_pdf_compile, name='report_pdf_compile'),
url(r'^admin/reports/(?P<report_id>[0-9]+)/compile$',
views.report_pdf_compile, name='report_pdf_compile'),
- url(r'^admin/{regex}/recommendation$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
- views.AdminRecommendationView.as_view(), name='admin_recommendation'),
url(r'^submit_manuscript$', views.RequestSubmission.as_view(), name='submit_manuscript'),
url(r'^submit_manuscript/prefill$', views.prefill_using_arxiv_identifier,
diff --git a/submissions/views.py b/submissions/views.py
index 5f905b5a4eb3e981f8ce208348adf8cd78522a32..6d65cd53939226cde87b28988b7add984b80e14e 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -664,13 +664,11 @@ def assignments(request):
current_assignments = assignments.filter(accepted=True,
deprecated=False,
completed=False)
- consider_assignment_form = ConsiderAssignmentForm()
context = {
'assignments_to_consider': assignments_to_consider,
- 'consider_assignment_form': consider_assignment_form,
'current_assignments': current_assignments,
}
- return render(request, 'submissions/assignments.html', context)
+ return render(request, 'submissions/pool/assignments.html', context)
@login_required
@@ -1099,7 +1097,7 @@ def refereeing_overview(request):
.filter(status=STATUS_EIC_ASSIGNED)
.order_by('submission_date'))
context = {'submissions_under_refereeing': submissions_under_refereeing}
- return render(request, 'submissions/refereeing_overview.html', context)
+ return render(request, 'submissions/admin/refereeing_overview.html', context)
@login_required
@@ -1228,7 +1226,7 @@ def eic_recommendation(request, arxiv_identifier_w_vn_nr):
context = {'submission': submission,
'form': form}
- return render(request, 'submissions/eic_recommendation.html', context)
+ return render(request, 'submissions/pool/recommendation_formulate.html', context)
###########
@@ -1422,7 +1420,7 @@ def prepare_for_voting(request, rec_id):
'coauthorships': coauthorships,
'eligibility_form': eligibility_form,
}
- return render(request, 'submissions/prepare_for_voting.html', context)
+ return render(request, 'submissions/admin/recommendation_prepare_for_voting.html', context)
@login_required
@@ -1569,7 +1567,7 @@ def fix_College_decision(request, rec_id):
class EICRecommendationView(SubmissionAdminViewMixin, DetailView):
permission_required = 'scipost.can_fix_College_decision'
- template_name = 'submissions/admin/eic_recommendation_detail.html'
+ template_name = 'submissions/admin/recommendation.html'
editorial_page = True
def get_context_data(self, *args, **kwargs):
@@ -1604,14 +1602,3 @@ class PlagiarismReportPDFView(SubmissionAdminViewMixin, SingleObjectMixin, Redir
if not url:
raise Http404
return url
-
-
-class AdminRecommendationView(SubmissionAdminViewMixin, DetailView):
- permission_required = 'scipost.can_fix_College_decision'
- template_name = 'submissions/admin/recommendation.html'
- editorial_page = True
-
- def get_object(self):
- """ Get the EICRecommendation as a submission-related instance. """
- submission = super().get_object()
- return submission.eicrecommendations.first()
diff --git a/theses/templates/theses/vet_thesislink.html b/theses/templates/theses/vet_thesislink.html
index 30b1bb1831560e02be8b702764931b10ddff418f..f3124effdbcdec6f4ba58725a329426ca713fda7 100644
--- a/theses/templates/theses/vet_thesislink.html
+++ b/theses/templates/theses/vet_thesislink.html
@@ -1,7 +1,13 @@
-{% extends 'scipost/base.html' %}
+{% extends 'scipost/_personal_page_base.html' %}
{% load bootstrap %}
+{% block breadcrumb_items %}
+ {{block.super}}
+ <a href="{% url 'theses:unvetted_thesislinks' %}" class="breadcrumb-item">Unvetted Thesis Links</a>
+ <span class="breadcrumb-item">Vet {{ form.instance.title }} by {{ form.instance.author }}</span>
+{% endblock %}
+
{% block pagetitle %}: Unvetted Thesis Links{% endblock pagetitle %}
{% block content %}