diff --git a/core/static/core/style.scss b/core/static/core/style.scss index a97a156e..c5f2fd19 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -1896,7 +1896,7 @@ $pedagogy-white-text: #f0f0f0; .comment-container { display: grid; - grid-template-columns: auto auto; + grid-template-columns: 300px auto; grid-template-rows: 156px auto auto; grid-template-areas: "grade-block comment" "grade-block info" "comment-end-bar comment-end-bar"; margin-bottom: 30px; @@ -1968,6 +1968,7 @@ $pedagogy-white-text: #f0f0f0; .markdown { grid-area: markdown; + overflow: scroll; margin-top: 0px; margin-right: 0px; @@ -2018,9 +2019,9 @@ $pedagogy-white-text: #f0f0f0; .report { grid-area: report; - padding-top: 6px; + padding-top: 8px; padding-left: 20px; - background-color: $pedagogy-orange; + background-color: $white-color; clip-path: polygon(0 0%, 0 200%, 300px 200%, 250px 0); @media screen and (max-width: $large-devices){ @@ -2032,8 +2033,7 @@ $pedagogy-white-text: #f0f0f0; } & a { - color: $pedagogy-white-text; - font-weight: bold; + color: $black-color; } } @@ -2051,20 +2051,33 @@ $pedagogy-white-text: #f0f0f0; grid-area: author; justify-self: right; padding-right: 30px; + padding-left: 30px; + background-color: $pedagogy-light-blue; a { - color: $pedagogy-white-text; + color: $pedagogy-orange; font-weight: bold; } a:hover { - color: $pedagogy-light-blue; + color: $black-color; } @media screen and (max-width: $large-devices){ text-align: center; justify-self: inherit; padding-right: 0px; + padding-bottom: 10px; + background-color: $pedagogy-blue; + + a { + color: $pedagogy-white-text; + font-weight: bold; + } + + a:hover { + color: $pedagogy-light-blue; + } } } } diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index f3198f85..1278e461 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -4879,8 +4879,7 @@ msgstr "heures TE" msgid "uv" msgstr "uv" -#: pedagogy/models.py:222 pedagogy/templates/pedagogy/uv_detail.jinja:57 -#: pedagogy/templates/pedagogy/uv_detail.jinja:146 +#: pedagogy/models.py:222 msgid "global grade" msgstr "note globale" @@ -4997,25 +4996,30 @@ msgstr "TE : " msgid "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:147 -msgid "utility" -msgstr "utilité" +msgid "Utility" +msgstr "Utilité" #: pedagogy/templates/pedagogy/uv_detail.jinja:59 #: pedagogy/templates/pedagogy/uv_detail.jinja:148 -msgid "interest" -msgstr "intérêt" +msgid "Interest" +msgstr "Intérêt" #: pedagogy/templates/pedagogy/uv_detail.jinja:60 #: pedagogy/templates/pedagogy/uv_detail.jinja:149 -msgid "teaching" -msgstr "enseignement" +msgid "Teaching" +msgstr "Enseignement" #: pedagogy/templates/pedagogy/uv_detail.jinja:61 #: pedagogy/templates/pedagogy/uv_detail.jinja:150 -msgid "work load" -msgstr "charge de travail" +msgid "Work load" +msgstr "Charge de travail" #: pedagogy/templates/pedagogy/uv_detail.jinja:71 msgid "Objectives" diff --git a/pedagogy/templates/pedagogy/uv_detail.jinja b/pedagogy/templates/pedagogy/uv_detail.jinja index 3e94824d..7abd11b3 100644 --- a/pedagogy/templates/pedagogy/uv_detail.jinja +++ b/pedagogy/templates/pedagogy/uv_detail.jinja @@ -54,11 +54,11 @@
-

{% trans %}global grade{% endtrans %}

-

{% trans %}utility{% endtrans %}

-

{% trans %}interest{% endtrans %}

-

{% trans %}teaching{% endtrans %}

-

{% trans %}work load{% endtrans %}

+

{% trans %}Global grade{% endtrans %}

+

{% trans %}Utility{% endtrans %}

+

{% trans %}Interest{% endtrans %}

+

{% trans %}Teaching{% endtrans %}

+

{% trans %}Work load{% endtrans %}

{{ display_star(object.grade_global_average) }}

@@ -143,11 +143,11 @@
-

{% trans %}global grade{% endtrans %}

-

{% trans %}utility{% endtrans %}

-

{% trans %}interest{% endtrans %}

-

{% trans %}teaching{% endtrans %}

-

{% trans %}work load{% endtrans %}

+

{% trans %}Global grade{% endtrans %}

+

{% trans %}Utility{% endtrans %}

+

{% trans %}Interest{% endtrans %}

+

{% trans %}Teaching{% endtrans %}

+

{% trans %}Work load{% endtrans %}

{{ display_star(comment.grade_global) }}

@@ -185,7 +185,7 @@

{{ comment.publish_date.strftime('%d/%m/%Y') }}

-

{{ user_profile_link(comment.author) }}

+

{{ user_profile_link(comment.author) }}