diff --git a/colleges/templates/colleges/colleges.html b/colleges/templates/colleges/colleges.html
index bc2bbae11ed0f247cf30d0e18de9293ef9b5a0ff..1d50e2d6b14cec773ed76dc0fb7c0f8f65d119be 100644
--- a/colleges/templates/colleges/colleges.html
+++ b/colleges/templates/colleges/colleges.html
@@ -47,12 +47,12 @@
{% for discipline,fellowships in disciplines.items %}
<div class="card">
<div class="card-header text-center" id="editorial_college_{{ discipline|lower }}">
- <h1 class="mb-0">
- {{ discipline }}<br/>
- <button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapse_editorial_college_{{ discipline|lower }}" aria-expanded="false" aria-controls="collapse_editorial_college_{{ discipline|lower }}">
- <small>Click to expand/collapse</small>
- </button>
+ <h1>
+ {{ discipline }}
</h1>
+ <button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#collapse_editorial_college_{{ discipline|lower }}" aria-expanded="false" aria-controls="collapse_editorial_college_{{ discipline|lower }}">
+ <em><small>Click to expand/collapse</small></em>
+ </button>
</div>
<div id="collapse_editorial_college_{{ discipline|lower }}" class="collapse" aria-labelledby="editorial_college_{{ discipline|lower }}" data-parent="#accordionEditorialColleges">
diff --git a/requirements.txt b/requirements.txt
index 8e7090c130d7d036787d323459ef7c38ab4107fd..6068d718febd21ca560a0de32f7abba3e12c939a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ mock==2.0.0
# Django packages
-django_ajax_selects==1.7.1
+django_ajax_selects==1.7.1 # 2019-05-12
django-countries==5.3.3
django-debug-toolbar==1.8
django-extensions==1.7.6
diff --git a/scipost/static/scipost/toggle-report-fields.js b/scipost/static/scipost/toggle-report-fields.js
new file mode 100644
index 0000000000000000000000000000000000000000..8469364c2409951b274b7fac799dd4b333577ab5
--- /dev/null
+++ b/scipost/static/scipost/toggle-report-fields.js
@@ -0,0 +1,25 @@
+$(document).ready(function(){
+ $('#showSimpleReportButton').show();
+ $('#showFullReportButton').hide();
+ $('#reportSelectorButton').on('click', function () {
+ $('#showSimpleReportText').toggle();
+ $('#showSimpleReportButton').toggle();
+ $('#showFullReportText').toggle();
+ $('#showFullReportButton').toggle();
+ $('#id_qualification').parent('div').parent('div').toggle();
+ $('#id_strengths').parent('div').parent('div').toggle();
+ $('#id_weaknesses').parent('div').parent('div').toggle();
+ $('#id_requested_changes').parent('div').parent('div').toggle();
+ $('#id_validity').parent('div').parent('div').toggle();
+ $('#id_significance').parent('div').parent('div').toggle();
+ $('#id_originality').parent('div').parent('div').toggle();
+ $('#id_clarity').parent('div').parent('div').toggle();
+ $('#id_formatting').parent('div').parent('div').toggle();
+ $('#id_grammar').parent('div').parent('div').toggle();
+
+ $('#previewStrengths').toggle();
+ $('#previewWeaknesses').toggle();
+ $('#previewRequestedChanges').toggle();
+ $('#previewRatings').toggle();
+ });
+});
diff --git a/submissions/forms.py b/submissions/forms.py
index 7d74b115a9cd7354c7ca1f7d9a888a8b3ea60a09..9654245a8b3fc07fe48238c197b56ee4d5c04b1b 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -1038,7 +1038,7 @@ class ReportForm(forms.ModelForm):
model = Report
fields = ['qualification', 'strengths', 'weaknesses', 'report', 'requested_changes',
'validity', 'significance', 'originality', 'clarity', 'formatting', 'grammar',
- 'recommendation', 'remarks_for_editors', 'anonymous', 'file_attachment']
+ 'recommendation', 'remarks_for_editors', 'file_attachment', 'anonymous']
def __init__(self, *args, **kwargs):
if kwargs.get('instance'):
@@ -1074,35 +1074,41 @@ class ReportForm(forms.ModelForm):
'cols': 100
})
+ self.fields['file_attachment'].label = 'File attachment (for a figure or similar)'
+
# Required fields on submission; optional on save as draft
if 'save_submit' in self.data:
- required_fields = ['report', 'recommendation', 'qualification']
+ required_fields = ['report', 'recommendation']
else:
required_fields = []
- required_fields_label = ['report', 'recommendation', 'qualification']
+ required_fields_label = ['report', 'recommendation']
# If the Report is not a followup: Explicitly assign more fields as being required!
if not self.instance.is_followup_report and self.submission.submitted_to.name != SCIPOST_JOURNAL_PHYSICS_PROC:
required_fields_label += [
- 'strengths',
- 'weaknesses',
- 'requested_changes',
- 'validity',
- 'significance',
- 'originality',
- 'clarity',
- 'formatting',
- 'grammar']
+ # 'qualification',
+ # 'strengths',
+ # 'weaknesses',
+ # 'requested_changes',
+ # 'validity',
+ # 'significance',
+ # 'originality',
+ # 'clarity',
+ # 'formatting',
+ # 'grammar'
+ ]
required_fields += [
- 'strengths',
- 'weaknesses',
- 'requested_changes',
- 'validity',
- 'significance',
- 'originality',
- 'clarity',
- 'formatting',
- 'grammar']
+ # 'qualification',
+ # 'strengths',
+ # 'weaknesses',
+ # 'requested_changes',
+ # 'validity',
+ # 'significance',
+ # 'originality',
+ # 'clarity',
+ # 'formatting',
+ # 'grammar'
+ ]
for field in required_fields:
self.fields[field].required = True
diff --git a/submissions/templates/partials/submissions/report_preview.html b/submissions/templates/partials/submissions/report_preview.html
index ee07ab781d2ce459fdfba34498226130500fb051..fb446c5cf2492c09ff9beec40cc9c51e4774b066 100644
--- a/submissions/templates/partials/submissions/report_preview.html
+++ b/submissions/templates/partials/submissions/report_preview.html
@@ -1,17 +1,17 @@
-<h3 class="mb-4">Preview of your report as it will publicly be shown</h3>
+<h3 class="mb-4">Preview of your report as it will be publicly seen</h3>
<div class="report report-preview">
<div class="reportid">
<h3><span data-receive="report-identity"><span if-anonymous="true" style="display: none;">Anonymous</span><span if-anonymous="false" style="display: none;">{{ request.user.first_name }} {{ request.user.last_name }}</span> on <span data-receive="report-date">{% now "SHORT_DATE_FORMAT" %}</span></h3>
</div>
- <div class="row">
+ <div class="row" id="previewStrengths">
<div class="col">
<h3 class="highlight tight">Strengths</h3>
<div class="pl-md-4"><p style="white-space: pre-wrap;" data-receive="report-strengths"></p></div>
</div>
</div>
- <div class="row">
+ <div class="row" id="previewWeaknesses">
<div class="col">
<h3 class="highlight tight">Weaknesses</h3>
<div class="pl-md-4"><p style="white-space: pre-wrap;" data-receive="report-weaknesses"></p></div>
@@ -23,14 +23,14 @@
<div class="pl-md-4"><p style="white-space: pre-wrap;" data-receive="report-report"></p></div>
</div>
</div>
- <div class="row">
+ <div class="row" id="previewRequestedChanges">
<div class="col">
<h3 class="highlight tight">Requested changes</h3>
<div class="pl-md-4"><p style="white-space: pre-wrap;" data-receive="report-requested_changes"></p></div>
</div>
</div>
- <div class="ratings">
+ <div class="ratings" id="previewRatings">
<ul>
<li>validity: <span data-receive="report-validity"></span></li>
<li>significance: <span data-receive="report-significance"></span></li>
diff --git a/submissions/templates/submissions/report_form.html b/submissions/templates/submissions/report_form.html
index b256fcd553200e1c95882144dea95af0dc318b44..19315cf783b7112a356f6985995ddfff4f9dd89a 100644
--- a/submissions/templates/submissions/report_form.html
+++ b/submissions/templates/submissions/report_form.html
@@ -33,8 +33,42 @@
<div class="card-body">
<h2>Your {% if form.instance.is_followup_report %}followup {% endif %}report:</h2>
<p>A preview of text areas will appear below as you type (you can use $\LaTeX$ \$...\$ for in-text equations or \ [ ... \ ] for on-line equations).</p>
- <p class="mb-0">Any fields with an asterisk (*) are required.</p>
- {% if form.instance.is_followup_report %}
+ <p>Before you get started, please make sure you are familiar with our <a href="https://scipost.org{% url 'submissions:referee_guidelines' %}" target="_blank">referee guidelines</a>, <a href="https://scipost.org{% url 'submissions:sub_and_ref_procedure' %}" target="_blank">refereeing procedure</a> and <a href="{% url 'journals:journals_terms_and_conditions' %}#referee_code_of_conduct" target="_blank">referee code of conduct</a>.</p>
+ <div class="mb-0">
+ <table class="table">
+ <tr>
+ <th>Required fields</th>
+ <td>
+ <ul>
+ <li>text field for <em>report</em></li>
+ <li><em>recommendation</em> (publish? revise? reject?)</li>
+ <li><em class="text-muted">optional remarks for the editors only</em></li>
+ <li><em>anonymity</em> specifier</li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <th>Optional fields</th>
+ <td>
+ <ul>
+ <li><em>qualification</em> specifier</li>
+ <li>text fields for <em>strengths, weaknesses, report, requested changes</em></li>
+ <li>and specifiers for <em>validity, significance, originality, clarity, formatting</em> and <em>grammar</em></li>
+ </ul>
+ </td>
+ </tr>
+ </table>
+ <button class="btn btn-primary px-2 py-1" id="reportSelectorButton">
+ <span id="showSimpleReportButton">
+ Show required fields only
+ </span>
+ <span id="showFullReportButton">
+ Show all fields
+ </span>
+ </button>
+ </div>
+
+ {% if form.instance.is_followup_report %}
<p class="mb-0">
Because you have already submitted a Report for this Submission series, not all fields are required.
</p>
@@ -86,5 +120,6 @@
{% block footer_script %}
- <script type="text/javascript" src="{% static 'scipost/report-preview.js' %}"></script>
+ <script src="{% static 'scipost/toggle-report-fields.js' %}"></script>
+ <script src="{% static 'scipost/report-preview.js' %}"></script>
{% endblock %}