klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-10-31 19:38:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

small change comment

Browse Source
This commit is contained in:
root 2019-07-05 22:42:13 -05:00
parent bfb7380715
commit 601193ff3c
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/static/core/style.scss
View File

@ -1683,16 +1683,15 @@ label {
#pedagogy { #pedagogy {
font-family: "Fira Sans"; font-family: "Fira Sans";
color: #062f38; color: #062f38;
background-color: #caf0ff;
.comment { .comment {
background-color: #caf0ff;
max-width: 100%; max-width: 100%;
max-height: 200px; max-height: 200px;
overflow: hidden; overflow: hidden;
margin-bottom: 40px; margin-bottom: 30px;
margin-top: 10px;
.grade { .grade {
height: 200px; height: 156px;
float: left; float: left;
text-align: left; text-align: left;
padding: 15px; padding: 15px;
@ -1705,8 +1704,9 @@ label {
.dif_grade { .dif_grade {
background-color: #1bb9ea; background-color: #1bb9ea;
color: #f0f0f0; color: #f0f0f0;
height: 200px; height: 156px;
float: left; float: left;
font-weight: bold;
text-align: right; text-align: right;
padding: 15px; padding: 15px;
padding-top: 0px; padding-top: 0px;
@ -1718,6 +1718,7 @@ label {
text-align: center; text-align: center;
width: 50px; width: 50px;
padding: 5px; padding: 5px;
font-weight: bold;
margin: 0px; margin: 0px;
float: left; float: left;
padding-right: 50px; padding-right: 50px;
@ -1733,16 +1734,21 @@ label {
margin: 0px; margin: 0px;
} }
.action {
float: left;
text-align: center;
padding: 5px;
margin: 0px;
}
.text { .text {
height: 125px; height: 125px;
margin-top: 0px; margin-top: 0px;
margin-right: 0px; margin-right: 0px;
padding: 10px; padding: 10px;
padding-left: 40px; padding-left: 40px;
margin-bottom: 29px;
overflow: auto; overflow: auto;
text-align: justify; text-align: justify;
background-color: #caf0ff;
} }
} }
} }

16
pedagogy/templates/pedagogy/uv_detail.jinja
View File

@ -9,9 +9,7 @@
<div id="pedagogy"> <div id="pedagogy">
<p><a href="{{ url('pedagogy:guide') }}">{% trans %}Back{% endtrans %}</a></p> <p><a href="{{ url('pedagogy:guide') }}">{% trans %}Back{% endtrans %}</a></p>
<h1>{{ object.code }} - {{ object.title }}</h1> <h1>{{ object.code }} - {{ object.title }}</h1>
<p>{{ object.department }}</p> <p style = "word-spacing: 20px;">{{ object.department }} {{ object.credit_type }} {{ object.semester }}</p>
<p>{{ object.credit_type }}</p>
<p>{{ object.semester }}</p>
<p>{{ object.objectives|markdown }}</p> <p>{{ object.objectives|markdown }}</p>
<p>{{ object.program|markdown }}</p> <p>{{ object.program|markdown }}</p>
<p>{{ object.skills|markdown }}</p> <p>{{ object.skills|markdown }}</p>
@ -47,15 +45,17 @@
<p class="author_info">{{ comment.author }}</p> <p class="author_info">{{ comment.author }}</p>
{# Warning, it's not displayed yet #} {# Warning, it's not displayed yet #}
<p><a href="{{ url('pedagogy:comment_report', comment_id=comment.id) }}">{% trans %}Report{% endtrans %}</a></p> <p class="action">
<a href="{{ url('pedagogy:comment_report', comment_id=comment.id) }}">{% trans %}Report{% endtrans %}</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 %} {% if comment.is_reported %}
<p>{% trans %}This comment has been reported{% endtrans %}</p> <p>{% trans %}This comment has been reported{% endtrans %}</p>
{% endif %} {% endif %}
{% if user.is_owner(comment) %}
<p><a href="{{ url('pedagogy:comment_update', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a></p>
<p><a href="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}">{% trans %}Delete{% endtrans %}</a></p>
{% endif %}
</div> </div>
{% endfor %} {% endfor %}
{% endif %} {% endif %}