diff --git a/submissions/templates/submissions/_recommendation_author_content.html b/submissions/templates/submissions/_recommendation_author_content.html
index abfa95c3d32325ed7ad3eeaa56221bb539421f58..d1f4e69cab3d821efa589ee0f8635c866cb3d4b2 100644
--- a/submissions/templates/submissions/_recommendation_author_content.html
+++ b/submissions/templates/submissions/_recommendation_author_content.html
@@ -1,18 +1,20 @@
-<div class="card-body">
- <h2 class="pb-0 mb-0">Editorial Recommendation</h2>
+<div class="card">
+ <div class="card-body">
+ <h2 class="pb-0 mb-0">Editorial Recommendation</h2>
- {% block recommendation_header %}
- <h3 class="card-title text-muted">Date {{recommendation.date_submitted}}</h3>
- {% endblock %}
+ {% block recommendation_header %}
+ <h3 class="card-title text-muted">Date {{recommendation.date_submitted}}</h3>
+ {% endblock %}
- <h3 class="pb-0">Remarks for authors</h3>
- <p class="pl-md-3">{{recommendation.remarks_for_authors|default:'-'}}</p>
+ <h3 class="pb-0">Remarks for authors</h3>
+ <p class="pl-md-3">{{recommendation.remarks_for_authors|default:'-'}}</p>
- <h3 class="pb-0">Requested changes</h3>
- <p class="pl-md-3">{{recommendation.requested_changes|default:'-'}}</p>
+ <h3 class="pb-0">Requested changes</h3>
+ <p class="pl-md-3">{{recommendation.requested_changes|default:'-'}}</p>
- {% block recommendation_before_recommendation %}{% endblock %}
+ {% block recommendation_before_recommendation %}{% endblock %}
- <h3 class="pb-0">Recommendation</h3>
- <p class="pl-md-3 mb-0">{{recommendation.get_recommendation_display}}</p>
+ <h3 class="pb-0">Recommendation</h3>
+ <p class="pl-md-3 mb-0">{{recommendation.get_recommendation_display}}</p>
+ </div>
</div>
diff --git a/submissions/templates/submissions/_single_public_report_without_comments.html b/submissions/templates/submissions/_single_public_report_without_comments.html
index 8ffeb8b8f6f1e06bec568d9447ea72492154c18f..5f0a3cf451b00d72550a7e9da77a25270fbf617c 100644
--- a/submissions/templates/submissions/_single_public_report_without_comments.html
+++ b/submissions/templates/submissions/_single_public_report_without_comments.html
@@ -10,16 +10,16 @@
<h3>{% if report.anonymous %}(chose public anonymity) {% endif %}<a href="{{report.author.get_absolute_url}}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>
on {{ report.date_submitted|date:'Y-n-j' }}
</h3>
- <ul class="publicationClickables">
- {% if report.doi_string %}<li>doi: {{ report.doi_string }}</li>{% endif %}
- {% if report.pdf_report %}
- <li><a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a></li>
- {% endif %}
- {% if perms.scipost.can_manage_reports %}
- <li><a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a></li>
- {% endif %}
- </ul>
-</div>
+ <ul class="publicationClickables">
+ {% if report.doi_string %}<li>doi: {{ report.doi_string }}</li>{% endif %}
+ {% if report.pdf_report %}
+ <li><a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_reports %}
+ <li><a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a></li>
+ {% endif %}
+ </ul>
+ </div>
{% if report.flagged %}
<h4 class="text-danger font-weight-bold">CAUTION: check if this referee has been flagged by the authors</h4>
@@ -52,15 +52,15 @@
<h3>{% if report.anonymous %}Anonymous Report {{report.report_nr}}{% else %}<a href="{{report.author.get_absolute_url}}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>{% endif %}
on {{ report.date_submitted|date:'Y-n-j' }}</h3>
</h3>
- <ul class="publicationClickables">
- {% if report.doi_string %}<li>doi: {{ report.doi_string }}</li>{% endif %}
- {% if report.pdf_report %}
- <li><a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a></li>
- {% endif %}
- {% if perms.scipost.can_manage_reports %}
- <li><a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a></li>
- {% endif %}
- </ul>
+ <ul class="publicationClickables">
+ {% if report.doi_string %}<li>doi: {{ report.doi_string }}</li>{% endif %}
+ {% if report.pdf_report %}
+ <li><a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_reports %}
+ <li><a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a></li>
+ {% endif %}
+ </ul>
</div>
{% include 'submissions/_single_report_content.html' with report=report %}
diff --git a/submissions/templates/submissions/_submission_card_base.html b/submissions/templates/submissions/_submission_card_base.html
index a9eb8cdba588f7f64360ad172ae0b56e45b01499..1d3be2c52c30e32892f05b473ad70a2ce46991b3 100644
--- a/submissions/templates/submissions/_submission_card_base.html
+++ b/submissions/templates/submissions/_submission_card_base.html
@@ -1,11 +1,8 @@
-<div class="card-body {% block cardblock_class_block %}{% endblock %} {{ cardblock_class }}">
-
- <div class="submission_title">
- <h5 class="pb-0">{{submission.get_subject_area_display}}</h5>
- <h3 class="card-title {% block title_class_block %}{% endblock %}">
- <a href="{{submission.get_absolute_url}}">{{submission.title}}</a>
- </h3>
- </div>
-
- {% block card_block_footer %}{% endblock %}
+<div class="submission_title">
+ <h5 class="pb-0">{{submission.get_subject_area_display}}</h5>
+ <h3 class="card-title {% block title_class_block %}{% endblock %}">
+ <a href="{{submission.get_absolute_url}}">{{submission.title}}</a>
+ </h3>
</div>
+
+{% block card_block_footer %}{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_fellow_content.html b/submissions/templates/submissions/_submission_card_fellow_content.html
index 3366946fb203e69221a20e44a718d536e6b52cf0..bbf4abf84b79b620a577f01a9acdbb2ed243beb8 100644
--- a/submissions/templates/submissions/_submission_card_fellow_content.html
+++ b/submissions/templates/submissions/_submission_card_fellow_content.html
@@ -1,7 +1,7 @@
{% extends 'submissions/_submission_card_base.html' %}
{% block card_block_footer %}
- <p class="card-text mb-3 author_list">by {{submission.author_list}}</p>
+ <p class="mb-3 author_list">by {{submission.author_list}}</p>
<table class="text-muted w-100 mb-1">
<tr>
diff --git a/submissions/templates/submissions/admin/eic_recommendation_detail.html b/submissions/templates/submissions/admin/eic_recommendation_detail.html
deleted file mode 100644
index f23a39ca8801f4f05d342ea65aab60d0368eaa4e..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/admin/eic_recommendation_detail.html
+++ /dev/null
@@ -1,93 +0,0 @@
-{% extends 'submissions/admin/base.html' %}
-
-{% block pagetitle %}: editorial recommendation for submission{% endblock pagetitle %}
-
-{% load scipost_extras %}
-{% load bootstrap %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Editorial Recommendation</span>
-{% endblock %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h1 class="card-title">Editorial Recommendation for Submission</h1>
- <p class="card-text">
- Go back to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">
- Editorial Page</a> to take editorial actions
- </p>
- </div>
- </div>
- </div>
-</div>
-
-<h2>Submission</h2>
-{% include 'submissions/_submission_summary.html' with submission=submission %}
-
-<div class="card card-outline-secondary">
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
- <div class="card-body">
- {% if object.remarks.all %}
- <h3 class="card-title">Remarks by Fellows:</h3>
- <ul>
- {% for remark in object.remarks.all|sort_by:'date' %}
- {% include 'partials/submissions/remark_as_li.html' with remark=remark %}
- {% endfor %}
- </ul>
- {% endif %}
-
- <h3 class="card-title">Fellows eligible to vote:</h3>
- <ul>
- <li>
- {% for eligible in object.eligible_to_vote.all|sort_by:'user__last_name' %}
- {{ eligible.user.last_name }},
- {% endfor %}
- </li>
- </ul>
-
- <h3 class="card-title">Voting results up to now:</h3>
- <ul>
- <li>
- Agreed: ({{ object.voted_for.all.count }})
- {% for agreed in object.voted_for.all|sort_by:'user__last_name' %}
- {{ agreed.user.last_name }},
- {% endfor %}
- </li>
- <li>
- Disagreed: ({{ object.voted_against.all.count }})
- {% for disagreed in object.voted_against.all|sort_by:'user__last_name' %}
- {{ disagreed.user.last_name }},
- {% endfor %}
- </li>
- <li>
- Abstained: ({{ object.voted_abstain.all.count }})
- {% for abstained in object.voted_abstain.all|sort_by:'user__last_name' %}
- {{ abstained.user.last_name }},
- {% endfor %}
- </li>
- </ul>
-
- {% if object.remarks %}
- <h3 class="card-title">Remarks:</h3>
- <ul>
- {% for rem in object.remarks.all %}
- <li>{{ rem }}</li>
- {% empty %}
- <li><em>No remarks</em></li>
- {% endfor %}
- </ul>
- {% endif %}
-
- <h3>Actions:</h3>
- <ul>
- <li>To fix the College decision and follow the Editorial Recommendation as is: <a href="{% url 'submissions:fix_College_decision' rec_id=object.id %}">click here</a></li>
- <li>To request a modification of the Recommendation to request for revision: click here</li>
- </ul>
- </div>
-</div>
-{% endblock content %}
diff --git a/submissions/templates/submissions/admin/recommendation.html b/submissions/templates/submissions/admin/recommendation.html
index 43deb3def36289814b0ac16ef1e4d9e243765929..e40ed8c0d607cd2c7b64c1f19981d2a5bff09bd1 100644
--- a/submissions/templates/submissions/admin/recommendation.html
+++ b/submissions/templates/submissions/admin/recommendation.html
@@ -13,49 +13,50 @@
{% block content %}
<h1 class="highlight">Editorial Recommendation</h1>
- <div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content.html' with submission=object.submission %}
- </div>
+ {% include 'submissions/_submission_card_fellow_content.html' with submission=object.submission %}
+
+ <br>
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
- <div class="card card-outline-secondary">
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
+ <br>
+ <div class="card">
<div class="card-body">
{% if object.remarks.exists %}
<h3 class="card-title">Remarks by Fellows:</h3>
<ul>
{% for remark in object.remarks.all|sort_by:'date' %}
{% include 'partials/submissions/remark_as_li.html' with remark=remark %}
+ {% empty %}
+ <li>No Remarks found.</li>
{% endfor %}
</ul>
{% endif %}
<h3 class="card-title">Fellows eligible to vote:</h3>
<ul>
- <li>
- {% for eligible in object.eligible_to_vote.all|sort_by:'user__last_name' %}
- {{ eligible.user.last_name }},
- {% endfor %}
- </li>
+ {% for eligible in object.eligible_to_vote.all|sort_by:'user__last_name' %}
+ <li>{{ eligible.user.first_name }} {{ eligible.user.last_name }}</li>
+ {% endfor %}
</ul>
<h3 class="card-title">Voting results up to now:</h3>
<ul>
<li>
- Agreed: ({{ object.voted_for.all.count }})
+ Agreed ({{ object.voted_for.all.count }}):
{% for agreed in object.voted_for.all|sort_by:'user__last_name' %}
- {{ agreed.user.last_name }},
+ {{ agreed.user.last_name }}{% if not forloop.last %},{% endif %}
{% endfor %}
</li>
<li>
- Disagreed: ({{ object.voted_against.all.count }})
+ Disagreed ({{ object.voted_against.all.count }}):
{% for disagreed in object.voted_against.all|sort_by:'user__last_name' %}
- {{ disagreed.user.last_name }},
+ {{ disagreed.user.last_name }}{% if not forloop.last %},{% endif %}
{% endfor %}
</li>
<li>
- Abstained: ({{ object.voted_abstain.all.count }})
+ Abstained ({{ object.voted_abstain.all.count }}):
{% for abstained in object.voted_abstain.all|sort_by:'user__last_name' %}
- {{ abstained.user.last_name }},
+ {{ abstained.user.last_name }}{% if not forloop.last %},{% endif %}
{% endfor %}
</li>
</ul>
@@ -71,9 +72,9 @@
</ul>
{% endif %}
</div>
- <div class="card-footer">
+ <div class="card-footer bg-light py-3">
<h3 class="card-title">Administrative actions on recommendations undergoing voting:</h3>
- <ul>
+ <ul class="mb-0">
<li>To send an email reminder to each Fellow with at least one voting duty: <a href="{% url 'submissions:remind_Fellows_to_vote' %}">click here</a></li>
<li>To fix the College decision and follow the Editorial Recommendation as is: <a href="{% url 'submissions:fix_College_decision' rec_id=object.id %}">click here</a></li>
<li>To request a modification of the Recommendation to request for revision: click here</li>
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index d7e0c9b4a58ea51079dbeb1bb755054099a58240..1607a04b15df42d6a004b7d1b9cc40f7413ee628 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -48,7 +48,7 @@
{% for recommendation in recommendations.put_to_voting %}
<li>{% include 'partials/submissions/admin/recommendation_tooltip.html' with classes='fa-li' recommendation=recommendation %}
On Editorial Recommendation: {{ recommendation }}<br>
- <a href="{% url 'submissions:admin_recommendation' recommendation.submission.arxiv_identifier_w_vn_nr %}">See Editorial Recommendation</a>
+ <a href="{% url 'submissions:eic_recommendation_detail' recommendation.submission.arxiv_identifier_w_vn_nr recommendation.id %}">See Editorial Recommendation</a>
</li>
{% endfor %}
</ul>
diff --git a/submissions/templates/submissions/pool/recommendation.html b/submissions/templates/submissions/pool/recommendation.html
index d2c050bbb0c1b3090e5f8c6d83a35bb2c81c6b24..ef62f309a2ef42f741699998540a65663237af6f 100644
--- a/submissions/templates/submissions/pool/recommendation.html
+++ b/submissions/templates/submissions/pool/recommendation.html
@@ -14,16 +14,12 @@
{% include 'submissions/_submission_card_fellow_content.html' with submission=recommendation.submission %}
- {# <div class="card card-outline-secondary">#}
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
- <div class="card-footer">
- <h3>Your position on this recommendation</h3>
- <form action="{% url 'submissions:vote_on_rec' rec_id=recommendation.id %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap:'0,12' }}
- <input type="submit" name="submit" value="Cast your vote" class="btn btn-primary submitButton" id="submit-id-submit">
- </form>
- </div>
- {# </div>#}
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
+ <h3 class="mt-4">Your position on this recommendation</h3>
+ <form action="{% url 'submissions:vote_on_rec' rec_id=recommendation.id %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap:'0,12' }}
+ <input type="submit" name="submit" value="Cast your vote" class="btn btn-primary submitButton" id="submit-id-submit">
+ </form>
{% endblock %}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 891f73799991e18c7faf3bf55ae2ceee6a6f5d53..d346863eba3b935a27ae82eedb76e6c2a0c18300 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -110,7 +110,6 @@
<div class="mb-4">
<h2>Events</h2>
- <a href="javascript:;" data-toggle="toggle" data-target="#eventslist">Show/hide events</a>
<div id="eventslist">
{% include 'submissions/submission_event_list.html' with events=submission.events.for_author %}
</div>
diff --git a/submissions/urls.py b/submissions/urls.py
index 63ba083da77f6d3e0da813b3389376a2f11dc871..099facdcb642cbf6217dc4677a638ba8e06d69c6 100644
--- a/submissions/urls.py
+++ b/submissions/urls.py
@@ -39,8 +39,8 @@ urlpatterns = [
views.report_pdf_compile, name='report_pdf_compile'),
url(r'^admin/reports/(?P<report_id>[0-9]+)/compile$',
views.report_pdf_compile, name='report_pdf_compile'),
- url(r'^admin/{regex}/recommendation$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
- views.AdminRecommendationView.as_view(), name='admin_recommendation'),
+ # url(r'^admin/{regex}/recommendation$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
+ # views.AdminRecommendationView.as_view(), name='admin_recommendation'),
url(r'^submit_manuscript$', views.RequestSubmission.as_view(), name='submit_manuscript'),
url(r'^submit_manuscript/prefill$', views.prefill_using_arxiv_identifier,
diff --git a/submissions/views.py b/submissions/views.py
index 5f905b5a4eb3e981f8ce208348adf8cd78522a32..a83c6313e8c0064591cae403e2cdfac3d041a88b 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1569,7 +1569,7 @@ def fix_College_decision(request, rec_id):
class EICRecommendationView(SubmissionAdminViewMixin, DetailView):
permission_required = 'scipost.can_fix_College_decision'
- template_name = 'submissions/admin/eic_recommendation_detail.html'
+ template_name = 'submissions/admin/recommendation.html'
editorial_page = True
def get_context_data(self, *args, **kwargs):
@@ -1604,14 +1604,3 @@ class PlagiarismReportPDFView(SubmissionAdminViewMixin, SingleObjectMixin, Redir
if not url:
raise Http404
return url
-
-
-class AdminRecommendationView(SubmissionAdminViewMixin, DetailView):
- permission_required = 'scipost.can_fix_College_decision'
- template_name = 'submissions/admin/recommendation.html'
- editorial_page = True
-
- def get_object(self):
- """ Get the EICRecommendation as a submission-related instance. """
- submission = super().get_object()
- return submission.eicrecommendations.first()