From 782ee357797f1442c25eefb712ac11e639a9d439 Mon Sep 17 00:00:00 2001
From: Bartuccio Antoine <klmp200@klmp200.net>
Date: Sat, 6 Jul 2019 02:30:47 +0200
Subject: [PATCH] pedagogy: incorpore all elements in comment block

---
 core/static/core/style.scss                 | 17 +++++++++-
 pedagogy/templates/pedagogy/macros.jinja    |  2 +-
 pedagogy/templates/pedagogy/uv_detail.jinja | 35 ++++++++++++---------
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/core/static/core/style.scss b/core/static/core/style.scss
index ea6ed00b..3e54d38f 100644
--- a/core/static/core/style.scss
+++ b/core/static/core/style.scss
@@ -1730,6 +1730,10 @@ label {
     margin-bottom: 30px;
     margin-top: 10px;
 
+    .anchor {
+      float: right;
+    }
+
     .grade_block {
 
       .grade {
@@ -1757,6 +1761,10 @@ label {
       }
     }
 
+    .not_rated {
+      color: #f0f0f0;
+    }
+
     .info {
       background-color: #1bb9ea;
       width: 100%;
@@ -1801,12 +1809,19 @@ label {
     }
 
     .action {
-      float: left;
+      float: right;
       text-align: center;
       padding: 5px;
       margin: 0px;
     }
 
+    .status_reported {
+      color: red;
+      float: left;
+      padding: 5px;
+      margin: 0px;
+    }
+
     .markdown {
       height: 125px;
       margin-top: 0px;
diff --git a/pedagogy/templates/pedagogy/macros.jinja b/pedagogy/templates/pedagogy/macros.jinja
index 78b78afc..2f26dfd6 100644
--- a/pedagogy/templates/pedagogy/macros.jinja
+++ b/pedagogy/templates/pedagogy/macros.jinja
@@ -9,7 +9,7 @@
             {% endif %}
         {% endfor %}
     {% else %}
-        <p> {% trans %} not rated {% endtrans %} </p>
+        <p class="not_rated"> {% trans %} not rated {% endtrans %} </p>
     {% endif %}
 
 {%- endmacro %}
\ No newline at end of file
diff --git a/pedagogy/templates/pedagogy/uv_detail.jinja b/pedagogy/templates/pedagogy/uv_detail.jinja
index 7bd233ee..84dc78ba 100644
--- a/pedagogy/templates/pedagogy/uv_detail.jinja
+++ b/pedagogy/templates/pedagogy/uv_detail.jinja
@@ -31,10 +31,10 @@
 					<div class="grade_block">
 						<div class="dif_grade">
 							<p>{% trans %}global grade{% endtrans %}</p>
-							<p>{% trans %}utility grade{% endtrans %}</p>
-							<p>{% trans %}interest grade{% endtrans %}</p>
-							<p>{% trans %}teaching grade{% endtrans %}</p>
-							<p>{% trans %}work_load grade{% endtrans %}</p>
+							<p>{% trans %}utility{% endtrans %}</p>
+							<p>{% trans %}interest{% endtrans %}</p>
+							<p>{% trans %}teaching{% endtrans %}</p>
+							<p>{% trans %}work load{% endtrans %}</p>
 						</div>
 						<div class="grade">
 							<p>{{ display_star(comment.grade_global) }}</p>
@@ -44,24 +44,29 @@
 							<p>{{ display_star(comment.grade_work_load) }}</p>
 						</div>
 					</div>
+					<div class="anchor">
+						<a href="{{ url('pedagogy:uv_detail', uv_id=uv.id) }}#{{ comment.id }}"><i class="fa fa-paragraph"></i></a>
+					</div>
 					{{ comment.comment|markdown }}
 
+					{% if comment.is_reported %}
+						<p class="status_reported">
+							{% trans %}This comment has been reported{% endtrans %}
+						</p>
+					{% endif %}
+
+					{% if user.is_owner(comment) %}
+						<p class="action">
+								<a href="{{ url('pedagogy:comment_update', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a>
+								<a href="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}">{% trans %}Delete{% endtrans %}</a>
+						</p>
+					{% endif %}
+
 					<div class="info">
 						<p class="report"><a href="{{ url('pedagogy:comment_report', comment_id=comment.id) }}">{% trans %}Report this comment{% endtrans %}</a></p>
 						<p class="date_info">{{ comment.publish_date.strftime('%d/%m/%Y') }}</p>
 						<p class="author_info">{{ comment.author }}</p>
 					</div>
-					{# Warning, it's not displayed yet #}
-					<p class="action">
-						<a href="{{ url('pedagogy:uv_detail', uv_id=uv.id) }}#{{ comment.id }}"><i class="fa fa-paragraph"></i></a>
-						{% if user.is_owner(comment) %}
-							<a href="{{ url('pedagogy:comment_update', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a>
-							<a href="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}">{% trans %}Delete{% endtrans %}</a>
-						{% endif %}
-					</p>
-					{% if comment.is_reported %}
-						<p>{% trans %}This comment has been reported{% endtrans %}</p>
-					{% endif %}
 
 				</div>
 			{% endfor %}