Merge remote-tracking branch 'origin/master' into features/household-members-list

This commit is contained in:
2021-06-10 10:29:57 +02:00
115 changed files with 4871 additions and 5460 deletions

View File

@@ -112,24 +112,6 @@
</div>
{% endblock money_widget %}
{% block date_widget %}
{% apply spaceless %}
{% if widget == 'single_text' %}
{% set attr = {'class' : 'input datepicker'} %}
{{ block('form_widget_simple') }}
{% else %}
<div {{ block('widget_container_attributes') }}>
{{ date_pattern|replace({
'{{ year }}': form_widget(form.year ),
'{{ month }}': form_widget(form.month ),
'{{ day }}': form_widget(form.day ),
})|raw }}
</div>
{% endif %}
{% endapply %}
{% endblock date_widget %}
{%- block time_widget -%}
{%- if widget == 'single_text' -%}
{{ block('form_widget_simple') }}
@@ -196,4 +178,4 @@
{{ form_widget(entry) }}
{% endif %}
{% endfor %}
{% endblock %}
{% endblock %}

View File

@@ -164,8 +164,6 @@
{{ encore_entry_script_tags('ckeditor5') }}
{% endif %}
<script type="text/javascript">
chill.initPikaday('{{ app.request.locale }}');
chill.emulateSticky();
chill.checkOtherValueOnChange();
$('.select2').select2({allowClear: true});
chill.categoryLinkParentChildSelect();