Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

improve concernedGroups in Activity list

Browse Source 
TODO refund concernedGroups for better flexibility
This commit is contained in:
Mathieu Jaumotte 2021-08-22 14:43:04 +02:00
parent a0f0e4e9ad
commit 10b1edda11
5 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
View File

@ -48,42 +48,45 @@ div.activity-list {
} }
} }
} }
div.item-row.comment {
margin-left: 15%;
blockquote.chill-user-quote {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
}
div.item-row.details { div.item-row.details {
flex-direction: row; margin-left: 15%;
& > div.item-col {
justify-content: flex-start;
align-self: center;
&:nth-child(1) {
flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
}
&:nth-child(2) {
flex-grow: 0; flex-shrink: 1; flex-basis: 70%;
}
&:only-child { // override flex-bloc to adapt in list
flex-grow: 0; flex-shrink: 0; flex-basis: 100%; // TODO refund this
& > div.concerned-groups { div.accompanyingCourse.flex-bloc.concerned-groups {
flex-grow: 0; flex-shrink: 0; flex-basis: 100%; margin: 0;
display: flex; width: 100%;
flex-direction: column; // TODO pas fini justify-content: space-around;
div.group { div.item-bloc {
flex-grow: 1; flex-shrink: 0; flex-basis: 30%; box-shadow: unset;
h4 {} padding: 0;
ul.list-content { flex-basis: 25%;
li { div.item-row {
display: inline; flex-direction: column;
div.item-col {
&:first-child {
width: unset;
}
&:last-child {
border-top: 0;
margin-top: 0;
padding-top: 0;
ul.list-content {
padding: 0;
} }
} }
} }
} }
} }
} }
div.concerned-groups {
font-size: 85%;
h4 {
text-transform: uppercase;
}
}
} }
ul.list-content { ul.list-content {
list-style-type: none; list-style-type: none;

4
src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
View File

@ -59,7 +59,7 @@
{% for item in bloc.items %} {% for item in bloc.items %}
<li> <li>
<a href="{{ _self.href(bloc.path, bloc.key, item.id) }}"> <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
<span class="badge bg-primary"> <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
{{ item|chill_entity_render_box({ {{ item|chill_entity_render_box({
'render': 'raw', 'render': 'raw',
'addAltNames': false 'addAltNames': false
@ -86,7 +86,7 @@
{% for item in bloc.items %} {% for item in bloc.items %}
<li> <li>
<a href="{{ _self.href(bloc.path, bloc.key, item.id) }}"> <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
<span class="badge bg-primary"> <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
{{ item|chill_entity_render_box({ {{ item|chill_entity_render_box({
'render': 'raw', 'render': 'raw',
'addAltNames': false 'addAltNames': false

34
src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
View File

@ -135,33 +135,31 @@
</div> </div>
</div> </div>
{#
{% if activity.comment.comment is not empty {% if activity.comment.comment is not empty
or activity.persons|length > 0 or activity.persons|length > 0
or activity.thirdParties|length > 0 or activity.thirdParties|length > 0
or activity.users|length > 0 or activity.users|length > 0
%} %}
<div class="item-row details"> <div class="item-row comment separator">
<div class="item-col">
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
'context': context,
'with_display': 'row',
'entity': activity
} %}
</div>
{% if activity.comment.comment is not empty %} {% if activity.comment.comment is not empty %}
<div class="item-col"> {{ activity.comment|chill_entity_render_box({
{{ activity.comment|chill_entity_render_box({ 'disable_markdown': false,
'disable_markdown': false, 'limit_lines': 3,
'limit_lines': 3, 'metadata': false,
'metadata': false, }) }}
}) }}
</div>
{% endif %} {% endif %}
</div> </div>
<div class="item-row details">
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
'context': context,
'with_display': 'bloc',
'entity': activity,
'badge_person': true
} %}
</div>
{% endif %} {% endif %}
#}
</div> </div>
{% endfor %} {% endfor %}

2
src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
View File

@ -29,8 +29,10 @@
// specific chill badge for persons // specific chill badge for persons
span.badge-person { span.badge-person {
display: inline-block;
padding: 0 0.5em !important; padding: 0 0.5em !important;
background-color: $white; background-color: $white;
color: $dark;
border: 1px solid $chill-ll-gray; border: 1px solid $chill-ll-gray;
border-bottom: 2px solid $chill-green; border-bottom: 2px solid $chill-green;
border-radius: 6px; border-radius: 6px;

1
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
View File

@ -51,6 +51,7 @@
class="btn btn-remove" class="btn btn-remove"
@click="removeAddress" @click="removeAddress"
:title="$t('courselocation.remove_button')"> :title="$t('courselocation.remove_button')">
{{ $t('action.remove') }}
</button> </button>
</li> </li>
</ul> </ul>