diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_view.html.twig deleted file mode 100644 index 209214f65..000000000 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_view.html.twig +++ /dev/null @@ -1,59 +0,0 @@ -

{{ "Aside activity"|trans }}

- -
- -
{{ 'Type'|trans }}
-
{{ entity.type.title|localize_translatable_string }}
- -
{{ 'Created by'|trans }}
-
{{ entity.createdBy }}
- -
{{ 'Created for'|trans }}
-
{{ entity.agent }}
- -

{{ 'Activity data'|trans }}

- -
{{ 'Date'|trans }}
-
{{ entity.date|format_date('long') }}
- -
{{ 'Duration'|trans }}
-
{{ entity.duration|date('H:i') }}
- -
{{ 'Remark'|trans }}
- {%- if entity.note is empty -%} -
- {{ 'No comments'|trans }} -
- {%- else -%} -
-
-
-

{{ entity.note }}

-
-
-
- {%- endif -%} -
- - diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig index 1bd328308..e2a46d161 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig @@ -1,13 +1,52 @@ -{% extends "@ChillMain/layout.html.twig" %} +{% extends '@ChillMain/layout.html.twig' %} -{% set activeRouteKey = 'chill_aside_activity_list' %} +{% set activeRouteKey = '' %} -{% block title 'Show the aside activity'|trans %} +{% block title %} + {% include('@ChillMain/CRUD/_view_title.html.twig') %} +{% endblock %} -{% block content -%} -
+{% block content %} + {% embed '@ChillMain/CRUD/_view_content.html.twig' %} + {% block crud_content_header %} +

{{ ('crud.' ~ crud_name ~ '.title_view')|trans }}

+ {% endblock crud_content_header %} + {% block crud_content_view_details %} +
- {% include '@ChillAsideActivity/asideActivity/_view.html.twig' %} +
{{ 'Type'|trans }}
+
{{ entity.type.title|localize_translatable_string }}
-
-{% endblock content %} +
{{ 'Created by'|trans }}
+
{{ entity.createdBy }}
+ +
{{ 'Created for'|trans }}
+
{{ entity.agent }}
+ +

{{ 'Activity data'|trans }}

+ +
{{ 'Date'|trans }}
+
{{ entity.date|format_date('long') }}
+ +
{{ 'Duration'|trans }}
+
{{ entity.duration|date('H:i') }}
+ +
{{ 'Remark'|trans }}
+ {%- if entity.note is empty -%} +
+ {{ 'No comments'|trans }} +
+ {%- else -%} +
+
+
+

{{ entity.note }}

+
+
+
+ {%- endif -%} + + + {% endblock %} + {% endembed %} +{% endblock %}