fix label color in active filters pills

src/Bundle/ChillActivityBundle/translations/messages.fr.yml

@@ -96,9 +96,6 @@ activity_filter:
     My activities: Mes échanges (où j'interviens)
     Types: Par type d'échange
     Jobs: Par métier impliqué
-    By: Filtrer par
-    Search: Chercher dans la liste
-    By date: Filtrer par date
 
 #timeline
 '%user% has done an %activity_type%': '%user% a effectué un échange de type "%activity_type%"'

src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php

@@ -39,7 +39,7 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
                 'label' => false,
                 'required' => false,
                 'attr' => [
-                    'placeholder' => 'activity_filter.Search',
+                    'placeholder' => 'filter_order.Search',
                 ]
             ]);
         }

src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig

@@ -26,7 +26,7 @@
                             {% if form.dateRanges[dateRangeName].vars.label is not same as(false) %}
                                 {{ form_label(form.dateRanges[dateRangeName])}}
                             {% else %}
-                                <div class="col-sm-4 col-form-label">{{ 'activity_filter.By date'|trans }}</div>
+                                <div class="col-sm-4 col-form-label">{{ 'filter_order.By date'|trans }}</div>
                             {% endif %}
                             <div class="col-sm-8 pt-1">
                                 <div class="input-group">
@@ -45,7 +45,7 @@
                 {% if form.checkboxes|length > 0 %}
                     {% for checkbox_name, options in form.checkboxes %}
                         <div class="row my-2">
-                            <div class="col-sm-4 col-form-label">{{ 'activity_filter.By'|trans }}</div>
+                            <div class="col-sm-4 col-form-label">{{ 'filter_order.By'|trans }}</div>
                             <div class="col-sm-8 pt-2">
                                 {% for c in form['checkboxes'][checkbox_name].children %}
                                     {{ form_widget(c) }}
@@ -78,7 +78,7 @@
                 {% set btnSubmit = 1 %}
                 {% for name, _o in form.single_checkboxes %}
                     <div class="row my-2">
-                        <div class="col-sm-4 col-form-label">{{ 'activity_filter.By'|trans }}</div>
+                        <div class="col-sm-4 col-form-label">{{ 'filter_order.By'|trans }}</div>
                         <div class="col-sm-8 pt-2">
                             {{ form_widget(form.single_checkboxes[name]) }}
                         </div>
@@ -97,7 +97,15 @@
     {% if active|length > 0 %}
         <div class="activeFilters mt-3">
             {% for f in active %}
-                <span class="badge rounded-pill bg-secondary ms-1 {{ f.position }} {{ f.name }}">{% if f.label != '' %}{{ f.label|trans }}&nbsp;: {% endif %}{{ f.value }}</span>
+                <span class="badge rounded-pill bg-secondary ms-1 {{ f.position }} {{ f.name }}">
+                    {%- if f.label != '' %}
+                        <span class="text-dark">{{ f.label|trans }}&nbsp;: </span>
+                    {% endif -%}
+                    {%- if f.position == 'search_box' and f.value is not null %}
+                        <span class="text-dark">{{ 'filter_order.search_box'|trans ~ ' :' }}</span>
+                    {% endif -%}
+                    {{ f.value}}{#
+                #}</span>
             {% endfor %}
         </div>
     {% endif %}

src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml

@@ -59,3 +59,7 @@ filter_order:
     by_date:
         From: Depuis le {from_date, date, long}
         To: Jusqu'au {to_date, date, long}
+    By: Filtrer par
+    Search: Chercher dans la liste
+    By date: Filtrer par date
+    search_box: Filtrer par contenu