From fe4e355381cd246a016c12336c54ec3d18c1a9f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20Caux?= <git@jscaux.org>
Date: Mon, 5 Dec 2022 15:49:34 +0100
Subject: [PATCH] Improve presentation of edadmin page
---
.../edadmin/_hx_plagiarism_iThenticate.html | 7 ++--
.../edadmin/_hx_submissions_list.html | 38 ++++++++++++-------
.../edadmin/templates/edadmin/edadmin.html | 2 +-
3 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/scipost_django/edadmin/templates/edadmin/_hx_plagiarism_iThenticate.html b/scipost_django/edadmin/templates/edadmin/_hx_plagiarism_iThenticate.html
index 412354c58..0f9dbf9b9 100644
--- a/scipost_django/edadmin/templates/edadmin/_hx_plagiarism_iThenticate.html
+++ b/scipost_django/edadmin/templates/edadmin/_hx_plagiarism_iThenticate.html
@@ -37,9 +37,6 @@
<td>Percent match</td>
<td>{{ submission.iThenticate_plagiarism_report.percent_match }}%</td>
</tr>
- <tr>
- <td><a href="{% url 'submissions:iThenticate_plagiarism_report' submission.preprint.identifier_w_vn_nr %}" class="btn btn-success text-white" target="_blank">Download report pdf</a></td>
- </tr>
{% else %}
<tr>
<td>Report not yet received</td>
@@ -51,7 +48,9 @@
{% endif %}
</div>
<div class="col col-lg-4">
- {% if not submission.iThenticate_plagiarism_report.processed %}
+ {% if submission.iThenticate_plagiarism_report.processed %}
+ <a href="{% url 'submissions:iThenticate_plagiarism_report' submission.preprint.identifier_w_vn_nr %}" class="btn btn-success text-white" target="_blank">Download report pdf</a>
+ {% else %}
<form
class="mt-3" enctype="multipart/form-data"
hx-post="{% url 'edadmin:_hx_plagiarism_iThenticate' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
diff --git a/scipost_django/edadmin/templates/edadmin/_hx_submissions_list.html b/scipost_django/edadmin/templates/edadmin/_hx_submissions_list.html
index aecc1c005..608e654a6 100644
--- a/scipost_django/edadmin/templates/edadmin/_hx_submissions_list.html
+++ b/scipost_django/edadmin/templates/edadmin/_hx_submissions_list.html
@@ -1,22 +1,32 @@
{% for submission in submissions %}
<details id="submission-{{ submission.pk }}-details"
- class="border border-2 my-2"
+ class="border border-2 m-4"
>
<summary class="px-4 py-2 bg-primary bg-opacity-10">
- <table>
- <tbody>
- <tr>
- <td><a href="{% url 'submissions:submission' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">{{ submission.title }}</a></td>
- </tr>
- <tr>
- <td>{{ submission.author_list }}</td>
- </tr>
- <tr>
- <td>Submitted {{ submission.submission_date|date:"Y-m-d" }} to {{ submission.submitted_to }}</td>
- </tr>
- </tbody>
- </table>
+ <ul class="list list-inline">
+ <li class="list-inline-item">
+ <table>
+ <tbody>
+ <tr>
+ <td>{{ submission.title }}</td>
+ </tr>
+ <tr>
+ <td>{{ submission.author_list }}</td>
+ </tr>
+ <tr>
+ <td>Submitted {{ submission.submission_date|date:"Y-m-d" }} to {{ submission.submitted_to }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </li>
+ <li class="list-inline-item float-end">
+ <ul class="list list-unstyled">
+ <li class="mb-4"><a href="{% url 'submissions:submission' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">{% include "bi/arrow-right-square-fill.html" %}submission page</a></li>
+ <li class="mb-4"><a href="{% url 'submissions:editorial_page' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}" class="text-danger">{% include "bi/arrow-right-square-fill.html" %}editorial page</a></li>
+ </ul>
+ </li>
+ </ul>
</summary>
<div id="submission-{{ submission.pk }}-details-contents"
hx-get="{% url 'edadmin:_hx_submission_details_contents' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
diff --git a/scipost_django/edadmin/templates/edadmin/edadmin.html b/scipost_django/edadmin/templates/edadmin/edadmin.html
index c0c132282..24be2ccd0 100644
--- a/scipost_django/edadmin/templates/edadmin/edadmin.html
+++ b/scipost_django/edadmin/templates/edadmin/edadmin.html
@@ -20,7 +20,7 @@
<details class="border border-2 my-4"
id="incoming-details"
>
- <summary class="bg-info px-4 py-2">
+ <summary class="bg-primary bg-opacity-10 px-4 py-2">
<h1>Incoming</h1>
</summary>
<span id="incoming"
--
GitLab