diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
index a7e6c9681..28c02e23e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -1,7 +1,9 @@
// Access to Bootstrap variables and mixins
@import '~ChillMainAssets/module/bootstrap/shared';
-// activity creation first step: select type page
+//// ACTIVITY CREATION
+// first step: select type page
+
div.new-activity-select-type {
div.activity-row {
display: flex;
@@ -21,29 +23,36 @@ div.new-activity-select-type {
}
}
-/// liste des échanges, sous le titre-badge, le bloc de contenu
-div.main {
- padding: 1em;
+//// ACTIVITY LIST PAGE
+// precise badge-title specific details
- ///
- ul.list-content {
- list-style-type: none;
- padding-left: 0.6em;
- margin: 0;
- li {
- margin-bottom: 0.2em;
- }
- }
+h2.badge-title {
div.duration {
font-size: smaller;
padding-left: 1em;
margin-top: 1em;
}
-
+ ul.list-content {
+ font-size: 70%;
+ list-style-type: none;
+ padding-left: 0;
+ margin: 0;
+ li {
+ margin-bottom: 0.2em;
+ // exception: change bg color for action badges above badge-title
+ .bg-light {
+ background-color: $chill-light-gray !important;
+ }
+ }
+ }
+}
+div.main {
+ padding: 1em;
}
+//// ACTIVITY SHOW AND FORM PAGES
+// Exceptions for flex-bloc in concerned-groups
-// exceptions for flex-bloc in concerned-groups
div.flex-bloc.concerned-groups {
margin-top: 1em;
div.item-bloc {
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 9c95d6be0..c719f5bb7 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -36,14 +36,13 @@
{{ activity.type.name | localize_translatable_string }}
-
+
-
{{ 'location'|trans ~ ': ' }}
{# TODO {% if activity.location %}{{ activity.location }}{% endif %} #}
Domicile de l'usager
-
{% if activity.user and t.userVisible %}
-
{{ 'Referrer'|trans ~ ': ' }}
@@ -51,6 +50,35 @@
{% endif %}
+
+ {%- if t.reasonsVisible -%}
+ {%- if activity.reasons is not empty -%}
+ -
+ {% for r in activity.reasons %}
+ {{ r|chill_entity_render_box }}
+ {% endfor %}
+
+ {%- endif -%}
+ {% endif %}
+ {%- if t.socialIssuesVisible %}
+ {%- if activity.socialIssues is not empty -%}
+ -
+ {% for r in activity.socialIssues %}
+ {{ r|chill_entity_render_box }}
+ {% endfor %}
+
+ {%- endif -%}
+ {% endif %}
+ {%- if t.socialActionsVisible -%}
+ {%- if activity.socialActions is not empty -%}
+ -
+ {% for r in activity.socialActions %}
+ {{ r|chill_entity_render_box }}
+ {% endfor %}
+
+ {%- endif -%}
+ {% endif %}
+
{#
@@ -68,69 +96,32 @@
#}
+
+ {% if activity.comment.comment is not empty
+ or activity.persons|length > 0
+ or activity.thirdParties|length > 0
+ or activity.users|length > 0
+ %}
-
- {%- if t.reasonsVisible -%}
- -
- {%- if activity.reasons is not empty -%}
- {% for r in activity.reasons %}
- {{ r|chill_entity_render_box }}
- {% endfor %}
- {%- endif -%}
-
- {% endif %}
- {%- if t.socialIssuesVisible %}
- -
- {%- if activity.socialIssues is not empty -%}
- {% for r in activity.socialIssues %}
- {{ r|chill_entity_render_box }}
- {% endfor %}
- {%- endif -%}
-
- {% endif %}
- {%- if t.socialActionsVisible -%}
- -
- {%- if activity.socialActions is not empty -%}
- {% for r in activity.socialActions %}
- {{ r|chill_entity_render_box }}
- {% endfor %}
- {%- endif -%}
-
- {% endif %}
-
-
- {% if activity.comment.comment is not empty
- or activity.persons|length > 0
- or activity.thirdParties|length > 0
- or activity.users|length > 0
- %}
-
- {% if activity.comment.comment is not empty %}
- {{ activity.comment|chill_entity_render_box({
- 'disable_markdown': false,
- 'limit_lines': 3,
- 'metadata': false,
- }) }}
- {% endif %}
-
- {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
- 'context': context,
- 'with_display': 'row',
- 'entity': activity,
- 'badge_person': true
- } %}
-
+ {% if activity.comment.comment is not empty %}
+ {{ activity.comment|chill_entity_render_box({
+ 'disable_markdown': false,
+ 'limit_lines': 3,
+ 'metadata': false,
+ }) }}
{% endif %}
+
+ {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+ 'context': context,
+ 'with_display': 'row',
+ 'entity': activity,
+ 'badge_person': true
+ } %}
+ {% endif %}