From 471a373117c932b55d9bdc91316fe6bcd30ad44a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 11 Nov 2021 12:52:16 +0100
Subject: [PATCH] buttons reduced to one save button

---
 .../Resources/views/CRUD/_edit_content.html.twig      | 11 ++---------
 .../Resources/views/CRUD/_new_content.html.twig       | 11 ++---------
 .../ChillMainBundle/translations/messages.fr.yml      |  5 +++--
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
index a26eb2e4a..2ad289b6f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
@@ -47,15 +47,8 @@
             {% endblock content_form_actions_view %}
             {% block content_form_actions_save_and_close %}
                 <li class="">
-                    <button type="submit" name="submit" value="save-and-close" class="btn btn-update" form="{{ formId }}">
-                        {{ 'crud.edit.save_and_close'|trans }}
-                    </button>
-                </li>
-            {% endblock %}
-            {% block content_form_actions_save_and_show %}
-                <li class="">
-                    <button type="submit" name="submit" value="save-and-show" class="btn btn-update" form="{{ formId }}">
-                        {{ 'crud.edit.save_and_show'|trans }}
+                    <button type="submit" name="submit" value="save" class="btn btn-update" form="{{ formId }}">
+                        {{ 'crud.edit.save'|trans }}
                     </button>
                 </li>
             {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
index 906a77d0d..3bd98a2dc 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
@@ -28,15 +28,8 @@
             {% endblock %}
             {% block content_form_actions_save_and_close %}
                 <li class="">
-                    <button type="submit" name="submit" value="save-and-close" class="btn btn-create" form="{{ formId }}">
-                        {{ 'crud.new.save_and_close'|trans }}
-                    </button>
-                </li>
-            {% endblock %}
-            {% block content_form_actions_save_and_show %}
-                <li class="">
-                    <button type="submit" name="submit" value="save-and-show" class="btn btn-create" form="{{ formId }}">
-                        {{ 'crud.new.save_and_show'|trans }}
+                    <button type="submit" name="submit" value="save" class="btn btn-create" form="{{ formId }}">
+                        {{ 'crud.new.save'|trans }}
                     </button>
                 </li>
             {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 7737e1d04..7b892aad7 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -297,8 +297,9 @@ crud:
   edit:
     button_action_form: Enregistrer
     back_to_view: Voir
-    save_and_close: Enregistrer & fermer
-    save_and_show: Enregistrer & voir
+    save: Enregistrer
+    # save_and_close: Enregistrer & fermer
+    # save_and_show: Enregistrer & voir
     success: Les données ont été modifiées
   delete:
     success: Les données ont été supprimées