diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig deleted file mode 100644 index 0ad5ea3ee..000000000 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig +++ /dev/null @@ -1,44 +0,0 @@ -{% extends "@ChillActivity/Admin/layout_activity.html.twig" %} - -{% block admin_content %} -

{{ 'ActivityType list'|trans }}

- - - - - {# #} - - - - - - {% for entity in entities %} - - {# #} - - - - {% endfor %} - -
{{ 'Name'|trans }}{{ 'Active'|trans }}{{ 'Actions'|trans }}
{{ entity.name|localize_translatable_string }} - {%- if entity.active -%} - - {%- else -%} - - {%- endif -%} - -
    -
  • - -
  • -
-
- - - {% endblock %} 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 0b1810452..ad8e62d24 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig @@ -1,11 +1,7 @@ -{# {% set person_id = null %} -{% if person %} - {% set person_id = person.id %} -{% endif %} #} {% extends "@ChillActivity/Admin/layout_activity.html.twig" %} {% block admin_content %} -

{{ 'Activity list' |trans }}

+

{{ 'My aside activities' |trans }}

{% if entities|length == 0 %}

@@ -15,15 +11,23 @@ {% else %}

- - {% for entity in entities %} + {# Sort activities according to date in descending order #} + {% for entity in entities|sort ((a, b) => b.date <=> a.date) %} {% set t = entity.type %} + + {# only load aside activities of current user. #} + {% if entity.agent == app.user %} +
+

+ {{ entity.type.title | localize_translatable_string }} +

+ {% if entity.date %} -

{{ entity.date|format_date('long') }}

+

{{ entity.date|format_date('long') }}

{% endif %}
@@ -38,17 +42,13 @@
    {% if entity.createdBy %}
  • - {{ 'by'|trans }}{{ entity.createdBy.usernameCanonical }} + {{ 'Created by: '|trans }}{{ entity.createdBy.usernameCanonical }}
  • {% endif %} - -
  • - {{ entity.type.title | localize_translatable_string }} -
  • -
+ {% if entity.note is not empty or entity.createdBy|length > 0 @@ -59,14 +59,42 @@ {{ entity.note|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
{% endif %} +
{% endif %} - +
+ +
+ {% endif %} {% endfor %} {% endif %} + + {# TODO set this condition in configuration #}