mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Resolve merge conflicts after rebase
This commit is contained in:
commit
caf0407451
@ -12,10 +12,6 @@
|
||||
<div class="wl-row">
|
||||
<div class="wl-col title">
|
||||
<p class="date-label">
|
||||
{% if calendar.status == 'canceled' %}
|
||||
<span class="badge rounded-pill bg-danger">{{ 'chill_calendar.canceled'|trans }}</span>
|
||||
<del>
|
||||
{% endif %}
|
||||
{% if context == 'person' and calendar.context == 'accompanying_period' %}
|
||||
<a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': calendar.accompanyingPeriod.id}) }}" style="text-decoration: none;">
|
||||
<span class="badge bg-primary">
|
||||
@ -31,7 +27,6 @@
|
||||
- {{ calendar.endDate|format_datetime('none', 'short') }}
|
||||
{% endif %}
|
||||
{% if calendar.status == 'canceled' %}
|
||||
</del>
|
||||
<p>
|
||||
<span>{{ 'chill_calendar.cancel_reason'|trans }}:</span>
|
||||
<span>{{ calendar.cancelReason.name|localize_translatable_string }}</span>
|
||||
|
Loading…
x
Reference in New Issue
Block a user