mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-11-26 21:58:31 +00:00
Compare commits
1 Commits
474-improv
...
460-displa
| Author | SHA1 | Date | |
|---|---|---|---|
| cacb7a0340 |
6
.changes/unreleased/UX-20251124-164723.yaml
Normal file
6
.changes/unreleased/UX-20251124-164723.yaml
Normal file
@@ -0,0 +1,6 @@
|
||||
kind: UX
|
||||
body: Display calendar item info on cancel page
|
||||
time: 2025-11-24T16:47:23.020302054+01:00
|
||||
custom:
|
||||
Issue: "460"
|
||||
SchemaChange: No schema change
|
||||
@@ -1,6 +0,0 @@
|
||||
kind: UX
|
||||
body: Improve accessibility of event form
|
||||
time: 2025-11-26T13:39:10.462348982+01:00
|
||||
custom:
|
||||
Issue: "474"
|
||||
SchemaChange: No schema change
|
||||
@@ -162,6 +162,7 @@
|
||||
{% endif %}
|
||||
|
||||
<div class="item-row separator">
|
||||
{% if show_record_actions is not defined or show_record_actions %}
|
||||
<ul class="record_actions">
|
||||
{% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
|
||||
{% if templates|length == 0 %}
|
||||
@@ -245,7 +246,7 @@
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -6,6 +6,10 @@
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="flex-table list-records context-accompanyingCourse">
|
||||
{{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course', show_record_actions: false}) }}
|
||||
</div>
|
||||
|
||||
{{ form_start(form) }}
|
||||
|
||||
{{ form_row(form.cancelReason) }}
|
||||
|
||||
@@ -6,6 +6,10 @@
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="flex-table list-records context-person">
|
||||
{{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'person', show_record_actions: false}) }}
|
||||
</div>
|
||||
|
||||
{{ form_start(form) }}
|
||||
|
||||
{{ form_row(form.cancelReason) }}
|
||||
|
||||
@@ -486,7 +486,7 @@ final class ParticipationController extends AbstractController
|
||||
|
||||
return $this->redirectToRoute(
|
||||
'chill_event__event_show',
|
||||
['id' => $event->getId()]
|
||||
['event_id' => $event->getId()]
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
{{ form_row(edit_form.circle) }}
|
||||
{{ form_row(edit_form.name) }}
|
||||
{{ form_row(edit_form.date) }}
|
||||
|
||||
{{ form_row(edit_form.type, { label: "Event type" }) }}
|
||||
{{ form_row(edit_form.themes) }}
|
||||
{{ form_row(edit_form.moderator) }}
|
||||
|
||||
@@ -37,9 +37,4 @@ class ChillDateTimeType extends AbstractType
|
||||
{
|
||||
return DateTimeType::class;
|
||||
}
|
||||
|
||||
public function getBlockPrefix(): string
|
||||
{
|
||||
return 'chill_datetime';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -311,32 +311,3 @@
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block chill_datetime_label %}
|
||||
<label for="{{ form.date.vars.id }}" class="col-form-label col-sm-4 required">
|
||||
{{ "Date"|trans }}
|
||||
</label>
|
||||
{% endblock %}
|
||||
|
||||
{% block chill_datetime_widget %}
|
||||
<div class="col-sm-8 d-flex align-items-start gap-2">
|
||||
{#date#}
|
||||
{{ form_widget(form.date, {
|
||||
attr: { class: 'form-control', style: 'flex: 1 1 auto;' }
|
||||
}) }}
|
||||
{#time#}
|
||||
{{ form_widget(form.time, {
|
||||
attr: {
|
||||
class: 'form-select',
|
||||
style: 'flex: 0 0 200px; max-width: 200px; white-space: nowrap; padding:0;'
|
||||
}
|
||||
}) }}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block chill_datetime_row %}
|
||||
<div class="mb-3 row">
|
||||
{{ block('chill_datetime_label') }}
|
||||
{{ block('chill_datetime_widget') }}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user