murph/murph-core
murph/murph-core
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases 22 Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Simon Vieille 2023-07-26 11:29:07 +02:00
parent 0c61cb9355 ddf1fecc90
commit f3674ad4e0
2 changed files with 62 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Form/Type/CollectionType.php
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'],
]);
}

12
src/core/Resources/views/form/bootstrap_4_form_theme.html.twig
View file

@ -58,6 +58,7 @@
{{ form_row(child) }}
{% endfor %}
{% if allow_delete %}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
<span data-collection-delete="{{ loop.index }}">
@ -66,10 +67,12 @@
</span>
</span>
</div>
{% endif %}
</div>
{% endfor %}
</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>
@ -81,13 +84,16 @@
<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,6 +106,7 @@
{{ form_row(child) }}
{% endfor %}
{% if allow_delete %}
<div class="text-right">
<span data-collection-delete-container class="btn btn-sm btn-danger">
<span data-collection-delete="{{ loop.index }}">
@ -108,10 +115,12 @@
</span>
</span>
</div>
{% endif %}
</div>
{% endfor %}
</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>
@ -123,13 +132,16 @@
<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 %}