diff --git a/submissions/forms.py b/submissions/forms.py
index 4f860387cb58cbb97d8a3ec815e40805043c60b6..c7a02a907e4cebc9969e2f815ed5e9c28b65dcae 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -607,9 +607,9 @@ class SubmissionForm(forms.ModelForm):
'is_resubmission_of', None) or data.get('is_resubmission_of')
self.metadata = {} # container for possible external server-provided metadata
- print("form args:\n", args)
- print("form kwargs:\n", kwargs)
- print("is_resubmission: %s" % self.is_resubmission())
+ # print("form args:\n", args)
+ # print("form kwargs:\n", kwargs)
+ # print("is_resubmission: %s" % self.is_resubmission())
# data = args[0] if len(args) > 1 else kwargs.get('data', {})
# identifier = kwargs['initial'].get('identifier_w_vn_nr', None) or data.get('identifier_w_vn_nr')
diff --git a/submissions/templates/submissions/submission_form.html b/submissions/templates/submissions/submission_form.html
index d0f543464e4ac88d67d6527d933b2df7fab84851..5126538221511b8cb17869e35504c378f190ee1a 100644
--- a/submissions/templates/submissions/submission_form.html
+++ b/submissions/templates/submissions/submission_form.html
@@ -34,9 +34,7 @@
{% block content %}
<div class="row">
<div class="col-12">
- <h1 class="highlight">Submit a manuscript to SciPost
- {% if form.identifier_w_vn_nr.value %} <span class="my-1 py-0 text-blue">{{ form.identifier_w_vn_nr.value }}{% if form.submission_is_resubmission %} <small>(resubmission)</small>{% endif %}</span>{% endif %}
- </h1>
+ <h1 class="highlight">Submit a manuscript to SciPost</h1>
</div>
<div class="col-12">
diff --git a/submissions/templates/submissions/submit_choose_journal.html b/submissions/templates/submissions/submit_choose_journal.html
index d61f23dfc658641b47afee0f80462a47e92b950d..78716320177fba27dfefaf7e784466d982c64d54 100644
--- a/submissions/templates/submissions/submit_choose_journal.html
+++ b/submissions/templates/submissions/submit_choose_journal.html
@@ -41,22 +41,27 @@
<h2>Which Journal do you wish to {% if thread_hash %}send your resubmission{% else %}submit{% endif %} to?</h2>
<br>
- <div class="card-columns">
- {% for journal in journals %}
- <div class="card">
- <div class="card-header {{ journal.doi_label }}">
- <h3 class="m-2"><a href="{{ journal.get_absolute_url }}">{{ journal.name }}</a>
- {% if journal.has_DOAJ_Seal %}
- <a href="https://doaj.org" class="float-right"><img src="{% static 'scipost/images/DOAJ_Seal_logo_big.png' %}" alt="DOAJ Seal" width="20em"></a>
- {% endif %}
- </h3>
- </div>
- <div class="card-body">
- <a class="btn btn-outline-primary m-2" role="button" href="{{ journal.get_absolute_url }}/about" target="_blank"><em>View Description, Scope, Content and Acceptance Criteria</em></a>
- <a class="btn btn-primary m-2" role="button" href="{% url 'submissions:submit_choose_preprint_server' journal_doi_label=journal.doi_label %}{% if thread_hash %}?thread_hash={{ thread_hash }}{% endif %}"><i class="fa fa-arrow-right"></i> Submit to {{ journal.name }}</a>
+
+ <div class="container">
+ <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">
+ <div class="card">
+ <div class="card-header {{ journal.doi_label }}">
+ <h3 class="m-2"><a href="{{ journal.get_absolute_url }}">{{ journal.name }}</a>
+ {% if journal.has_DOAJ_Seal %}
+ <a href="https://doaj.org" class="float-right" data-toggle="tooltip" title="{{ journal.name }} has received the Directory of Open Access Journals Seal"><img src="{% static 'scipost/images/DOAJ_Seal_logo_big.png' %}" alt="DOAJ Seal" width="20em"></a>
+ {% endif %}
+ </h3>
+ </div>
+ <div class="card-body">
+ <a class="btn btn-outline-primary m-2" role="button" href="{{ journal.get_absolute_url }}/about" target="_blank"><em>View Description, Scope, Content and Acceptance Criteria</em></a>
+ <a class="btn btn-primary m-2" role="button" href="{% url 'submissions:submit_choose_preprint_server' journal_doi_label=journal.doi_label %}{% if thread_hash %}?thread_hash={{ thread_hash }}{% endif %}"><i class="fa fa-arrow-right"></i> Submit to {{ journal.name }}</a>
+ </div>
+ </div>
</div>
- </div>
- {% endfor %}
+ {% endfor %}
+ </div>
</div>
{% else %}
diff --git a/submissions/templates/submissions/submit_choose_preprint_server.html b/submissions/templates/submissions/submit_choose_preprint_server.html
index 2d8e3f1c897e0f28d96d30adeaf4fc0c681d508b..a61ab1eff6ad02db9ed7954e5207a551a18931e7 100644
--- a/submissions/templates/submissions/submit_choose_preprint_server.html
+++ b/submissions/templates/submissions/submit_choose_preprint_server.html
@@ -41,37 +41,41 @@
<h2>Please proceed with the SciPost preprint server (others are not available)</h2>
{% endif %}
<br>
- <div class="card-columns">
- {% for server in preprint_servers %}
- <div class="card">
- <div class="card-header">
- <h3>{% if thread_hash %}Resubmit{% else %}Submit{% endif %} via {{ server }}</h3>
- </div>
- <div class="card-body">
- {% if server.name == 'SciPost' %}
- <form action="{% url 'submissions:submit_manuscript_scipost' journal_doi_label=journal.doi_label %}" method="get">
- {{ scipost_prefill_form }}
- {% if thread_hash %}
- <input type="hidden" name="thread_hash" value="{{ thread_hash }}"/>
- {% endif %}
- <i class="fa fa-arrow-right"></i>
- <input type="submit" class="btn btn-success text-white" value="Go to the SciPost submission form"/>
- </form>
- {% elif server.name == 'arXiv' %}
- <h3>arXiv identifier for your Submission</h3>
- <p><em>Give the identifier without prefix but with version number, ####.####(#)v#(#)</em></p>
- <form action="{% url 'submissions:submit_manuscript_arxiv' journal_doi_label=journal.doi_label %}" method="get">
- {{ arxiv_prefill_form }}
- {% if thread_hash %}
- <input type="hidden" name="thread_hash" value="{{ thread_hash }}"/>
+ <div class="container">
+ <div class="row row-cols-1 row-cols-lg-2 row-cols-xl-3">
+ {% for server in preprint_servers %}
+ <div class="col col-sm-12 col-lg-6 mb-2">
+ <div class="card mb-4">
+ <div class="card-header bg-dark text-white">
+ <h3 class="p-2 m-0"><em>{% if thread_hash %}Resubmit{% else %}Submit{% endif %} via</em> <strong class="text-warning">{{ server }}</strong></h3>
+ </div>
+ <div class="card-body text-center">
+ {% if server.name == 'SciPost' %}
+ <form action="{% url 'submissions:submit_manuscript_scipost' journal_doi_label=journal.doi_label %}" method="get">
+ {{ scipost_prefill_form }}
+ {% if thread_hash %}
+ <input type="hidden" name="thread_hash" value="{{ thread_hash }}"/>
+ {% endif %}
+ <input type="submit" class="btn btn-primary text-white" value="Go to the SciPost submission form"/>
+ </form>
+ {% elif server.name == 'arXiv' %}
+ <h3>Please provide the arXiv identifier for your Submission</h3>
+ <p><em>without the website prefix but with version number, e.g.
+ <br> ####.####(#)v#(#)</em></p>
+ <form action="{% url 'submissions:submit_manuscript_arxiv' journal_doi_label=journal.doi_label %}" method="get">
+ {{ arxiv_prefill_form }}
+ {% if thread_hash %}
+ <input type="hidden" name="thread_hash" value="{{ thread_hash }}"/>
+ {% endif %}
+ <i class="fa fa-arrow-right"></i>
+ <input type="submit" class="btn btn-primary text-white" value="Query arXiv"/>
+ </form>
{% endif %}
- <i class="fa fa-arrow-right"></i>
- <input type="submit" class="btn btn-success text-white" value="Query arXiv"/>
- </form>
- {% endif %}
+ </div>
+ </div>
</div>
- </div>
- {% endfor %}
+ {% endfor %}
+ </div>
</div>
{% else %}
diff --git a/submissions/templates/submissions/submit_manuscript.html b/submissions/templates/submissions/submit_manuscript.html
index 9e19d9f5e8db7b6d711a31efa129041ead3c7e28..1d4699282212e143075570aa0498a581ed609ce6 100644
--- a/submissions/templates/submissions/submit_manuscript.html
+++ b/submissions/templates/submissions/submit_manuscript.html
@@ -35,79 +35,71 @@
{% if perms.scipost.can_submit_manuscript %}
<h2 class="mb-4">Please choose one of the following routes:</h2>
- <div class="card-columns">
- {% if resubmission_candidates %}
- <div class="card">
- <div class="card-header bg-primary text-white">
- <h3 class="p-2 m-0"><em>Resubmit</em></h3>
- </div>
- <div class="card-body">
- <p>The system has found {{ resubmission_candidates|length|pluralize:'a Submission,Submissions' }} currently under evaluation, for which you are a verified author. If you wish to submit a new version of {{ resubmission_candidates|length|pluralize:'this Submission,one of these Submissions' }}, please use the associated "Resubmit" buttton below.</p>
- <ul class="px-3 py-2">
- {% for submission in resubmission_candidates %}
- <li>
- <a href="{{ submission.get_absolute_url }}">{{ submission.title }}</a>
- <br>
- {{ submission.author_list }}
- <br>
- Preprint {{ submission.preprint.identifier_w_vn_nr }}
- <br>
+
+ <div class="container">
+ <div class="row row-cols-1 row-cols-lg-2 row-cols-xl-3">
+ {% if resubmission_candidates %}
+ {% for submission in resubmission_candidates %}
+ <div class="col col-sm-12 col-md-6 col-lg-4 mb-2">
+ <div class="card my-4">
+ <div class="card-header bg-dark text-white">
+ <h3 class="p-2 m-0">
+ <em>Resubmission of <a href="{{ submission.get_absolute_url }}" class="text-info">{{ submission.preprint.identifier_w_vn_nr }}</a></em>
+ </h3>
+ </div>
+ <div class="card-body">
+ <p><a href="{{ submission.get_absolute_url }}"><strong>{{ submission.title }}</strong></a></p>
+ <p>by {{ submission.author_list }}</p>
{% if not submission.open_for_resubmission %}
- <strong class="text-warning">This submission is still undergoing peer refereeing. Please wait until the closing of the previous refereeing round and formulation of the Editorial Recommendation before proceeding with a resubmission.</strong>
+ <p class="bg-dark border-warning text-warning p-3 mb-0"><strong><i class="fa fa-warning text-danger"></i> This submission is still undergoing peer refereeing. Please wait until the closing of the previous refereeing round and formulation of the Editorial Recommendation before resubmitting.</strong></p>
{% else %}
- <a class="btn btn-outline-primary p-1 mt-0" role="button" href="{% url 'submissions:submit_choose_journal' discipline=submission.discipline %}?thread_hash={{ submission.thread_hash }}"><i class="fa fa-arrow-right"></i> Resubmit</a>
+ <table class="table mb-0">
+ <tbody>
+ <tr><td class="bg-primary">
+ <a class="btn text-white" role="button" href="{% url 'submissions:submit_choose_journal' discipline=submission.discipline %}?thread_hash={{ submission.thread_hash }}"><i class="fa fa-arrow-right"></i> Resubmit this manuscript</a>
+ </td></tr>
+ </tbody>
+ </table>
{% endif %}
- </li>
- {% endfor %}
- </ul>
- </div>
- </div>
- {% endif %}
-
-
- <div class="card">
- <div class="card-header bg-success text-white">
- <h3 class="p-2 m-0">New Submission</h3>
- </div>
- <div class="card-body">
- {% for branch in scipost_disciplines %}
- {% with journals|journals_in_branch:branch.0 as journals_branch %}
- {% if journals_branch|length > 0%}
- <h3>{{ branch.0 }}</h3>
- <ul class="list list-unstyled">
- {% for discipline in branch.1 %}
- {% with journals_branch|journals_in_discipline:discipline.0 as journals_disc %}
- {% if journals_disc|length > 0 %}
- <li class="list-unstyled-item m-2"><a class="btn btn-success text-white" role="button" href="{% url 'submissions:submit_choose_journal' discipline=discipline.0 %}"><i class="fa fa-arrow-right"></i> New submission in {{ discipline.1 }}</a></li>
- {% endif %}
- {% endwith %}
- {% endfor %}
- </ul>
- {% endif %}
- {% endwith %}
+ </div>
+ </div>
+ </div>
{% endfor %}
- </div>
- </div>
-
- <!-- <div class="card">
- <div class="card-header">
- <h3 class="p-2 bg-success text-white"><em>New Submission</em></h3>
- <h3>Submit an arXiv preprint</h3>
- </div>
- <div class="card-body">
- </div>
- </div>
- <div class="card">
- <div class="card-header">
- <h3 class="p-2 bg-success text-white"><em>New Submission</em></h3>
- <h3>Submit directly to SciPost</h3>
- </div>
- <div class="card-body">
- </div>
- </div>
- </div> -->
+ {% endif %}
+ {% for branch in scipost_disciplines %}
+ {% with journals|journals_in_branch:branch.0 as journals_branch %}
+ {% if journals_branch|length > 0%}
+ <div class="col col-sm-12 col-md-6 col-lg-4 mb-2">
+ <div class="card my-4">
+ <div class="card-header bg-dark text-white">
+ <h3 class="p-2 m-0"><em>New Submission</em> <small class="text-info"><em>({{ branch.0 }})</em></small></h3>
+ </div>
+ <div class="card-body">
+ <table class="table table-borderless mb-0">
+ <tbody>
+ <tr><td></td></tr>
+ {% for discipline in branch.1 %}
+ {% with journals_branch|journals_in_discipline:discipline.0 as journals_disc %}
+ {% if journals_disc|length > 0 %}
+ <tr>
+ <td class="bg-primary"><a class="btn text-white" role="button" href="{% url 'submissions:submit_choose_journal' discipline=discipline.0 %}"><i class="fa fa-arrow-right"></i> New submission in <strong>{{ discipline.1 }}</strong></a></td>
+ </tr>
+ <tr><td></td></tr>
+ {% endif %}
+ {% endwith %}
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ {% endif %}
+ {% endwith %}
+ {% endfor %}
+ </div>
+ </div>
{% else %}
- <h3>You are currently not allowed to submit a manuscript.</h3>
+ <h3>You are currently not allowed to submit a manuscript.</h3>
{% endif %}
{% endblock content %}