From 066941ee54d88ef01863ff1c7f08b8003738b5d2 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Mon, 22 Jan 2018 21:03:39 +0100
Subject: [PATCH] ReportRatings to table
---
.../commentaries/commentary_detail.html | 5 ++-
scipost/static/scipost/SciPost.css | 26 ------------
.../scipost/assets/css/_submissions.scss | 28 -------------
.../static/scipost/assets/css/_tables.scss | 14 +++++++
scipost/static/scipost/assets/css/_type.scss | 5 +--
.../scipost/assets/css/scipost-physics.scss | 2 +-
scipost/templates/scipost/comments_block.html | 26 ++++++------
.../submissions/_single_report_ratings.html | 40 ++++++++++++++-----
.../submissions/submission_detail.html | 13 +++---
theses/templates/theses/thesis_detail.html | 5 ++-
10 files changed, 75 insertions(+), 89 deletions(-)
diff --git a/commentaries/templates/commentaries/commentary_detail.html b/commentaries/templates/commentaries/commentary_detail.html
index 4d0160aa6..710c058db 100644
--- a/commentaries/templates/commentaries/commentary_detail.html
+++ b/commentaries/templates/commentaries/commentary_detail.html
@@ -21,7 +21,10 @@
<h3>Abstract:</h3>
<p>{{ commentary.pub_abstract }}</p>
-{% include 'scipost/comments_block.html' with comments=commentary.comments.vetted type_of_object='Commentary' %}
+{% if commentary.comments.vetted %}
+ <hr class="divider">
+ {% include 'scipost/comments_block.html' with comments=commentary.comments.vetted type_of_object='Commentary' %}
+{% endif %}
{% include 'comments/new_comment.html' with object_id=commentary.id type_of_object='commentary' open_for_commenting=commentary.open_for_commenting %}
diff --git a/scipost/static/scipost/SciPost.css b/scipost/static/scipost/SciPost.css
index 59a65ec9a..44e1b4c27 100644
--- a/scipost/static/scipost/SciPost.css
+++ b/scipost/static/scipost/SciPost.css
@@ -486,32 +486,6 @@ table.tablePadded10 td {
background-color: #990000;
}
-.reportRatings {
- font-family: 'Merriweather Sans';
- font-size: 11px;
- margin: 0 4px;
- padding: 0;
- display: inline-block;
- box-shadow: 0 1px 0 1px #ccc;
- background: #f4f4f4;
-}
-.reportRatings ul {
- display: inline-block;
- font-family: 'Merriweather Sans';
- margin: 0;
- padding: 2px 1px;
-}
-.reportRatings ul li {
- border: 1px solid #002b49;
- display: inline-block;
- font-family: 'Merriweather Sans';
- margin: 0 3px;
- padding: 4px 7px;
- border-radius: 1px;
- background-color: #f1f1f1;
-}
-
-
article {
background-color:#eeeeee;
border: 1px solid grey; border-radius:5px;
diff --git a/scipost/static/scipost/assets/css/_submissions.scss b/scipost/static/scipost/assets/css/_submissions.scss
index b6866242e..f41deda48 100644
--- a/scipost/static/scipost/assets/css/_submissions.scss
+++ b/scipost/static/scipost/assets/css/_submissions.scss
@@ -37,34 +37,6 @@ table.submission_header {
}
}
-.reportRatings {
- font-size: 10px;
- margin: 0.5rem 0 1rem;
- padding: 0.3rem 0.5rem 0.4rem;
- display: inline-block;
- box-shadow: 0 1px 0 0 #ccc;
- background: #f9f9f9;
- border: 1px solid;
- border-color: #ececec #ececec #d0d1d5;
- border-radius: 2px;
-
- ul {
- margin: 0;
- padding: 0;
-
- li {
- border: 1px solid;
- display: inline-block;
- margin: 0.1rem;
- padding: 0.25rem 0.5rem;
- border-color: #e5e6e9 #dfe0e4 #d0d1d5;
- border-radius: 2px;
- background: #fff;
- box-shadow: 0 1px 0 0 #ccc;
- }
- }
-}
-
.required-actions {
padding: 0.5rem;
background-color: $red;
diff --git a/scipost/static/scipost/assets/css/_tables.scss b/scipost/static/scipost/assets/css/_tables.scss
index 8873b93c3..978a10b85 100644
--- a/scipost/static/scipost/assets/css/_tables.scss
+++ b/scipost/static/scipost/assets/css/_tables.scss
@@ -28,3 +28,17 @@ table.contributor-info {
vertical-align: top;
}
}
+
+.ratings {
+ background-color: $body-bg;
+ padding: 0.5rem;
+ display: inline-block;
+ border: 1px solid #ddd;
+ text-transform: capitalize;
+
+ th {
+ min-width: 120px;
+ text-align: right;
+ padding: 0.1rem 1rem;
+ }
+}
diff --git a/scipost/static/scipost/assets/css/_type.scss b/scipost/static/scipost/assets/css/_type.scss
index 1ed95d686..f6eef699a 100644
--- a/scipost/static/scipost/assets/css/_type.scss
+++ b/scipost/static/scipost/assets/css/_type.scss
@@ -67,10 +67,9 @@ h5 {
}
.highlight {
- background-color: #f4f4f4;
+ background-color: $body-bg;
border-radius: $card-border-radius;
- border: 1px solid #ececec;
- box-shadow: 0 1px 0 0 $card-shadow-color;
+ border: 1px solid #ddd;
&.tight {
display: inline-block;
diff --git a/scipost/static/scipost/assets/css/scipost-physics.scss b/scipost/static/scipost/assets/css/scipost-physics.scss
index 816d3a46b..381822f4d 100644
--- a/scipost/static/scipost/assets/css/scipost-physics.scss
+++ b/scipost/static/scipost/assets/css/scipost-physics.scss
@@ -32,7 +32,7 @@
&.active {
color: #002b49;
background: rgba(255, 255, 255, 0.5);
- box-shadow: 0 1px 0 0 #ccc;
+ box-shadow: 0 1px 0 0 #ddd;
}
}
}
diff --git a/scipost/templates/scipost/comments_block.html b/scipost/templates/scipost/comments_block.html
index bc60d0b67..d3fa22a5a 100644
--- a/scipost/templates/scipost/comments_block.html
+++ b/scipost/templates/scipost/comments_block.html
@@ -1,19 +1,19 @@
{% if comments %}
-<hr>
-<div class="row">
- <div class="col-12">
- <div class="card card-grey">
- <div class="card-body">
- <h2 class="card-title mb-0">Comments{% if type_of_object %} on this {{type_of_object}}{% endif %}</h2>
- <a href="javascript:;" data-toggle="toggle" data-target="#commentslist">Toggle comments view</a>
+
+ <div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Comments{% if type_of_object %} on this {{type_of_object}}{% endif %}</h2>
+ <a href="javascript:;" data-toggle="toggle" data-target="#commentslist">Toggle comments view</a>
+ </div>
</div>
</div>
</div>
-</div>
-<div id="commentslist">
- {% for comment in comments %}
- {% include 'comments/_single_comment_with_link.html' with comment=comment perms=perms user=request.user %}
- {% endfor %}
-</div>
+ <div id="commentslist">
+ {% for comment in comments %}
+ {% include 'comments/_single_comment_with_link.html' with comment=comment perms=perms user=request.user %}
+ {% endfor %}
+ </div>
{% endif %}
diff --git a/submissions/templates/submissions/_single_report_ratings.html b/submissions/templates/submissions/_single_report_ratings.html
index f5280e13d..5eeb8dcf8 100644
--- a/submissions/templates/submissions/_single_report_ratings.html
+++ b/submissions/templates/submissions/_single_report_ratings.html
@@ -1,10 +1,32 @@
-<div class="reportRatings mt-2">
- <ul>
- <li>validity: {{report.get_validity_display}}</li>
- <li>significance: {{report.get_significance_display}}</li>
- <li>originality: {{report.get_originality_display}}</li>
- <li>clarity: {{report.get_clarity_display}}</li>
- <li>formatting: {{report.get_formatting_display}}</li>
- <li>grammar: {{report.get_grammar_display}}</li>
- </ul>
+<div class="ratings">
+ <table>
+ <tr>
+ <th>Validity</th>
+ <td>{{ report.get_validity_display }}</td>
+ </tr>
+ <tr>
+ <th>Significance</th>
+ <td>{{ report.get_significance_display }}</td>
+ </tr>
+ <tr>
+ <th>Validity</th>
+ <td>{{ report.get_grammar_display }}</td>
+ </tr>
+ <tr>
+ <th>Originality</th>
+ <td>{{ report.get_originality_display }}</td>
+ </tr>
+ <tr>
+ <th>Clarity</th>
+ <td>{{ report.get_clarity_display }}</td>
+ </tr>
+ <tr>
+ <th>Formatting</th>
+ <td>{{ report.get_formatting_display }}</td>
+ </tr>
+ <tr>
+ <th>Grammar</th>
+ <td>{{ report.get_grammar_display }}</td>
+ </tr>
+ </table>
</div>
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 70620146b..6cfb4f77b 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -10,10 +10,8 @@
<div class="container-outside breadcrumb-nav">
<div class="container">
<nav class="breadcrumb">
-
- <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
- <span class="breadcrumb-item">{{submission.arxiv_identifier_w_vn_nr}}</span>
-
+ <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
+ <span class="breadcrumb-item">{{submission.arxiv_identifier_w_vn_nr}}</span>
</nav>
</div>
</div>
@@ -222,9 +220,10 @@
{% endif %}
{% endif %}
-<hr class="divider">
-
-{% include 'scipost/comments_block.html' with comments=submission.comments.vetted %}
+{% if submission.comments.vetted %}
+ <hr class="divider">
+ {% include 'scipost/comments_block.html' with comments=submission.comments.vetted %}
+{% endif %}
{# This is an apparent redundant logic block; however, it makes sure the "login to ..." links wouldn't be shown twice! #}
diff --git a/theses/templates/theses/thesis_detail.html b/theses/templates/theses/thesis_detail.html
index 7ed53d775..46df60782 100644
--- a/theses/templates/theses/thesis_detail.html
+++ b/theses/templates/theses/thesis_detail.html
@@ -14,7 +14,10 @@
</div>
</div>
-{% include 'scipost/comments_block.html' with comments=thesislink.comments.vetted type_of_object='ThesisLink' %}
+{% if thesislink.comments.vetted %}
+ <hr class="divider">
+ {% include 'scipost/comments_block.html' with comments=thesislink.comments.vetted type_of_object='ThesisLink' %}
+{% endif %}
{% include 'comments/new_comment.html' with object_id=thesislink.id type_of_object='thesislink' open_for_commenting=thesislink.open_for_commenting %}
--
GitLab