Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
AE
Sith
Commits
f052d307
Verified
Commit
f052d307
authored
Jul 08, 2019
by
Sli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pedagogy: make report button less visible and author more important
parent
f15971ce
Pipeline
#1902
failed with stage
in 60 minutes and 4 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
29 deletions
+46
-29
core/static/core/style.scss
core/static/core/style.scss
+20
-7
locale/fr/LC_MESSAGES/django.po
locale/fr/LC_MESSAGES/django.po
+15
-11
pedagogy/templates/pedagogy/uv_detail.jinja
pedagogy/templates/pedagogy/uv_detail.jinja
+11
-11
No files found.
core/static/core/style.scss
View file @
f052d307
...
...
@@ -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
:
6
px
;
padding-top
:
8
px
;
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
;
}
}
}
}
...
...
locale/fr/LC_MESSAGES/django.po
View file @
f052d307
...
...
@@ -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 <skia@libskia.so>
\n
"
"Language-Team: AE info <ae.info@utbm.fr>
\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
"
u
tility"
msgstr
"
u
tilité"
msgid
"
U
tility"
msgstr
"
U
tilité"
#: pedagogy/templates/pedagogy/uv_detail.jinja:59
#: pedagogy/templates/pedagogy/uv_detail.jinja:148
msgid
"
i
nterest"
msgstr
"
i
ntérêt"
msgid
"
I
nterest"
msgstr
"
I
ntérêt"
#: pedagogy/templates/pedagogy/uv_detail.jinja:60
#: pedagogy/templates/pedagogy/uv_detail.jinja:149
msgid
"
t
eaching"
msgstr
"
e
nseignement"
msgid
"
T
eaching"
msgstr
"
E
nseignement"
#: pedagogy/templates/pedagogy/uv_detail.jinja:61
#: pedagogy/templates/pedagogy/uv_detail.jinja:150
msgid
"
w
ork load"
msgstr
"
c
harge de travail"
msgid
"
W
ork load"
msgstr
"
C
harge de travail"
#: pedagogy/templates/pedagogy/uv_detail.jinja:71
msgid
"Objectives"
...
...
pedagogy/templates/pedagogy/uv_detail.jinja
View file @
f052d307
...
...
@@ -54,11 +54,11 @@
<div
class=
"uv-details-container"
>
<div
class=
"grade"
>
<p>
{%
trans
%}
g
lobal grade
{%
endtrans
%}
</p>
<p>
{%
trans
%}
u
tility
{%
endtrans
%}
</p>
<p>
{%
trans
%}
i
nterest
{%
endtrans
%}
</p>
<p>
{%
trans
%}
t
eaching
{%
endtrans
%}
</p>
<p>
{%
trans
%}
w
ork load
{%
endtrans
%}
</p>
<p>
{%
trans
%}
G
lobal grade
{%
endtrans
%}
</p>
<p>
{%
trans
%}
U
tility
{%
endtrans
%}
</p>
<p>
{%
trans
%}
I
nterest
{%
endtrans
%}
</p>
<p>
{%
trans
%}
T
eaching
{%
endtrans
%}
</p>
<p>
{%
trans
%}
W
ork load
{%
endtrans
%}
</p>
</div>
<div
class=
"grade-stars"
>
<p>
{{
display_star
(
object.grade_global_average
)
}}
</p>
...
...
@@ -143,11 +143,11 @@
<div
class=
"grade-block"
>
<div
class=
"grade-type"
>
<p>
{%
trans
%}
g
lobal grade
{%
endtrans
%}
</p>
<p>
{%
trans
%}
u
tility
{%
endtrans
%}
</p>
<p>
{%
trans
%}
i
nterest
{%
endtrans
%}
</p>
<p>
{%
trans
%}
t
eaching
{%
endtrans
%}
</p>
<p>
{%
trans
%}
w
ork load
{%
endtrans
%}
</p>
<p>
{%
trans
%}
G
lobal grade
{%
endtrans
%}
</p>
<p>
{%
trans
%}
U
tility
{%
endtrans
%}
</p>
<p>
{%
trans
%}
I
nterest
{%
endtrans
%}
</p>
<p>
{%
trans
%}
T
eaching
{%
endtrans
%}
</p>
<p>
{%
trans
%}
W
ork load
{%
endtrans
%}
</p>
</div>
<div
class=
"grade-stars"
>
<p>
{{
display_star
(
comment.grade_global
)
}}
</p>
...
...
@@ -185,7 +185,7 @@
<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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment