Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
groupe-calcul
website
Commits
ef5e041c
Commit
ef5e041c
authored
Jun 01, 2022
by
Matthieu Boileau
Browse files
Fix
#269
parent
e31ed3b0
Pipeline
#18404
passed with stages
in 50 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
plugins/event_schedule/directives.py
View file @
ef5e041c
...
...
@@ -148,7 +148,9 @@ class Event(Directive):
node
[
'begin'
]
=
dateutil
.
parser
.
parse
(
self
.
options
[
'begin'
])
node
[
'end'
]
=
dateutil
.
parser
.
parse
(
self
.
options
[
'end'
])
node
[
'title'
]
=
self
.
arguments
[
0
]
node
[
'speaker'
]
=
self
.
options
.
get
(
'speaker'
,
None
)
# Fix issue #269
speaker
=
self
.
options
.
get
(
'speaker'
)
node
[
'speaker'
]
=
speaker
if
speaker
!=
'None'
else
None
node
[
'support'
]
=
self
.
options
.
get
(
'support'
,
list
())
node
[
'content'
]
=
'
\n
'
.
join
(
self
.
content
)
content
=
event_content
()
...
...
plugins/event_schedule/templates/event.tpl
View file @
ef5e041c
...
...
@@ -49,9 +49,7 @@
<div
class=
"col-lg-6 p-lg-0"
>
{% if node_type == 'speaker' %}
<p
class=
"m-0 event-title"
>
{{ node['title'] }}
</p>
{% if node['speaker'] %}
<p
class=
"speaker"
>
{{ node['speaker'] }}
</p>
{% endif %}
<p
class=
"speaker"
>
{{ node['speaker'] if node['speaker'] }}
</p>
{% elif node_type == 'break' %}
<p
class=
"event-break"
>
{{ node['break'] }}
</p>
{% endif %}
...
...
Roland Denis
@denis
mentioned in commit
f79e4620
·
Jun 01, 2022
mentioned in commit
f79e4620
mentioned in commit f79e4620519879d4db7b05957cab11f3ff23ad59
Toggle commit list
Roland Denis
@denis
mentioned in merge request
!1214 (merged)
·
Jun 01, 2022
mentioned in merge request
!1214 (merged)
mentioned in merge request !1214
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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