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 @@
+
+ {% block crud_content_header %}
+
{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}
+ {% endblock crud_content_header %}
+
+
{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}
+
+ {{ form_start(form) }}
+
+
+ {% block content_form_actions_back %}
+ -
+
+ {{ 'Cancel'|trans }}
+
+
+ {% endblock %}
+ {% block content_form_actions_before %}{% endblock %}
+ {% block content_form_actions_view %}
+ {% if is_granted(chill_crud_config('role', crud_name, 'view'), entity) %}
+ -
+
+ {{ 'crud.edit.back_to_view'|trans }}
+
+
+ {% endif %}
+ {% endblock %}
+ {% block content_form_actions_confirm_delete %}
+ -
+
+
+ {% endblock content_form_actions_confirm_delete %}
+ {% block content_form_actions_after %}{% endblock %}
+
+
+ {{ form_end(form) }}
+
\ 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) %}
#}
- {#