Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Resolve merge conflicts after rebase

Browse Source
This commit is contained in:
Julie Lenaerts 2025-03-03 13:14:00 +01:00
commit caf0407451
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
View File

@ -12,10 +12,6 @@
<div class="wl-row"> <div class="wl-row">
<div class="wl-col title"> <div class="wl-col title">
<p class="date-label"> <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' %} {% 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;"> <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"> <span class="badge bg-primary">
@ -31,7 +27,6 @@
- {{ calendar.endDate|format_datetime('none', 'short') }} - {{ calendar.endDate|format_datetime('none', 'short') }}
{% endif %} {% endif %}
{% if calendar.status == 'canceled' %} {% if calendar.status == 'canceled' %}
</del>
<p> <p>
<span>{{ 'chill_calendar.cancel_reason'|trans }}:</span> <span>{{ 'chill_calendar.cancel_reason'|trans }}:</span>
<span>{{ calendar.cancelReason.name|localize_translatable_string }}</span> <span>{{ calendar.cancelReason.name|localize_translatable_string }}</span>