From 7d97889cbf2ee3d1c607ba38af222dacdd0edf83 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 10 Aug 2021 15:45:00 +0200
Subject: [PATCH] templates changed to use the standard CRUD templates + delete
 template added

---
 .../ChillAsideActivityExtension.php           |  8 ++++
 .../views/asideActivity/_delete.html.twig     | 37 +++++++++++++++++++
 .../views/asideActivity/_index.html.twig      |  0
 .../views/asideActivity/delete.html.twig      |  8 ++++
 .../views/asideActivity/edit.html.twig        | 15 ++++----
 .../views/asideActivity/index.html.twig       |  8 ++++
 .../views/asideActivity/list.html.twig        |  6 +--
 .../views/asideActivity/new.html.twig         | 14 +++----
 .../views/asideActivity/view.html.twig        | 16 ++++++++
 9 files changed, 95 insertions(+), 17 deletions(-)
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_index.html.twig
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig

diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
index 69bde308e..bbc4c8f8b 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
@@ -87,9 +87,17 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
                             'role' => 'ROLE_USER',
                             'template' => '@ChillAsideActivity/asideActivity/new.html.twig',
                         ],
+                        'view' => [
+                            'role' => 'ROLE_USER',
+                            'template' => '@ChillAsideActivity/asideActivity/view.html.twig',
+                        ],
                         'edit'  => [
                             'role' => 'ROLE_USER',
                             'template' => '@ChillAsideActivity/asideActivity/edit.html.twig',
+                        ],
+                        'delete' => [
+                            'role' => 'ROLE_USER',
+                            'template' => '@ChillAsideActivity/asideActivity/delete.html.twig',
                         ]
                     ]
                 ],
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
new file mode 100644
index 000000000..85df29a9c
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
@@ -0,0 +1,37 @@
+<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
+    {% block crud_content_header %}
+        <h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}</h1>
+    {% endblock crud_content_header %}
+
+    <p class="message-confirm">{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}</p>
+
+    {{ form_start(form) }}
+
+    <ul class="record_actions">
+            {% block content_form_actions_back %}
+                <li class="cancel">
+                    <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
+                        {{ 'Cancel'|trans }}
+                    </a>
+                </li>
+            {% endblock %}
+            {% block content_form_actions_before %}{% endblock %}
+            {% block content_form_actions_view %}
+                {% if is_granted(chill_crud_config('role', crud_name, 'view'), entity) %}
+                <li class="">
+                    <a class="btn btn-show" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_view', { 'id': entity.id }) }}">
+                        {{ 'crud.edit.back_to_view'|trans }}
+                    </a>
+                </li>
+                {% endif %}
+            {% endblock %}
+            {% block content_form_actions_confirm_delete %}
+                <li>
+                    <button type="submit" class="btn btn-delete" value="delete-and-close">{{ ('crud.'~crud_name~'.button_delete')|trans }}</button>
+                </li>
+            {% endblock content_form_actions_confirm_delete %}
+            {% block content_form_actions_after %}{% endblock %}
+    </ul>
+
+    {{ form_end(form) }}
+</div>
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_index.html.twig
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig
new file mode 100644
index 000000000..de2d28c90
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig
@@ -0,0 +1,8 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title %}{{ ('crud.' ~ crud_name ~ '.delete.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
+
+{% block content %}
+    {% embed '@ChillAsideActivity/AsideActivity/_delete.html.twig' %}
+    {% endembed %}
+{% endblock content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/edit.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/edit.html.twig
index dacee767c..b0b6fed0f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/edit.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/edit.html.twig
@@ -1,12 +1,13 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layout.html.twig' %}
 
 {% block title %}
-    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-        {% block content_form_actions_view %}{% endblock %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
+{% block admin_content %}
+{# {% as we are in the admin layout, we override the admin content with the CRUD content %} #}
+{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+    {# we do not have "view" page. We empty the corresponding block #}
+    {% block content_form_actions_view %}{% endblock %}
+{% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
new file mode 100644
index 000000000..0e8ea0506
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -0,0 +1,8 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
+
+{% block content %}
+    {% embed '@ChillAsideActivity/AsideActivity/_index.html.twig' %}
+    {% endembed %}
+{% endblock content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
index ad8e62d24..f474dcf1b 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
@@ -78,9 +78,9 @@
                         {% endif %}
                         {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
                         #}
-                        {# <li>
-                            <a href="{{ path('chill_aside_activity_delete', { 'id': entity.id } ) }}" class="btn btn-delete "></a>
-                        </li> #}
+                        <li>
+                            <a href="{{ path('chill_crud_aside_activity_delete', { 'id': entity.id } ) }}" class="btn btn-delete "></a>
+                        </li>
                         {#
                         {% endif %}
                         #}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
index d7ac89752..0781272a1 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
@@ -1,11 +1,11 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layout.html.twig' %}
 
 {% block title %}
-    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
-{% endblock %}
+{% block admin_content %}
+{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+    {% block content_form_actions_save_and_show %}{% endblock %}
+{% endembed %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
new file mode 100644
index 000000000..5f1d2319a
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -0,0 +1,16 @@
+{% extends '@ChillPerson/Person/layout.html.twig' %}
+
+{% set person = entity.person %}
+{% set activeRouteKey = '' %}
+
+{% block title %}
+{% include('@ChillPerson/CRUD/_view_title.html.twig') %}
+{% endblock %}
+
+{% block personcontent %}
+{% embed '@ChillPerson/CRUD/_view_content.html.twig' %}
+    {% block crud_content_header %}
+        <h1>{{ ('crud.' ~ crud_name ~ '.title_view')|trans({'%person%': person|chill_entity_render_string }) }}</h1>
+    {% endblock crud_content_header %}
+{% endembed %}
+{% endblock %}
\ No newline at end of file