Merge branch 'master' into develop

This commit is contained in:
Simon Vieille 2023-07-26 11:29:07 +02:00
commit f3674ad4e0
2 changed files with 62 additions and 48 deletions

View file

@ -20,6 +20,8 @@ class CollectionType extends BaseCollectionType
'collection_name' => $options['collection_name'],
'label_add' => $options['label_add'],
'label_delete' => $options['label_delete'],
'allow_add' => $options['allow_add'],
'allow_delete' => $options['allow_delete'],
]);
}

View file

@ -58,36 +58,42 @@
{{ form_row(child) }}
{% endfor %}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
<span data-collection-delete="{{ loop.index }}">
<span data-collection-delete="{{ loop.index }}" class="fa fa-trash"></span>
{{ label_delete|trans }}
{% if allow_delete %}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
<span data-collection-delete="{{ loop.index }}">
<span data-collection-delete="{{ loop.index }}" class="fa fa-trash"></span>
{{ label_delete|trans }}
</span>
</span>
</span>
</div>
</div>
{% endif %}
</div>
{% endfor %}
</div>
<div data-collection-add="collection-{{ collection_name }}" class="collection-add">
<span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
<span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
{{ label_add|trans }}
</span>
</div>
<template type="text/template" id="collection-{{ collection_name }}">
<div data-collection-item="__name__">
{{ form_rest(form.value.vars.prototype) }}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
{{ label_delete|trans }}
</span>
</div>
{% if allow_add %}
<div data-collection-add="collection-{{ collection_name }}" class="collection-add">
<span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
<span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
{{ label_add|trans }}
</span>
</div>
</template>
<template type="text/template" id="collection-{{ collection_name }}">
<div data-collection-item="__name__">
{{ form_rest(form.value.vars.prototype) }}
{% if allow_delete %}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
{{ label_delete|trans }}
</span>
</div>
{% endif %}
</div>
</template>
{% endif %}
{% endblock %}
{% block murph_collection_widget %}
@ -100,36 +106,42 @@
{{ form_row(child) }}
{% endfor %}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
<span data-collection-delete="{{ loop.index }}">
<span data-collection-delete="{{ loop.index }}" class="fa fa-trash"></span>
{{ label_delete|trans }}
{% if allow_delete %}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
<span data-collection-delete="{{ loop.index }}">
<span data-collection-delete="{{ loop.index }}" class="fa fa-trash"></span>
{{ label_delete|trans }}
</span>
</span>
</span>
</div>
</div>
{% endif %}
</div>
{% endfor %}
</div>
<div data-collection-add="collection-{{ collection_name }}" class="collection-add">
<span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
<span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
{{ label_add|trans }}
</span>
</div>
<template type="text/template" id="collection-{{ collection_name }}">
<div data-collection-item="__name__" {% for attr, value in attrs %}{{ attr }}="{{ value }}"{% endfor %}>
{{ form_rest(form.vars.prototype) }}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
{{ label_delete|trans }}
</span>
</div>
{% if allow_add %}
<div data-collection-add="collection-{{ collection_name }}" class="collection-add">
<span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
<span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
{{ label_add|trans }}
</span>
</div>
</template>
<template type="text/template" id="collection-{{ collection_name }}">
<div data-collection-item="__name__" {% for attr, value in attrs %}{{ attr }}="{{ value }}"{% endfor %}>
{{ form_rest(form.vars.prototype) }}
{% if allow_delete %}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
{{ label_delete|trans }}
</span>
</div>
{% endif %}
</div>
</template>
{% endif %}
{% endblock %}
{% block file_picker_widget %}