From 0c5abfbc046be2e2d2730c51c4a509417876908c Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Fri, 30 Apr 2021 21:57:35 +0200
Subject: [PATCH] Improve presentation during submission steps
---
.../submissions/submission_form.html | 23 +++---------
.../submissions/submit_choose_journal.html | 28 +++++---------
.../submit_choose_preprint_server.html | 34 +++++++----------
.../submissions/submit_manuscript.html | 11 +++++-
.../templates/submissions/submit_steps.html | 37 +++++++++++++++++++
templates/bi/arrow-right-square-fill.html | 3 ++
6 files changed, 80 insertions(+), 56 deletions(-)
create mode 100644 submissions/templates/submissions/submit_steps.html
create mode 100644 templates/bi/arrow-right-square-fill.html
diff --git a/submissions/templates/submissions/submission_form.html b/submissions/templates/submissions/submission_form.html
index e961b59d3..576815b32 100644
--- a/submissions/templates/submissions/submission_form.html
+++ b/submissions/templates/submissions/submission_form.html
@@ -16,30 +16,19 @@
<div class="col-12">
<h1 class="highlight">Submit a manuscript to {{ journal.name }}</h1>
</div>
-
- <div class="col-12">
- <p class="mb-1">
- Before submitting, make sure you agree with the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>.
- </p>
- <p class="mb-1">
- You should also make sure you understand the <a href="{% url 'submissions:refereeing_procedure' %}#pwr">refereeing procedure</a> and its open aspect.
- </p>
- <p class="mb-1">
- In particular, make sure you are familiar with the <a href="{% url 'journals:journals_terms_and_conditions' %}#license_and_copyright_agreement">license and copyright agreement</a> and the <a href="{% url 'journals:journals_terms_and_conditions' %}#author_obligations"> author obligations</a>.
- </p>
- <p>
- Please prepare your manuscript according to the <a href="{% url 'submissions:author_guidelines' %}">author guidelines</a>.
- </p>
- </div>
</div>
-
<div class="row">
<div class="col-12">
{% if perms.scipost.can_submit_manuscript %}
+ {% include 'submissions/submit_steps.html' with step=4 %}
+
{% if form %}
- <form id="full_submission_form" method="post" enctype="multipart/form-data">
+ <h3>Just one more step to finish your submission to {{ journal }}...</h3>
+ <p>We prefilled the form as much as we could, please complete it and then submit.</p>
+
+ <form class="mt-4" id="full_submission_form" method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ form|bootstrap }}
<p>
diff --git a/submissions/templates/submissions/submit_choose_journal.html b/submissions/templates/submissions/submit_choose_journal.html
index 34e2148bd..a9ee2d41e 100644
--- a/submissions/templates/submissions/submit_choose_journal.html
+++ b/submissions/templates/submissions/submit_choose_journal.html
@@ -20,29 +20,21 @@
<div class="col-12">
<h1 class="highlight">Submit a manuscript to SciPost</h1>
</div>
-
- <div class="col-12">
- <p class="mb-1">
- Before submitting, make sure you agree with the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>.
- </p>
- <p class="mb-1">
- You should also make sure you understand the <a href="{% url 'submissions:refereeing_procedure' %}#pwr">refereeing procedure</a> and its open aspect.
- </p>
- <p class="mb-1">
- In particular, make sure you are familiar with the <a href="{% url 'journals:journals_terms_and_conditions' %}#license_and_copyright_agreement">license and copyright agreement</a> and the <a href="{% url 'journals:journals_terms_and_conditions' %}#author_obligations"> author obligations</a>.
- </p>
- <p>
- Please prepare your manuscript according to the <a href="{% url 'submissions:author_guidelines' %}">author guidelines</a>.
- </p>
- </div>
</div>
{% if perms.scipost.can_submit_manuscript %}
- <h2>Which Journal do you wish to {% if thread_hash %}send your resubmission{% else %}submit{% endif %} to?</h2>
- <br>
+ <div class="row">
+ <div class="col-md-6">
+ <h2 class=highlight>Step 2</h2>
+ <h3>Which Journal do you want to {% if thread_hash %}send your resubmission{% else %}submit{% endif %} to?</h3>
+ </div>
+ <div class="col-md-6">
+ {% include 'submissions/submit_steps.html' with step=2 thread_hash=thread_hash %}
+ </div>
+ </div>
- <div class="container">
+ <div class="container mt-4">
<div class="row row-cols-1 row-cols-lg-2 row-cols-xl-3">
{% for journal in journals %}
<div class="col col-sm-12 col-md-6 col-lg-4 mb-2">
diff --git a/submissions/templates/submissions/submit_choose_preprint_server.html b/submissions/templates/submissions/submit_choose_preprint_server.html
index c01398065..d45c785c7 100644
--- a/submissions/templates/submissions/submit_choose_preprint_server.html
+++ b/submissions/templates/submissions/submit_choose_preprint_server.html
@@ -16,30 +16,24 @@
<div class="col-12">
<h1 class="highlight">Submit a manuscript to SciPost</h1>
</div>
-
- <div class="col-12">
- <p class="mb-1">
- Before submitting, make sure you agree with the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>.
- </p>
- <p class="mb-1">
- You should also make sure you understand the <a href="{% url 'submissions:refereeing_procedure' %}#pwr">refereeing procedure</a> and its open aspect.
- </p>
- <p class="mb-1">
- In particular, make sure you are familiar with the <a href="{% url 'journals:journals_terms_and_conditions' %}#license_and_copyright_agreement">license and copyright agreement</a> and the <a href="{% url 'journals:journals_terms_and_conditions' %}#author_obligations"> author obligations</a>.
- </p>
- <p>
- Please prepare your manuscript according to the <a href="{% url 'submissions:author_guidelines' %}">author guidelines</a>.
- </p>
- </div>
</div>
{% if perms.scipost.can_submit_manuscript %}
- {% if preprint_servers|length > 1 %}
- <h2>Which preprint server do you wish to use for your {% if thread_hash %}re{% endif %}submission?</h2>
- {% else %}
- <h2>Please proceed with the SciPost preprint server (others are not available)</h2>
- {% endif %}
+ <div class="row">
+ <div class="col-md-6">
+ <h2 class=highlight>Step 2</h2>
+ {% if preprint_servers|length > 1 %}
+ <h3>Which preprint server do you wish to use for your {% if thread_hash %}re{% endif %}submission?</h3>
+ {% else %}
+ <h3>Please proceed with the SciPost preprint server (others are not available)</h3>
+ {% endif %}
+ </div>
+ <div class="col-md-6">
+ {% include 'submissions/submit_steps.html' with step=3 thread_hash=thread_hash %}
+ </div>
+ </div>
+
<br>
<div class="container">
<div class="row row-cols-1 row-cols-lg-2 row-cols-xl-3">
diff --git a/submissions/templates/submissions/submit_manuscript.html b/submissions/templates/submissions/submit_manuscript.html
index 96efc4ec5..20b96fd44 100644
--- a/submissions/templates/submissions/submit_manuscript.html
+++ b/submissions/templates/submissions/submit_manuscript.html
@@ -34,7 +34,16 @@
{% if perms.scipost.can_submit_manuscript %}
- <h2 class="mb-4">Please choose one of the following routes:</h2>
+ <div class="row">
+ <div class="col-md-6">
+ <h2 class=highlight>Step 1</h2>
+ <h3>Choose the route</h3>
+ <p>{% if resubmission_candidates %}Resubmission, or new {% endif %}Submission, but in which field?</p>
+ </div>
+ <div class="col-md-6">
+ {% include 'submissions/submit_steps.html' with step=1 resubmission_candidates=resubmission_candidates %}
+ </div>
+ </div>
<div class="container">
<div class="row row-cols-1 row-cols-lg-2 row-cols-xl-3">
diff --git a/submissions/templates/submissions/submit_steps.html b/submissions/templates/submissions/submit_steps.html
new file mode 100644
index 000000000..7e32d2501
--- /dev/null
+++ b/submissions/templates/submissions/submit_steps.html
@@ -0,0 +1,37 @@
+<div class="border border-dark px-2 pt-2">
+ <h3>Progess tracker</h3>
+ <table class="table p-4">
+ <tr {% if step == 1 %}class="bg-dark text-white"{% endif %}>
+ <td>Step 1</td>
+ <td class="text-center">
+ {% if step == 1 %}<span class="text-warning">{% include 'bi/arrow-right-square-fill.html' %}</span>{% endif %}
+ {% if step > 1 %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% endif %}
+ </td>
+ <td>Choose the route <small>({% if resubmission_candidates %}Resubmission, or {% endif %}new Submission, but in which field?)</small></td>
+ </tr>
+ <tr {% if step == 2 %}class="bg-dark text-white"{% endif %}>
+ <td>Step 2</td>
+ <td class="text-center">
+ {% if step == 2 %}<span class="text-warning">{% include 'bi/arrow-right-square-fill.html' %}</span>{% endif %}
+ {% if step > 2 %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% endif %}
+ </td>
+ <td>Choose which Journal you want to {% if thread_hash %}send your resubmission{% else %}submit{% endif %} to</td>
+ </tr>
+ <tr {% if step == 3 %}class="bg-dark text-white"{% endif %}>
+ <td>Step 3</td>
+ <td class="text-center">
+ {% if step == 3 %}<span class="text-warning">{% include 'bi/arrow-right-square-fill.html' %}</span>{% endif %}
+ {% if step > 3 %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% endif %}
+ </td>
+ <td>Choose a preprint server</td>
+ </tr>
+ <tr {% if step == 4 %}class="bg-dark text-white"{% endif %}>
+ <td>Step 4</td>
+ <td class="text-center">
+ {% if step == 4 %}<span class="text-warning">{% include 'bi/arrow-right-square-fill.html' %}</span>{% endif %}
+ {% if step > 4 %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% endif %}
+ </td>
+ <td>Complete and submit the form</td>
+ </tr>
+ </table>
+</div>
diff --git a/templates/bi/arrow-right-square-fill.html b/templates/bi/arrow-right-square-fill.html
new file mode 100644
index 000000000..770b3bbf0
--- /dev/null
+++ b/templates/bi/arrow-right-square-fill.html
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-right-square-fill" viewBox="0 0 16 16">
+ <path d="M0 14a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2a2 2 0 0 0-2 2v12zm4.5-6.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5a.5.5 0 0 1 0-1z"/>
+</svg>
--
GitLab