From b14f603215124f70d83b1dd4a3293f5f9ede0418 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 7 Oct 2017 11:04:43 +0200
Subject: [PATCH] Merge admin into pool
---
.../static/scipost/assets/css/_general.scss | 5 +
scipost/static/scipost/assets/js/scripts.js | 11 +-
scipost/static/scipost/assets/js/tooltip.js | 9 --
scipost/templatetags/scipost_extras.py | 2 +-
scipost/templatetags/user_groups.py | 12 ++
.../submissions/admin/submission_details.html | 147 ------------------
.../submissions/pool/submission_details.html | 83 ++++++----
.../submissions/refereeing_status_as_tr.html | 4 +-
.../_submission_card_fellow_content.html | 81 +++++++++-
...submission_card_fellow_content_sparse.html | 13 --
.../submissions/admin/recommendation.html | 2 +-
submissions/templates/submissions/pool.html | 4 +-
.../templates/submissions/pool/pool.html | 112 ++++++++-----
submissions/views.py | 2 +-
14 files changed, 238 insertions(+), 249 deletions(-)
delete mode 100644 scipost/static/scipost/assets/js/tooltip.js
create mode 100644 scipost/templatetags/user_groups.py
delete mode 100644 submissions/templates/partials/submissions/admin/submission_details.html
delete mode 100644 submissions/templates/submissions/_submission_card_fellow_content_sparse.html
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index bd291703e..1b588ba86 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -39,3 +39,8 @@ footer .logos a {
body > .container {
padding-bottom: 1.5rem;
}
+
+.quote-border {
+ border-left: 3px solid $scipost-lightblue;
+ padding-left: 1rem;
+}
diff --git a/scipost/static/scipost/assets/js/scripts.js b/scipost/static/scipost/assets/js/scripts.js
index fcc6ddc4c..ce2d0a59d 100644
--- a/scipost/static/scipost/assets/js/scripts.js
+++ b/scipost/static/scipost/assets/js/scripts.js
@@ -1,10 +1,17 @@
-import tooltip from './tooltip.js';
import notifications from './notifications.js';
function hide_all_alerts() {
$(".alert").fadeOut(300);
}
+var activate_tooltip = function() {
+ jQuery('[data-toggle="tooltip"]').tooltip({
+ animation: false,
+ fallbackPlacement: 'clockwise',
+ placement: 'auto'
+ });
+}
+
var getUrlParameter = function getUrlParameter(sParam) {
var sPageURL = decodeURIComponent(window.location.search.substring(1)),
sURLVariables = sPageURL.split('&'),
@@ -31,6 +38,8 @@ function init_page() {
$("form .auto-submit input, form.auto-submit input, form.auto-submit select").on('change', function(){
$(this).parents('form').submit()
});
+
+ activate_tooltip();
}
$(function(){
diff --git a/scipost/static/scipost/assets/js/tooltip.js b/scipost/static/scipost/assets/js/tooltip.js
deleted file mode 100644
index f636b484f..000000000
--- a/scipost/static/scipost/assets/js/tooltip.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var activate_tooltip = function() {
- jQuery('[data-toggle="tooltip"]').tooltip({
- animation: false,
- fallbackPlacement: 'clockwise',
- placement: 'auto'
- });
-}
-
-activate_tooltip();
diff --git a/scipost/templatetags/scipost_extras.py b/scipost/templatetags/scipost_extras.py
index a378cf312..ed9aaebcb 100644
--- a/scipost/templatetags/scipost_extras.py
+++ b/scipost/templatetags/scipost_extras.py
@@ -1,6 +1,6 @@
from django import template
-from ..constants import subject_areas_dict, subject_areas_raw_dict
+from ..constants import subject_areas_dict
from ..models import Contributor
register = template.Library()
diff --git a/scipost/templatetags/user_groups.py b/scipost/templatetags/user_groups.py
new file mode 100644
index 000000000..eac1a8b14
--- /dev/null
+++ b/scipost/templatetags/user_groups.py
@@ -0,0 +1,12 @@
+from django import template
+
+register = template.Library()
+
+
+@register.simple_tag
+def is_edcol_admin(user):
+ """
+ Assign template variable (boolean) to check if user is Editorial Administator.
+ This assignment is limited to a certain context block!
+ """
+ return user.groups.filter(name='Editorial Administrators').exists() or user.is_superuser()
diff --git a/submissions/templates/partials/submissions/admin/submission_details.html b/submissions/templates/partials/submissions/admin/submission_details.html
deleted file mode 100644
index 39969bdc5..000000000
--- a/submissions/templates/partials/submissions/admin/submission_details.html
+++ /dev/null
@@ -1,147 +0,0 @@
-{% load guardian_tags %}
-{% load scipost_extras %}
-{% load submissions_extras %}
-
-
-<div class="card border-secondary mt-2 submission-detail">
- <div class="card-body">
- <h5 class="pb-0">{{submission.get_subject_area_display}}</h5>
- <h3 class="card-title">
- <a href="{{submission.get_absolute_url}}">{{submission.title}}</a>
- </h3>
-
- <p class="card-text mb-3">by {{submission.author_list}}</p>
- <h3>Info</h3>
- <table class="text-muted w-100 mb-1">
- <tr>
- <td style="min-width: 40%;">Version</td>
- <td>{{submission.arxiv_vn_nr}} ({% if submission.is_current %}current version{% else %}deprecated version {{submission.arxiv_vn_nr}}{% endif %})</td>
- </tr>
- <tr>
- <td>Submitted</td>
- <td>{{submission.submission_date}} to {{submission.get_submitted_to_journal_display}}</td>
- </tr>
-
- {% if submission.acceptance_date %}
- <tr>
- <td>Accepted</td>
- <td>{{submission.acceptance_date}}</td>
- </tr>
- {% endif %}
-
- <tr>
- <td>Latest activity</td>
- <td>{{submission.latest_activity}}</td>
- </tr>
- <tr>
- <td>Editor-in-charge</td>
- <td>
- {% if submission.editor_in_charge %}
- {{ submission.editor_in_charge }}
- {% elif perms.scipost.can_assign_submissions %}
- <a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a new assignment request</a>
- {% else %}
- -
- {% endif %}
- </td>
- </tr>
- <tr>
- <td>Status</td>
- <td>{{ submission.get_status_display }}</td>
- </tr>
- <tr>
- <td>Refereeing cycle</td>
- <td>{{ submission.get_refereeing_cycle_display }}</td>
- </tr>
-
- {% include 'partials/submissions/refereeing_status_as_tr.html' with submission=submission %}
-
- <tr>
- <td>Comments</td>
- <td>
- {{submission.comments.vetted.count}}
- <span class="circle-clickable" data-toggle="tooltip" data-placement='bottom' data-html="true" title="{{submission.comments.regular_comments.vetted.count}} comments<br>{{submission.comments.author_replies.vetted.count}} author replies<hr>{{submission.comments.awaiting_vetting.count}} awaiting vetting">?</span>
- </td>
- </tr>
-
- <tr>
- <td>Reporting deadline</td>
- <td>
- {% if submission.reporting_deadline > now %}
- in {{submission.reporting_deadline|timeuntil}}
- {% else %}
- {{submission.reporting_deadline|timesince}} ago
- {% endif %}
- </td>
- </tr>
-
- <tr>
- <td>Plagiarism score</td>
- <td>
- {% if submission.plagiarism_report %}
- {{ submission.plagiarism_report.score }}%
- {% else %}
- <a href="{% url 'submissions:plagiarism' submission.arxiv_identifier_w_vn_nr %}">Run plagiarism check</a>
- {% endif %}
- </td>
- </tr>
-
- </table>
- <a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}" class="d-inline-block mb-3">Go to Editorial Page</a>
-
- <h3>Actions</h3>
-
- <ul class="pl-4 mb-3">
- {# EIC Assignments #}
- {% if perms.scipost.can_assign_submissions %}
- {% if not submission.editor_in_charge %}
- <li>EIC Assignment requests:</li>
- <ul>
- {% for assignment in submission.editorial_assignments.all %}
- {% include 'submissions/_assignment_info.html' with assignment=assignment %}
- {% empty %}
- <li>None found. <a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a first assignment request</a></li>
- {% endfor %}
- </ul>
- <li><a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a new assignment request</a></li>
- <li><a href="{% url 'submissions:assignment_failed' submission.arxiv_identifier_w_vn_nr %}">Close pre-screening: failure to find EIC</a></li>
- {% endif %}
- {% endif %}
-
- {# Plagiarism #}
- <li><a href="{% url 'submissions:plagiarism' submission.arxiv_identifier_w_vn_nr %}">Manage plagiarism report</a></li>
-
- {# Compile pdfs #}
- {% if submission.reports.accepted.exists %}
- <li><a href="{% url 'submissions:reports_accepted_list' %}?submission={{submission.arxiv_identifier_w_vn_nr}}">Compile accepted reports</a></li>
- {% endif %}
-
- {# Communication #}
- {% if submission.editor_in_charge %}
- <li><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></li>
- {% endif %}
-
- {# EIC Recommendations #}
- {% if submission.eicrecommendations.exists %}
- <li>See Editorial Recommendations:</li>
- <ul>
- {% for rec in submission.eicrecommendations.all %}
- <li><a href="{% url 'submissions:eic_recommendation_detail' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr rec_id=rec.id %}">{{rec.get_recommendation_display}}</a></li>
- {% endfor %}
- </ul>
- {% endif %}
-
- {# Accepted submission actions #}
- {% if submission.status == 'accepted' %}
- <li><a href="{% url 'submissions:treated_submission_pdf_compile' submission.arxiv_identifier_w_vn_nr %}">Update the Refereeing Package pdf</a></li>
- <li>After proofs have been accepted, you can <a href="{% url 'journals:initiate_publication' %}">initiate the publication process</a> (leads to the validation page)</li>
- {% endif %}
- </ul>
-
-
- <h3>Events</h3>
- <div id="eventslist">
- {% include 'submissions/submission_event_list.html' with events=submission.events.for_eic %}
- </div>
- </div>
-</div>
diff --git a/submissions/templates/partials/submissions/pool/submission_details.html b/submissions/templates/partials/submissions/pool/submission_details.html
index 4b4573236..c5542efd8 100644
--- a/submissions/templates/partials/submissions/pool/submission_details.html
+++ b/submissions/templates/partials/submissions/pool/submission_details.html
@@ -1,7 +1,10 @@
{% load guardian_tags %}
{% load scipost_extras %}
{% load submissions_extras %}
+{% load user_groups %}
+{% get_obj_perms request.user for submission as "sub_perms" %}
+{% is_edcol_admin request.user as is_ECAdmin %}
<div class="card submission-detail">
{% include 'submissions/_submission_card_fellow_content.html' with submission=submission %}
@@ -20,9 +23,6 @@
{% endfor %}
</ul>
-
-
- {% get_obj_perms request.user for submission as "sub_perms" %}
{% if "can_take_editorial_actions" in sub_perms or is_ECAdmin %}
{% include 'submissions/_required_actions_block.html' with submission=submission %}
<h4>
@@ -30,31 +30,60 @@
</h4>
{% endif %}
- {% if perms.scipost.can_assign_submissions %}
- {% if submission.editorial_assignments.exists %}
- <h4>EIC Assignment requests:</h4>
- <ul>
- {% for assignment in submission.editorial_assignments.all %}
- {% include 'submissions/_assignment_info.html' with assignment=assignment %}
- {% endfor %}
- </ul>
- {% endif %}
- {% if submission.editor_in_charge == None %}
- <h4>Actions:</h4>
- <ul>
- <li><a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a new assignment request</a></li>
- <li><a href="{% url 'submissions:assignment_failed' submission.arxiv_identifier_w_vn_nr %}">Close pre-screening: failure to find EIC</a></li>
- </ul>
- {% endif %}
- {% endif %}
-
{% 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>
- {% if submission.status == 'accepted' %}
- <h4>After proofs have been accepted, you can <a href="{% url 'journals:initiate_publication' %}">initiate the publication process</a> (leads to the validation page)</h4>
- {% endif %}
+ <h3>Editorial Administration</h3>
+ <ul class="pl-4 mb-3">
+ {# EIC Assignments #}
+ {% if perms.scipost.can_assign_submissions %}
+ <li>EIC Assignment requests:</li>
+ <ul class="pl-3">
+ {% for assignment in submission.editorial_assignments.all %}
+ {% include 'submissions/_assignment_info.html' with assignment=assignment %}
+ {% empty %}
+ <li>None found. <a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a first assignment request</a></li>
+ {% endfor %}
+
+ {% if not submission.editor_in_charge %}
+ <li><a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a new assignment request</a></li>
+ <li><a href="{% url 'submissions:assignment_failed' submission.arxiv_identifier_w_vn_nr %}">Close pre-screening: failure to find EIC</a></li>
+ {% endif %}
+ </ul>
+ {% endif %}
+
+ {# Plagiarism #}
+ <li><a href="{% url 'submissions:plagiarism' submission.arxiv_identifier_w_vn_nr %}">Manage plagiarism report</a></li>
+
+ {# Compile pdfs #}
+ {% if submission.reports.accepted.exists %}
+ <li><a href="{% url 'submissions:reports_accepted_list' %}?submission={{submission.arxiv_identifier_w_vn_nr}}">Compile accepted reports</a></li>
+ {% endif %}
+
+ {# Communication #}
+ {% if submission.editor_in_charge %}
+ <li><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></li>
+ {% endif %}
+
+ {# EIC Recommendations #}
+ {% if submission.eicrecommendations.exists %}
+ <li>See Editorial Recommendations:</li>
+ <ul>
+ {% for rec in submission.eicrecommendations.all %}
+ <li><a href="{% url 'submissions:eic_recommendation_detail' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr rec_id=rec.id %}">{{rec.get_recommendation_display}}</a></li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+
+ {# Accepted submission actions #}
+ {% if submission.status == 'accepted' %}
+ <li><a href="{% url 'submissions:treated_submission_pdf_compile' submission.arxiv_identifier_w_vn_nr %}">Update the Refereeing Package pdf</a></li>
+ <li>After proofs have been accepted, you can <a href="{% url 'journals:initiate_publication' %}">initiate the publication process</a> (leads to the validation page)</li>
+ {% endif %}
+ </ul>
+
+ <h3>Events</h3>
+ <div id="eventslist">
+ {% include 'submissions/submission_event_list.html' with events=submission.events.for_eic %}
+ </div>
{% endif %}
</div>
</div>
diff --git a/submissions/templates/partials/submissions/refereeing_status_as_tr.html b/submissions/templates/partials/submissions/refereeing_status_as_tr.html
index 6a9692aa6..05c0db715 100644
--- a/submissions/templates/partials/submissions/refereeing_status_as_tr.html
+++ b/submissions/templates/partials/submissions/refereeing_status_as_tr.html
@@ -1,10 +1,10 @@
{% if submission.refereeing_cycle != 'direct_rec' %}
<tr>
<td>Referees invited</td>
- <td>{{submission.referee_invitations.count}} <span class="circle-clickable" data-placement='bottom' data-toggle="tooltip" data-html="true" title="{{submission.referee_invitations.accepted.count}} accepted<br>{{submission.referee_invitations.declined.count}} declined<br>{{submission.referee_invitations.pending.count}} response pending">?</span>
+ <td>{{submission.referee_invitations.count}} <small><span class="fa fa-info-circle" data-placement='bottom' data-toggle="tooltip" data-html="true" title="{{submission.referee_invitations.accepted.count}} accepted<br>{{submission.referee_invitations.declined.count}} declined<br>{{submission.referee_invitations.pending.count}} response pending"></span></small>
<tr>
<tr>
<td>Reports obtained</td>
- <td>{{submission.reports.accepted.count}} <span class="circle-clickable" data-placement='bottom' data-toggle="tooltip" data-html="true" title="{{submission.reports.accepted.invited.count}} invited<br>{{submission.reports.accepted.contributed.count}} contributed<hr>{{submission.reports.awaiting_vetting.count}} awaiting vetting<br>{{submission.reports.rejected.count}} rejected">?</span>
+ <td>{{submission.reports.accepted.count}} <small><span class="fa fa-info-circle" data-placement='bottom' data-toggle="tooltip" data-html="true" title="{{submission.reports.accepted.invited.count}} invited<br>{{submission.reports.accepted.contributed.count}} contributed<hr>{{submission.reports.awaiting_vetting.count}} awaiting vetting<br>{{submission.reports.rejected.count}} rejected"></span></small>
<tr>
{% endif %}
diff --git a/submissions/templates/submissions/_submission_card_fellow_content.html b/submissions/templates/submissions/_submission_card_fellow_content.html
index 6af2e213a..49c7e881e 100644
--- a/submissions/templates/submissions/_submission_card_fellow_content.html
+++ b/submissions/templates/submissions/_submission_card_fellow_content.html
@@ -1,7 +1,82 @@
-{% extends 'submissions/_submission_card_fellow_content_sparse.html' %}
+{% extends 'submissions/_submission_card_base.html' %}
{% block card_block_footer %}
- {{block.super}}
+ <p class="card-text mb-3">by {{submission.author_list}}</p>
+ <table class="text-muted w-100 mb-1">
+ <tr>
+ <td style="min-width: 40%;">Version</td>
+ <td>{{submission.arxiv_vn_nr}} ({% if submission.is_current %}current version{% else %}deprecated version {{submission.arxiv_vn_nr}}{% endif %})</td>
+ </tr>
+ <tr>
+ <td>Submitted</td>
+ <td>{{submission.submission_date}} to {{submission.get_submitted_to_journal_display}}</td>
+ </tr>
- {% include 'submissions/_submission_refereeing_status.html' with submission=submission %}
+ {% if submission.acceptance_date %}
+ <tr>
+ <td>Accepted</td>
+ <td>{{submission.acceptance_date}}</td>
+ </tr>
+ {% endif %}
+
+ <tr>
+ <td>Latest activity</td>
+ <td>{{submission.latest_activity}}</td>
+ </tr>
+ <tr>
+ <td>Editor-in-charge</td>
+ <td>
+ {% if submission.editor_in_charge %}
+ {{ submission.editor_in_charge }}
+ {% elif perms.scipost.can_assign_submissions %}
+ <a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a new assignment request</a>
+ {% else %}
+ -
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td>Status</td>
+ <td>{{ submission.get_status_display }}</td>
+ </tr>
+ <tr>
+ <td>Refereeing cycle</td>
+ <td>{{ submission.get_refereeing_cycle_display }}</td>
+ </tr>
+
+ {% include 'partials/submissions/refereeing_status_as_tr.html' with submission=submission %}
+
+ <tr>
+ <td>Comments</td>
+ <td>
+ {{submission.comments.vetted.count}}
+ <small><span class="fa fa-info-circle" data-toggle="tooltip" data-placement='bottom' data-html="true" title="{{submission.comments.regular_comments.vetted.count}} comments<br>{{submission.comments.author_replies.vetted.count}} author replies<hr>{{submission.comments.awaiting_vetting.count}} awaiting vetting"></span></small>
+ </td>
+ </tr>
+
+ <tr>
+ <td>Reporting deadline</td>
+ <td>
+ {% if submission.reporting_deadline > now %}
+ in {{ submission.reporting_deadline|timeuntil }}
+ {% else %}
+ {{ submission.reporting_deadline|timesince }} ago
+ {% endif %}
+ </td>
+ </tr>
+
+ {% if perms.scipost.can_do_plagiarism_checks %}
+ <tr>
+ <td>Plagiarism score</td>
+ <td>
+ {% if submission.plagiarism_report %}
+ {{ submission.plagiarism_report.score }}%
+ {% else %}
+ <a href="{% url 'submissions:plagiarism' submission.arxiv_identifier_w_vn_nr %}">Run plagiarism check</a>
+ {% endif %}
+ </td>
+ </tr>
+ {% endif %}
+
+ </table>
{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_fellow_content_sparse.html b/submissions/templates/submissions/_submission_card_fellow_content_sparse.html
deleted file mode 100644
index 8fbd9b1ae..000000000
--- a/submissions/templates/submissions/_submission_card_fellow_content_sparse.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'submissions/_submission_card_content.html' %}
-
-{% block card_block_footer %}
- {{block.super}}
-
- <!-- Fellow specific info -->
- {% if submission.status == 'unassigned' %}
- <p class="card-text text-danger">Status: {{ submission.get_status_display }}. You can volunteer to become Editor-in-charge by <a href="{% url 'submissions:volunteer_as_EIC' submission.arxiv_identifier_w_vn_nr %}">clicking here</a>.</p>
- {% else %}
- <p class="card-text">Editor-in-charge: <em>{{ submission.editor_in_charge }}</em></p>
- <p class="card-text">Status: {{ submission.get_status_display }}</p>
- {% endif %}
-{% endblock %}
diff --git a/submissions/templates/submissions/admin/recommendation.html b/submissions/templates/submissions/admin/recommendation.html
index a4eed96cb..9f4b8c2d8 100644
--- a/submissions/templates/submissions/admin/recommendation.html
+++ b/submissions/templates/submissions/admin/recommendation.html
@@ -14,7 +14,7 @@
<h1 class="highlight">Editorial Recommendation</h1>
<div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content_sparse.html' with submission=object.submission %}
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=object.submission %}
</div>
<div class="card card-outline-secondary">
diff --git a/submissions/templates/submissions/pool.html b/submissions/templates/submissions/pool.html
index ee80629ae..632bb4fe8 100644
--- a/submissions/templates/submissions/pool.html
+++ b/submissions/templates/submissions/pool.html
@@ -45,7 +45,7 @@
<div class="col-12" id="undergoing_rec_{{rec.id}}">
<div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content_sparse.html' with submission=rec.submission %}
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
</div>
<div class="card card-outline-secondary">
@@ -131,7 +131,7 @@
<div class="row">
<div class="col-12" id="prepare_rec_{{rec.id}}">
<div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content_sparse.html' with submission=rec.submission %}
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
</div>
<div class="card card-outline-secondary">
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index f304a5068..9da929fcd 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -4,6 +4,7 @@
{% load guardian_tags %}
{% load scipost_extras %}
{% load submissions_extras %}
+{% load user_groups %}
{% block breadcrumb_items %}
<a href="{% url 'scipost:personal_page' %}" class="breadcrumb-item">Personal Page</a>
@@ -18,15 +19,45 @@
{% block pagetitle %}: Submissions Pool{% endblock pagetitle %}
{% block content %}
- {% with is_ECAdmin=request.user|is_in_group:'Editorial Administrators' %}
- <a href="{% url 'submissions:pool' %}?test=1">See old pool layout</a>
- <div class="row">
- <div class="col-md-7">
- <h1>SciPost Submissions Pool</h1>
- {% if is_ECAdmin %}
- <a href="{% url 'submissions:admin' %}">Go to the Editorial Administration</a>
+ {% is_edcol_admin request.user as is_ECAdmin %}
+
+ <a href="{% url 'submissions:pool' %}?test=1">See old pool layout</a>
+ <div class="row">
+ <div class="col-md-7">
+ <h1>SciPost Submissions Pool</h1>
+ {% if is_ECAdmin %}
+
+ {% if recommendations_to_prepare_for_voting or recommendations_undergoing_voting %}
+ <div class="quote-border">
+ <h2 class="text-primary">Administrative Tasks</h2>
+
+ {% if recommendations_to_prepare_for_voting %}
+ <h3>Recommendations to prepare for voting <i class="fa fa-exclamation-circle text-warning"></i></h3>
+ <ul>
+ {% for recommendation in recommendations_to_prepare_for_voting %}
+ <li>On Editorial Recommendation: {{ recommendation }}<br>
+ <a href="{% url 'submissions:prepare_for_voting' rec_id=recommendation.id %}">Prepare for voting</a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+
+ {% if recommendations_undergoing_voting %}
+ <h3>Recommendations undergoing voting <i class="fa fa-exclamation-circle text-warning"></i></h3>
+ <ul class="fa-ul">
+ {% for recommendation in recommendations_undergoing_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>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </div>
{% endif %}
+ {% endif %}
+ {% if assignments_to_consider or recs_to_vote_on %}
{% if assignments_to_consider %}
<h3>Your open Assignment Requests <i class="fa fa-exclamation-circle text-warning"></i></h3>
<ul>
@@ -48,43 +79,40 @@
{% endfor %}
</ul>
{% endif %}
+ <hr>
+ {% endif %}
- {% if assignments_to_consider or recs_to_vote_on %}
- <hr>
- {% endif %}
-
- {% if search_form %}
- <h3>Filter by status</h3>
- <form method="get" class="auto-submit mb-3">
- {{ search_form|bootstrap:'12,12' }}
- </form>
- {% endif %}
+ {% if search_form %}
+ <h3>Filter by status</h3>
+ <form method="get" class="auto-submit mb-3">
+ {{ search_form|bootstrap:'12,12' }}
+ </form>
+ {% endif %}
- <ul class="list-unstyled" data-target="active-list">
- <!-- Submissions list -->
- {% for sub in submissions_in_pool %}
- <li class="p-2{% if sub == submission %} active{% endif %}">
- {% if sub == submission %}
- {% include 'partials/submissions/pool/submission_li.html' with submission=sub is_current=1 %}
- {% else %}
- {% include 'partials/submissions/pool/submission_li.html' with submission=sub is_current=0 %}
- {% endif %}
- </li>
- {% empty %}
- <li>
- <h3 class="text-center"><i class="fa fa-question fa-2x"></i><br>No Submissions found.</h3>
- </li>
- {% endfor %}
- </ul>
- </div><!-- End page content -->
+ <ul class="list-unstyled" data-target="active-list">
+ <!-- Submissions list -->
+ {% for sub in submissions_in_pool %}
+ <li class="p-2{% if sub == submission %} active{% endif %}">
+ {% if sub == submission %}
+ {% include 'partials/submissions/pool/submission_li.html' with submission=sub is_current=1 %}
+ {% else %}
+ {% include 'partials/submissions/pool/submission_li.html' with submission=sub is_current=0 %}
+ {% endif %}
+ </li>
+ {% empty %}
+ <li>
+ <h3 class="text-center"><i class="fa fa-question fa-2x"></i><br>No Submissions found.</h3>
+ </li>
+ {% endfor %}
+ </ul>
+ </div><!-- End page content -->
- <div class="col-md-5" id="details">
- {% if submission %}
- {% include 'partials/submissions/pool/submission_details.html' with submission=submission remark_form=remark_form is_ECAdmin=is_ECAdmin user=request.user %}
- {% else %}
- <h3><em>Click on a submission to see its summary and actions</em></h3>
- {% endif %}
- </div>
+ <div class="col-md-5" id="details">
+ {% if submission %}
+ {% include 'partials/submissions/pool/submission_details.html' with submission=submission remark_form=remark_form is_ECAdmin=is_ECAdmin user=request.user %}
+ {% else %}
+ <h3><em>Click on a submission to see its summary and actions</em></h3>
+ {% endif %}
</div>
- {% endwith %}
+ </div>
{% endblock %}
diff --git a/submissions/views.py b/submissions/views.py
index dacf02601..ccf17f9e1 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -386,7 +386,7 @@ def pool(request, arxiv_identifier_w_vn_nr=None):
pass
# Temporary test logic: only testers see the new Pool
- if context['submission'] and request.GET.get('json'):
+ if context['submission'] and request.is_ajax():
template = 'partials/submissions/pool/submission_details.html'
elif is_tester(request.user) and not request.GET.get('test'):
template = 'submissions/pool/pool.html'
--
GitLab