From 6074d4cde693aa21ee5eab3063f37a4a3a2a6d40 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 6 Sep 2022 12:06:33 +0200
Subject: [PATCH] release v1.16.0

---
 CHANGELOG.md                                                  | 4 +++-
 src/core/Resources/assets/js/modules/form-collection.js       | 2 +-
 .../Resources/views/form/bootstrap_4_form_theme.html.twig     | 4 ++++
 .../Resources/views/site/navigation_admin/_form.html.twig     | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df96fa7..0ef00d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
 ## [Unreleased]
 
+## [1.16.0] - 2022-09-06
 ### Added
-* Add A/B testing feature
+* add A/B testing feature
+* add cleanup of html string extracted from grapesjs content
 ### Fixed
 * fix file block type
 ### Changed
diff --git a/src/core/Resources/assets/js/modules/form-collection.js b/src/core/Resources/assets/js/modules/form-collection.js
index f64faa5..413d49d 100644
--- a/src/core/Resources/assets/js/modules/form-collection.js
+++ b/src/core/Resources/assets/js/modules/form-collection.js
@@ -71,7 +71,7 @@ const FormCollection = () => {
     const item = collectionContainer.children('*[data-collection-item]:last-child')
     const deleteBtn = $('<span data-collection-delete="__name__" class="fa fa-trash"></span>')
 
-    item.find('*[data-collection-delete-container]').first().append(deleteBtn)
+    item.find('*[data-collection-delete-container]').first().prepend(deleteBtn)
     item.html(item.html().replace(/__name__/g, name))
     item.attr('data-collection-item', name)
 
diff --git a/src/core/Resources/views/form/bootstrap_4_form_theme.html.twig b/src/core/Resources/views/form/bootstrap_4_form_theme.html.twig
index 22d2b85..976ba6d 100644
--- a/src/core/Resources/views/form/bootstrap_4_form_theme.html.twig
+++ b/src/core/Resources/views/form/bootstrap_4_form_theme.html.twig
@@ -61,6 +61,7 @@
                 <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>
@@ -71,6 +72,7 @@
 
     <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>
@@ -101,6 +103,7 @@
                 <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>
@@ -111,6 +114,7 @@
 
     <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>
diff --git a/src/core/Resources/views/site/navigation_admin/_form.html.twig b/src/core/Resources/views/site/navigation_admin/_form.html.twig
index 5640634..d3ad5f1 100644
--- a/src/core/Resources/views/site/navigation_admin/_form.html.twig
+++ b/src/core/Resources/views/site/navigation_admin/_form.html.twig
@@ -43,6 +43,7 @@
             </div>
             <div data-collection-add="collection-{{ collection_name }}" class="collection-add col-12">
                 <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>