diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
index 1e1d65d91..f4a3d4d29 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
@@ -27,14 +27,16 @@
{{ activity.type.name | localize_translatable_string }}
+ {% if activity.location and t.locationVisible %}
-
- {{ 'location'|trans ~ ': ' }}
- {# TODO {% if activity.location %}{{ activity.location }}{% endif %} #}
- Domicile de l'usager
+ {{ 'location'|trans ~ ': ' }}
+ {{ activity.location.locationType.title|localize_translatable_string }}
+ {{ activity.location.name }}
+ {% endif %}
{% if activity.user and t.userVisible %}
-
- {{ 'Referrer'|trans ~ ': ' }}
+ {{ 'Referrer'|trans ~ ': ' }}
{{ activity.user.usernameCanonical }}
{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 593cd49b4..53a9d200b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -402,3 +402,11 @@ input.belgian_national_number {
&.daily_counter {}
&.control_digit {}
}
+
+// replace abbr
+span.item-key {
+ font-variant: all-small-caps;
+ font-size: 90%;
+ background-color: #0000000a;
+ //text-decoration: dotted underline;
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index 7e9f13149..7dcddf65d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -60,6 +60,16 @@ h2.badge-title {
h3 {
margin-bottom: 0.5rem;
}
+
+ //position: relative;
+ span {
+ display: none;
+ //position: absolute;
+ //top: 0;
+ //left: 0;
+ //transform: rotate(270deg);
+ //transform-origin: 0 0;
+ }
}
span.title_action {
flex-grow: 1;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
index e995f97eb..878ff82e1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
@@ -4,7 +4,7 @@
///
@mixin chill_badge($color) {
- text-transform: capitalize !important;
+ //text-transform: capitalize !important;
font-weight: 500 !important;
border-left: 20px groove $color;
&:before {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
index 84e7fb2c6..801e83068 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -22,7 +22,7 @@
{{ $t('course.open_at') }}{{ $d(accompanyingCourse.openingDate.datetime, 'text') }}
- {{ $t('course.referrer') }}: {{ accompanyingCourse.user.username }}
+ {{ $t('course.referrer') }}: {{ accompanyingCourse.user.username }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
index 979488ff3..ec782615a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
@@ -3,20 +3,31 @@
- {{ 'accompanying_course_work.action'|trans }}
- {{ w.socialAction|chill_entity_render_string }}
+
+ {{ 'accompanying_course_work.action'|trans }}
+
+
+ {{ w.socialAction|chill_entity_render_string }}
-
- {{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}
- {{ w.startDate|format_date('short') }}
+ {{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}
+ {{ w.startDate|format_date('short') }}
+ {% if w.endDate %}
-
- {{ 'Last updated by'|trans ~ ' : ' }}
- {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('short', 'short') }}
+ {{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}
+ {{ w.endDate|format_date('short') }}
+ {% endif %}
+
+ {{ 'Last updated by'|trans }}
+ {{ w.updatedBy|chill_entity_render_box }}:
+ {{ w.updatedAt|format_datetime('short', 'short') }}
+
+
{% endfor %}