diff --git a/scipost/static/scipost/assets/css/_reports.scss b/scipost/static/scipost/assets/css/_reports.scss
new file mode 100644
index 0000000000000000000000000000000000000000..30ee19e1326011dad371d4ceb5b085c2876cd638
--- /dev/null
+++ b/scipost/static/scipost/assets/css/_reports.scss
@@ -0,0 +1,20 @@
+.report {
+ ul.clickables {
+ display: inline-block;
+ list-style: none;
+ margin: 0.5rem 0 0 0;
+ padding: 0;
+
+ li {
+ padding: 0 0 0.25rem 0;
+ }
+
+ .citation {
+ color: $scipost-lightblue;
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+ }
+}
diff --git a/scipost/static/scipost/assets/css/_submissions.scss b/scipost/static/scipost/assets/css/_submissions.scss
index 3dae5291ec7064cdbdbe6ec349c416222af1106b..b6866242e8d08f48770cb1fa2b9951f85a753018 100644
--- a/scipost/static/scipost/assets/css/_submissions.scss
+++ b/scipost/static/scipost/assets/css/_submissions.scss
@@ -17,7 +17,7 @@ table.submission_header {
box-shadow: 0 1px 0 0 $card-shadow-color;
border: 1px solid;
border-color: $card-grey-border-color;
- z-index: -1;
+ z-index: 1;
border-radius: $border-radius 0 $border-radius $border-radius;
}
diff --git a/scipost/static/scipost/assets/css/_type.scss b/scipost/static/scipost/assets/css/_type.scss
index 52798b0cc849833716e0725dcdda5b0687be69a6..1ed95d68659b7b67be1def103b59410d7d4efbbf 100644
--- a/scipost/static/scipost/assets/css/_type.scss
+++ b/scipost/static/scipost/assets/css/_type.scss
@@ -119,6 +119,18 @@ hr.hr12 {
&.small {
height: 1px;
}
+
+ &.divider {
+ height: 10px;
+ border-radius: 0;
+ background-color: $body-bg;
+ margin-left: -$grid-gutter-width;
+ margin-right: -$grid-gutter-width;
+ margin-top: 1.5rem;
+ margin-bottom: 1.5rem;
+ box-shadow: none;
+ width: auto;
+ }
}
.text-blue {
diff --git a/scipost/static/scipost/assets/css/style.scss b/scipost/static/scipost/assets/css/style.scss
index ddd9fc91b2ca14722ee634cfe12ee1f75cb090a8..6e6fca92a968ba2d2d382a858ba4c5e410042741 100644
--- a/scipost/static/scipost/assets/css/style.scss
+++ b/scipost/static/scipost/assets/css/style.scss
@@ -48,6 +48,7 @@
@import "icons";
@import "journals";
@import "personal_page";
+@import "reports";
@import "submissions";
diff --git a/submissions/templates/submissions/_single_public_report_without_comments.html b/submissions/templates/submissions/_single_public_report_without_comments.html
index c62c2c85235137068cabe9f38fbc260bf1306958..9cef73f77f565c5487321f0c12109f78d5a9a575 100644
--- a/submissions/templates/submissions/_single_public_report_without_comments.html
+++ b/submissions/templates/submissions/_single_public_report_without_comments.html
@@ -7,18 +7,26 @@
{% if user.contributor == submission.editor_in_charge or user|is_in_group:'Editorial Administrators' and user|is_not_author_of_submission:submission.arxiv_identifier_w_vn_nr %}
<div class="reportid">
- <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>
+ {% 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>{{ report|citation }}</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="clickables">
+ {% if report.doi_string %}
+ <li>Cite as: <span class="citation">{{ report|citation }}</span></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"><i class="fa fa-download"></i> Download as PDF</a>
+ </li>
+ {% endif %}
+ </ul>
+ {% if perms.scipost.can_manage_reports %}
+ <h3 class="mt-2">Administration</h3>
+ <ul>
+ <li><a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a></li>
+ </ul>
+ {% endif %}
</div>
{% if report.flagged %}
@@ -49,17 +57,22 @@
</div>
{% else %}
<div class="reportid">
- <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 %}
+ <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>Cite: <span class="citation">{{ report|citation }}</span></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 class="clickables">
+ {% if report.doi_string %}
+ <li>Cite as: <span class="citation">{{ report|citation }}</span></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"><i class="fa fa-download"></i> 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>
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index a98239cdfab58ee3005ba7820c2c6c8ee2eb8b6d..70620146bbc085726c0d5700ec63e275280b77d6 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -170,8 +170,10 @@
{% endif %}
{% if invited_reports %}
-{# <hr>#}
-<div class="row mt-4">
+
+<hr class="divider">
+
+<div class="row">
<div class="col-12">
<div class="card card-grey">
<div class="card-body">
@@ -191,8 +193,9 @@
{% endif %}
{% if contributed_reports %}
-{# <hr>#}
-<div class="row mt-4">
+<hr class="divider">
+
+<div class="row">
<div class="col-12">
<div class="card card-grey">
<div class="card-body">
@@ -219,6 +222,8 @@
{% endif %}
{% endif %}
+<hr class="divider">
+
{% include 'scipost/comments_block.html' with comments=submission.comments.vetted %}