From d88fecbe57e2d8c8689783b6365f368840592a21 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Mon, 14 Aug 2017 19:06:27 +0200
Subject: [PATCH] Template improvements
---
.../static/scipost/assets/css/_tooltip.scss | 1 +
scipost/templates/scipost/navbar.html | 2 +-
.../admin/editorial_admin_summary.html | 2 +-
.../submissions/admin/submission_tooltip.html | 4 +++
.../submissions/refereeing_status_as_tr.html | 4 +--
.../editorial_admin.html} | 36 +++++++++++++++----
.../admin/eic_recommendation_detail.html | 2 +-
.../submissions/admin/plagiarism_report.html | 2 +-
submissions/urls.py | 2 +-
submissions/views.py | 2 +-
10 files changed, 42 insertions(+), 15 deletions(-)
create mode 100644 submissions/templates/partials/submissions/admin/submission_tooltip.html
rename submissions/templates/submissions/{editorial_admin_summary.html => admin/editorial_admin.html} (58%)
diff --git a/scipost/static/scipost/assets/css/_tooltip.scss b/scipost/static/scipost/assets/css/_tooltip.scss
index c3c14a9a7..11b5c6cf5 100644
--- a/scipost/static/scipost/assets/css/_tooltip.scss
+++ b/scipost/static/scipost/assets/css/_tooltip.scss
@@ -8,6 +8,7 @@
.tooltip-inner {
border-radius: 0.15rem;
+ max-width: none;
hr {
background-color: #fff;
diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html
index 1bad25aa7..1fe3d19ff 100644
--- a/scipost/templates/scipost/navbar.html
+++ b/scipost/templates/scipost/navbar.html
@@ -26,7 +26,7 @@
</li>
{% if perms.scipost.can_oversee_refereeing %}
<li class="nav-item{% if '/submissions/admin' in request.path %} active{% endif %}">
- <a class="nav-link" href="{% url 'submissions:admin_summary' %}">Editorial Administration</a>
+ <a class="nav-link" href="{% url 'submissions:admin' %}">Editorial Administration</a>
</li>
{% endif %}
{% if user.contributor %}
diff --git a/submissions/templates/partials/submissions/admin/editorial_admin_summary.html b/submissions/templates/partials/submissions/admin/editorial_admin_summary.html
index 2a8c6e2f5..60f10bf1a 100644
--- a/submissions/templates/partials/submissions/admin/editorial_admin_summary.html
+++ b/submissions/templates/partials/submissions/admin/editorial_admin_summary.html
@@ -59,7 +59,7 @@
<td>Comments</td>
<td>
{{submission.comments.vetted.count}}
- <span class="circle-clickable" data-toggle="tooltip" 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>
+ <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>
diff --git a/submissions/templates/partials/submissions/admin/submission_tooltip.html b/submissions/templates/partials/submissions/admin/submission_tooltip.html
new file mode 100644
index 000000000..21149b998
--- /dev/null
+++ b/submissions/templates/partials/submissions/admin/submission_tooltip.html
@@ -0,0 +1,4 @@
+<span class="circle-clickable no-break" data-toggle="tooltip" data-html="true" data-placement='right'
+ title="
+ {{submission.arxiv_identifier_w_vn_nr}}<hr>Status: {{submission.get_status_display}}<br>Latest activity: {{submission.latest_activity}}
+">?</span>
diff --git a/submissions/templates/partials/submissions/refereeing_status_as_tr.html b/submissions/templates/partials/submissions/refereeing_status_as_tr.html
index f87861191..b4f383bab 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-toggle="tooltip" data-html="true" title="{{submission.referee_invitations.accepted.count}} acccepted<br>{{submission.referee_invitations.declined.count}} declined<br>{{submission.referee_invitations.pending.count}} response pending">?</span>
+ <td>{{submission.referee_invitations.count}} <span class="circle-clickable" data-placement='bottom' data-toggle="tooltip" data-html="true" title="{{submission.referee_invitations.accepted.count}} acccepted<br>{{submission.referee_invitations.declined.count}} declined<br>{{submission.referee_invitations.pending.count}} response pending">?</span>
<tr>
<tr>
<td>Reports obtained</td>
- <td>{{submission.reports.accepted.count}} <span class="circle-clickable" 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}} <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>
<tr>
{% endif %}
diff --git a/submissions/templates/submissions/editorial_admin_summary.html b/submissions/templates/submissions/admin/editorial_admin.html
similarity index 58%
rename from submissions/templates/submissions/editorial_admin_summary.html
rename to submissions/templates/submissions/admin/editorial_admin.html
index 8c03ab767..084a2338c 100644
--- a/submissions/templates/submissions/editorial_admin_summary.html
+++ b/submissions/templates/submissions/admin/editorial_admin.html
@@ -12,14 +12,26 @@
<div class="col-md-7">
<h1>Editorial Administration Page</h1>
+ <p>
+ {% if submission %}
+ <a href="{% url 'submissions:admin' %}">All events in the last 24 hours</a><br>
+ {% endif %}
+ <a href="{% url 'submissions:pool' %}">Go to the pool</a>
+ </p>
+
<h3>Submissions currently in pre-screening</h3>
<ul class="unstyled-list">
{% for sub in submission_list.prescreening %}
<li>
+ {% include 'partials/submissions/admin/submission_tooltip.html' with submission=sub %}
{% if sub == submission %}
- <strong><a href="?submission={{sub.arxiv_identifier_w_vn_nr}}" class="text-black">{{sub}}</a></strong>
+ <strong>
+ <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a><br>
+ Latest activity: {{sub.latest_activity|timesince}} ago
+ </strong>
{% else %}
- <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub}}</a>
+ <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a><br>
+ Latest activity: {{sub.latest_activity|timesince}} ago
{% endif %}
</li>
{% empty %}
@@ -31,10 +43,15 @@
<ul class="unstyled-list">
{% for sub in submission_list.actively_refereeing %}
<li>
+ {% include 'partials/submissions/admin/submission_tooltip.html' with submission=sub %}
{% if sub == submission %}
- <strong><a href="?submission={{sub.arxiv_identifier_w_vn_nr}}" class="text-black">{{sub}}</a></strong>
+ <strong>
+ <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a><br>
+ Latest activity: {{sub.latest_activity|timesince}} ago
+ </strong>
{% else %}
- <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub}}</a>
+ <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a><br>
+ Latest activity: {{sub.latest_activity|timesince}} ago
{% endif %}
</li>
{% empty %}
@@ -46,10 +63,15 @@
<ul class="unstyled-list">
{% for sub in submission_list.accepted %}
<li>
+ {% include 'partials/submissions/admin/submission_tooltip.html' with submission=sub %}
{% if sub == submission %}
- <strong><a href="?submission={{sub.arxiv_identifier_w_vn_nr}}" class="text-black">{{sub}}</a></strong>
+ <strong>
+ <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a><br>
+ Latest activity: {{sub.latest_activity|timesince}} ago
+ </strong>
{% else %}
- <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub}}</a>
+ <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a><br>
+ Latest activity: {{sub.latest_activity|timesince}} ago
{% endif %}
</li>
{% empty %}
@@ -60,7 +82,7 @@
<div class="col-md-5">
{% if submission %}
- <div class="card card-outline-secondary">
+ <div class="card card-outline-secondary mt-2">
<div class="card-block">
{% include 'partials/submissions/admin/editorial_admin_summary.html' with submission=submission %}
</div>
diff --git a/submissions/templates/submissions/admin/eic_recommendation_detail.html b/submissions/templates/submissions/admin/eic_recommendation_detail.html
index 8d8e0cd66..eff698ae3 100644
--- a/submissions/templates/submissions/admin/eic_recommendation_detail.html
+++ b/submissions/templates/submissions/admin/eic_recommendation_detail.html
@@ -7,7 +7,7 @@
{% block breadcrumb_items %}
{{block.super}}
- <a href="{% url 'submissions:admin_summary' %}?submission={{submission.arxiv_identifier_w_vn_nr}}" class="breadcrumb-item">Editorial Administration</a>
+ <a href="{% url 'submissions:admin' %}?submission={{submission.arxiv_identifier_w_vn_nr}}" class="breadcrumb-item">Editorial Administration</a>
<span class="breadcrumb-item">Editorial Recommendation</span>
{% endblock %}
diff --git a/submissions/templates/submissions/admin/plagiarism_report.html b/submissions/templates/submissions/admin/plagiarism_report.html
index a9e057370..99769fe70 100644
--- a/submissions/templates/submissions/admin/plagiarism_report.html
+++ b/submissions/templates/submissions/admin/plagiarism_report.html
@@ -6,7 +6,7 @@
{% block breadcrumb_items %}
{{block.super}}
- <a href="{% url 'submissions:admin_summary' %}?submission={{submission.arxiv_identifier_w_vn_nr}}" class="breadcrumb-item">Editorial Administration</a>
+ <a href="{% url 'submissions:admin' %}?submission={{submission.arxiv_identifier_w_vn_nr}}" class="breadcrumb-item">Editorial Administration</a>
<span class="breadcrumb-item">Plagiarism Report ({{ submission.arxiv_identifier_w_vn_nr }})</span>
{% endblock %}
diff --git a/submissions/urls.py b/submissions/urls.py
index f9877b391..d95e69f18 100644
--- a/submissions/urls.py
+++ b/submissions/urls.py
@@ -24,7 +24,7 @@ urlpatterns = [
views.submission_refereeing_package_pdf, name='refereeing_package_pdf'),
# Editorial Administration
- url(r'^admin$', views.EditorialSummaryView.as_view(), name='admin_summary'),
+ url(r'^admin$', views.EditorialSummaryView.as_view(), name='admin'),
url(r'^admin/treated$', views.treated_submissions_list, name='treated_submissions_list'),
url(r'^admin/(?P<arxiv_identifier_w_vn_nr>[0-9]{4,}.[0-9]{5,}v[0-9]{1,2})/reports/compile$',
views.treated_submission_pdf_compile, name='treated_submission_pdf_compile'),
diff --git a/submissions/views.py b/submissions/views.py
index 77fc1679a..c91a1fd63 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1459,7 +1459,7 @@ class EditorialSummaryView(SubmissionAdminViewMixin, ListView):
In addition show all EIC events of the last 24 hours.
"""
permission_required = 'scipost.can_oversee_refereeing'
- template_name = 'submissions/editorial_admin_summary.html'
+ template_name = 'submissions/admin/editorial_admin.html'
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
--
GitLab