Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Revert "Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles"

Browse Source 
This reverts commit 58c4e37116511032fc08ba1e1454cf32df5dea48.
This commit is contained in:
Julie Lenaerts 2022-01-26 16:04:09 +01:00
parent 58c4e37116
commit b38924cc3d
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,7 +14,6 @@ and this project adheres to
* [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406) * [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406)
* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382) * [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
* [person ressources]: module added * [person ressources]: module added
* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
## Test releases ## Test releases

1
src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
View File

@ -1,6 +1,5 @@
<div class="col-md col-xxl"> <div class="col-md col-xxl">
<div id="collapseForm" class="collapse"> <div id="collapseForm" class="collapse">
<h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
{% include "@ChillPerson/PersonResource/form.html.twig" %} {% include "@ChillPerson/PersonResource/form.html.twig" %}
</div> </div>

9
src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
View File

@ -17,8 +17,7 @@
{% block personcontent %} {% block personcontent %}
<h1>{{ 'List of resources'|trans }}</h1> <h1>{{ 'List of resources'|trans }}</h1>
{% if personResources is not empty %}
{% if personResources|length > 0 %}
{% for resource in personResources %} {% for resource in personResources %}
<div class="flex-table"> <div class="flex-table">
<div class="item-bloc"> <div class="item-bloc">
@ -62,7 +61,9 @@
{% if resource.comment.comment is not null %} {% if resource.comment.comment is not null %}
<div class="item-row separator"> <div class="item-row separator">
<section class="chill-entity entity-comment-embeddable"> <section class="chill-entity entity-comment-embeddable">
<div>{{ resource.comment|chill_entity_render_box }}<div> <blockquote class="chill-user-quote">
<div>{{ resource.comment.comment }}<div>
</blockquote>
</section> </section>
</div> </div>
{% endif %} {% endif %}
@ -92,6 +93,8 @@
<p class="chill-no-data-statement">{{ 'There are no available resources'|trans }}</p> <p class="chill-no-data-statement">{{ 'There are no available resources'|trans }}</p>
{% endif %} {% endif %}
<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
{% include "@ChillPerson/PersonResource/create.html.twig" %} {% include "@ChillPerson/PersonResource/create.html.twig" %}
{% endblock %} {% endblock %}

10
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -225,15 +225,15 @@ Concerned scopes: Services concernés
# person resource # person resource
person_resources_menu: "Personnes ressources" person_resources_menu: "Ressources"
Person resources: "Ressources de la personne" Person resources: "Ressources de la personne"
Add a person resource: "Ajouter une personne ressource" Add a person resource: "Ajouter une ressource"
edit resource: "Modifier une personne ressource" edit resource: "Modifier ressource"
Remove resource: "Supprimer une personne ressource" Remove resource: "Supprimer ressource"
Are you sure you want to remove the resource for "%name%" ?: Étes-vous sûr de vouloir supprimer cette ressource de %name%? Are you sure you want to remove the resource for "%name%" ?: Étes-vous sûr de vouloir supprimer cette ressource de %name%?
The resource has been successfully removed.: "La ressource a été supprimée." The resource has been successfully removed.: "La ressource a été supprimée."
List of resources: "Liste des ressources" List of resources: "Liste des ressources"
There are no available resources: "Aucune personne ressources renseignée" There are no available resources: "Aucun ressource"
no comment found: "Aucun commentaire" no comment found: "Aucun commentaire"
Select a type: "Choisissez un type" Select a type: "Choisissez un type"
Select a person: "Choisissez un usager" Select a person: "Choisissez un usager"