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

various minor fixes in aside activities

Browse Source
This commit is contained in:
Julien Fastré 2021-10-04 15:15:26 +02:00
parent 4c55631297
commit 27125b838e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/asideActivityCategory.html.twig → src/Bundle/ChillAsideActivityBundle/src/Resources/views/Entity/asideActivityCategory.html.twig
View File

@ -1,7 +1,6 @@
{% set reversed_parents = parents|reverse %} {% set reversed_parents = parents|reverse %}
<span <span
class="chill-entity entity-social-issue"> class="chill-entity entity-aside_activity-category">
{# <span class="badge bg-chill-l-gray text-dark"> #}
{%- for p in reversed_parents %} {%- for p in reversed_parents %}
<span class="parent-{{ loop.revindex0 }}"> <span class="parent-{{ loop.revindex0 }}">
{{ p.title|localize_translatable_string }}{{ options['default.separator'] }} {{ p.title|localize_translatable_string }}{{ options['default.separator'] }}
@ -10,5 +9,4 @@
<span class="child"> <span class="child">
{{ asideActivityCategory.title|localize_translatable_string }} {{ asideActivityCategory.title|localize_translatable_string }}
</span> </span>
{# </span> #}
</span> </span>

6
src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
View File

@ -24,7 +24,7 @@
<div class="item-col"> <div class="item-col">
<h3> <h3>
<b>{{ entity.type|chill_entity_render_box }}</b> {{ entity.type|chill_entity_render_box }}
</h3> </h3>
<div> <div>
{% if entity.date %} {% if entity.date %}
@ -46,13 +46,13 @@
<li> <li>
<span> <span>
<abbr class="referrer" title={{ 'Created by'|trans }}>{{ 'By'|trans }}:</abbr> <abbr class="referrer" title={{ 'Created by'|trans }}>{{ 'By'|trans }}:</abbr>
<b>{{ entity.createdBy.usernameCanonical }}</b> <b>{{ entity.createdBy|chill_entity_render_box }}</b>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<abbr class="referrer" title={{ 'Created for'|trans }}>{{ 'For'|trans }}:</abbr> <abbr class="referrer" title={{ 'Created for'|trans }}>{{ 'For'|trans }}:</abbr>
<b>{{ entity.agent.usernameCanonical }}</b> <b>{{ entity.agent|chill_entity_render_box }}</b>
</span> </span>
</li> </li>

2
src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
View File

@ -70,7 +70,7 @@ final class CategoryRender implements ChillEntityRenderInterface
$options = array_merge(self::DEFAULT_ARGS, $options); $options = array_merge(self::DEFAULT_ARGS, $options);
$parents = $this->buildParents($asideActivityCategory); $parents = $this->buildParents($asideActivityCategory);
return $this->engine->render('@ChillAsideActivity/asideActivityCategory/asideActivityCategory.html.twig', return $this->engine->render('@ChillAsideActivity/Entity/asideActivityCategory.html.twig',
[ [
'asideActivityCategory' => $asideActivityCategory, 'asideActivityCategory' => $asideActivityCategory,
'parents' => $parents, 'parents' => $parents,

2
src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
View File

@ -49,6 +49,8 @@ Agent: Utilisateur
date: Date date: Date
Duration: Durée Duration: Durée
Note: Note Note: Note
Choose the agent for whom this activity is created: Choisissez l'agent pour qui l'activité est créée
Choose the activity category: Choisir la catégorie
#Duration #Duration
minutes: minutes minutes: minutes