klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pedagogy: make report button less visible and author more important

This commit is contained in:
Antoine Bartuccio 2019-07-08 23:16:53 +02:00
parent f15971cecf
commit f052d307d7
Signed by: klmp200
GPG Key ID: E7245548C53F904B
3 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1896,7 +1896,7 @@ $pedagogy-white-text: #f0f0f0;
.comment-container { .comment-container {
display: grid; display: grid;
grid-template-columns: auto auto; grid-template-columns: 300px auto;
grid-template-rows: 156px auto auto; grid-template-rows: 156px auto auto;
grid-template-areas: "grade-block comment" "grade-block info" "comment-end-bar comment-end-bar"; grid-template-areas: "grade-block comment" "grade-block info" "comment-end-bar comment-end-bar";
margin-bottom: 30px; margin-bottom: 30px;
@ -1968,6 +1968,7 @@ $pedagogy-white-text: #f0f0f0;
.markdown { .markdown {
grid-area: markdown; grid-area: markdown;
overflow: scroll; overflow: scroll;
margin-top: 0px; margin-top: 0px;
margin-right: 0px; margin-right: 0px;
@ -2018,9 +2019,9 @@ $pedagogy-white-text: #f0f0f0;
.report { .report {
grid-area: report; grid-area: report;
padding-top: 6px; padding-top: 8px;
padding-left: 20px; padding-left: 20px;
background-color: $pedagogy-orange; background-color: $white-color;
clip-path: polygon(0 0%, 0 200%, 300px 200%, 250px 0); clip-path: polygon(0 0%, 0 200%, 300px 200%, 250px 0);
@media screen and (max-width: $large-devices){ @media screen and (max-width: $large-devices){
@ -2032,8 +2033,7 @@ $pedagogy-white-text: #f0f0f0;
} }
& a { & a {
color: $pedagogy-white-text; color: $black-color;
font-weight: bold;
} }
} }
@ -2051,20 +2051,33 @@ $pedagogy-white-text: #f0f0f0;
grid-area: author; grid-area: author;
justify-self: right; justify-self: right;
padding-right: 30px; padding-right: 30px;
padding-left: 30px;
background-color: $pedagogy-light-blue;
a { a {
color: $pedagogy-white-text; color: $pedagogy-orange;
font-weight: bold; font-weight: bold;
} }
a:hover { a:hover {
color: $pedagogy-light-blue; color: $black-color;
} }
@media screen and (max-width: $large-devices){ @media screen and (max-width: $large-devices){
text-align: center; text-align: center;
justify-self: inherit; justify-self: inherit;
padding-right: 0px; padding-right: 0px;
padding-bottom: 10px;
background-color: $pedagogy-blue;
a {
color: $pedagogy-white-text;
font-weight: bold;
}
a:hover {
color: $pedagogy-light-blue;
}
} }
} }
} }

26
locale/fr/LC_MESSAGES/django.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-07-08 17:32+0200\n" "POT-Creation-Date: 2019-07-08 22:46+0200\n"
"PO-Revision-Date: 2016-07-18\n" "PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n" "Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n" "Language-Team: AE info <ae.info@utbm.fr>\n"
@ -4879,8 +4879,7 @@ msgstr "heures TE"
msgid "uv" msgid "uv"
msgstr "uv" msgstr "uv"
#: pedagogy/models.py:222 pedagogy/templates/pedagogy/uv_detail.jinja:57 #: pedagogy/models.py:222
#: pedagogy/templates/pedagogy/uv_detail.jinja:146
msgid "global grade" msgid "global grade"
msgstr "note globale" msgstr "note globale"
@ -4997,25 +4996,30 @@ msgstr "TE : "
msgid "THE: " msgid "THE: "
msgstr "THE : " msgstr "THE : "
#: pedagogy/templates/pedagogy/uv_detail.jinja:57
#: pedagogy/templates/pedagogy/uv_detail.jinja:146
msgid "Global grade"
msgstr "Note globale"
#: pedagogy/templates/pedagogy/uv_detail.jinja:58 #: pedagogy/templates/pedagogy/uv_detail.jinja:58
#: pedagogy/templates/pedagogy/uv_detail.jinja:147 #: pedagogy/templates/pedagogy/uv_detail.jinja:147
msgid "utility" msgid "Utility"
msgstr "utilité" msgstr "Utilité"
#: pedagogy/templates/pedagogy/uv_detail.jinja:59 #: pedagogy/templates/pedagogy/uv_detail.jinja:59
#: pedagogy/templates/pedagogy/uv_detail.jinja:148 #: pedagogy/templates/pedagogy/uv_detail.jinja:148
msgid "interest" msgid "Interest"
msgstr "intérêt" msgstr "Intérêt"
#: pedagogy/templates/pedagogy/uv_detail.jinja:60 #: pedagogy/templates/pedagogy/uv_detail.jinja:60
#: pedagogy/templates/pedagogy/uv_detail.jinja:149 #: pedagogy/templates/pedagogy/uv_detail.jinja:149
msgid "teaching" msgid "Teaching"
msgstr "enseignement" msgstr "Enseignement"
#: pedagogy/templates/pedagogy/uv_detail.jinja:61 #: pedagogy/templates/pedagogy/uv_detail.jinja:61
#: pedagogy/templates/pedagogy/uv_detail.jinja:150 #: pedagogy/templates/pedagogy/uv_detail.jinja:150
msgid "work load" msgid "Work load"
msgstr "charge de travail" msgstr "Charge de travail"
#: pedagogy/templates/pedagogy/uv_detail.jinja:71 #: pedagogy/templates/pedagogy/uv_detail.jinja:71
msgid "Objectives" msgid "Objectives"

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

@ -54,11 +54,11 @@
<div class="uv-details-container"> <div class="uv-details-container">
<div class="grade"> <div class="grade">
<p>{% trans %}global grade{% endtrans %}</p> <p>{% trans %}Global grade{% endtrans %}</p>
<p>{% trans %}utility{% endtrans %}</p> <p>{% trans %}Utility{% endtrans %}</p>
<p>{% trans %}interest{% endtrans %}</p> <p>{% trans %}Interest{% endtrans %}</p>
<p>{% trans %}teaching{% endtrans %}</p> <p>{% trans %}Teaching{% endtrans %}</p>
<p>{% trans %}work load{% endtrans %}</p> <p>{% trans %}Work load{% endtrans %}</p>
</div> </div>
<div class="grade-stars"> <div class="grade-stars">
<p>{{ display_star(object.grade_global_average) }}</p> <p>{{ display_star(object.grade_global_average) }}</p>
@ -143,11 +143,11 @@
<div class="grade-block"> <div class="grade-block">
<div class="grade-type"> <div class="grade-type">
<p>{% trans %}global grade{% endtrans %}</p> <p>{% trans %}Global grade{% endtrans %}</p>
<p>{% trans %}utility{% endtrans %}</p> <p>{% trans %}Utility{% endtrans %}</p>
<p>{% trans %}interest{% endtrans %}</p> <p>{% trans %}Interest{% endtrans %}</p>
<p>{% trans %}teaching{% endtrans %}</p> <p>{% trans %}Teaching{% endtrans %}</p>
<p>{% trans %}work load{% endtrans %}</p> <p>{% trans %}Work load{% endtrans %}</p>
</div> </div>
<div class="grade-stars"> <div class="grade-stars">
<p>{{ display_star(comment.grade_global) }}</p> <p>{{ display_star(comment.grade_global) }}</p>
@ -185,7 +185,7 @@
<p class="date">{{ comment.publish_date.strftime('%d/%m/%Y') }}</p> <p class="date">{{ comment.publish_date.strftime('%d/%m/%Y') }}</p>
<p class="author">{{ user_profile_link(comment.author) }}</p> <div class="author"><p>{{ user_profile_link(comment.author) }}</p></div>
</div> </div>
</div> </div>