Merge branch 'master' into upgrade-sf5

src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig

@@ -40,10 +40,10 @@
                         {{ 'by_user'|trans ~ ' ' }}
                     {% endif %}
                     <span class="user">
-                        {{ user|chill_entity_render_box(options['user']) }}
+                        {{ user|chill_entity_render_box({'at_date': comment.date}) }}
                     </span>
                 {% endif %}
             </div>
         {% endif %}
     </blockquote>
-{{ closing_box|raw }}
+{{ closing_box|raw }}

src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig

@@ -1,10 +1,10 @@
 <span class="chill-entity entity-user">
     {{- user.label }}
-    {%- if opts['user_job'] and user.userJob(opts['at']) is not null %}
-        <span class="user-job">({{ user.userJob(opts['at']).label|localize_translatable_string }})</span>
+    {%- if opts['user_job'] and user.userJob(opts['at_date']) is not null %}
+        <span class="user-job">({{ user.userJob(opts['at_date']).label|localize_translatable_string }})</span>
     {%- endif -%}
-    {%- if opts['main_scope'] and user.mainScope(opts['at']) is not null %}
-    <span class="main-scope">({{ user.mainScope(opts['at']).name|localize_translatable_string }})</span>
+    {%- if opts['main_scope'] and user.mainScope(opts['at_date']) is not null %}
+    <span class="main-scope">({{ user.mainScope(opts['at_date']).name|localize_translatable_string }})</span>
     {%- endif -%}
     {%- if opts['absence'] and user.isAbsent %}
         <span class="badge bg-danger rounded-pill" title="{{ 'absence.Absent'|trans|escape('html_attr') }}">{{ 'absence.A'|trans }}</span>

src/Bundle/ChillMainBundle/Resources/views/Menu/quick_menu.html.twig

@@ -0,0 +1,20 @@
+{% if menus|length > 0 %}
+<li class="dropdown">
+    <a class="dropdown-toggle btn btn-sm btn-outline-primary"
+        href="#"
+        role="button"
+        data-bs-toggle="dropdown"
+        aria-expanded="false">
+        <i class="fa fa-flash"></i>
+    </a>
+    <div class="dropdown-menu">
+        {% for menu in menus %}
+            <a class="dropdown-item"
+                href="{{ menu.uri }}"
+                ><i class="fa fa-{{- menu.extras.icon }} fa-fw"></i>
+                {{ menu.label|trans }}
+            </a>
+        {% endfor %}
+    </div>
+</li>
+{% endif %}

src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig

@@ -21,7 +21,7 @@
                         </span>
                         {% if not c.notification.isSystem %}
                             <span class="badge-user">
-                                    {{ c.notification.sender|chill_entity_render_string }}
+                                    {{ c.notification.sender|chill_entity_render_string({'at_date': c.notification.date}) }}
                                 </span>
                         {% else %}
                             <span class="badge-user system">{{ 'notification.is_system'|trans }}</span>
@@ -53,7 +53,7 @@
                         {% endif %}
                         {% for a in c.notification.addressees %}
                             <span class="badge-user">
-                                {{ a|chill_entity_render_string }}
+                                {{ a|chill_entity_render_string({'at_date': c.notification.date}) }}
                             </span>
                         {% endfor %}
                         {% for a in c.notification.addressesEmails %}

src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig

@@ -1,7 +1,7 @@
 {% extends "@ChillMain/layout.html.twig"  %}
 
 {% block title 'notification.show notification from %sender%'|trans(
-    { '%sender%': notification.sender|chill_entity_render_string }
+    { '%sender%': notification.sender|chill_entity_render_string({'at_date': notification.date}) }
 ) ~ ' ' ~ notification.title %}
 
 {% block js %}

src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig

@@ -31,14 +31,14 @@
                 <div class="row">
                     <div class="col-sm-12">
                         {{ 'By'|trans }}
-                        {{ step.previous.transitionBy|chill_entity_render_box }},
+                        {{ step.previous.transitionBy|chill_entity_render_box({'at_date': step.previous.transitionAt }) }},
                         {{ step.previous.transitionAt|format_datetime('short', 'short') }}
                     </div>
                 </div>
             {% else %}
                 <div class="row">
                     <div class="col-sm-4">{{ 'workflow.Created by'|trans }}</div>
-                    <div class="col-sm-8">{{ step.entityWorkflow.createdBy|chill_entity_render_box }}</div>
+                    <div class="col-sm-8">{{ step.entityWorkflow.createdBy|chill_entity_render_box({'at_date': step.entityWorkflow.createdAt}) }}</div>
                 </div>
                 <div class="row">
                     <div class="col-sm-4">{{ 'Le'|trans }}</div>
@@ -110,8 +110,8 @@
             {% if entity_workflow.currentStep.destUserByAccessKey|length > 0 %}
                 <p><b>{{ 'workflow.Those users are also granted to apply a transition by using an access key'|trans }}&nbsp;:</b></p>
                 <ul>
-                    {% for u in entity_workflow.currentStep.destUserByAccessKey %}
-                        <li>{{ u|chill_entity_render_box }}</li>
+                    {% for u in entity_workflow.currentStepChained.destUserByAccessKey %}
+                        <li>{{ u|chill_entity_render_box({'at_date': entity_workflow.currentStepChained.previous.transitionAt }) }}</li>
                     {% endfor %}
                 </ul>
             {% endif %}

src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig

@@ -42,7 +42,7 @@
                     <div class="item-col" style="width: inherit;">
                         {% if step.transitionBy is not null %}
                             <div>
-                                {{ step.transitionBy|chill_entity_render_box }}
+                                {{ step.transitionBy|chill_entity_render_box({'at_date': step.transitionAt}) }}
                             </div>
                         {% endif %}
                         <div>
@@ -76,7 +76,7 @@
                             <p><b>{{ 'workflow.Users allowed to apply transition'|trans }}&nbsp;: </b></p>
                             <ul>
                                 {% for u in step.destUser %}
-                                    <li>{{ u|chill_entity_render_box }}</li>
+                                    <li>{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</li>
                                 {% endfor %}
                             </ul>
                         {% endif %}
@@ -85,7 +85,7 @@
                             <p><b>{{ 'workflow.Users put in Cc'|trans }}&nbsp;: </b></p>
                             <ul>
                                 {% for u in step.ccUser %}
-                                    <li>{{ u|chill_entity_render_box }}</li>
+                                    <li>{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</li>
                                 {% endfor %}
                             </ul>
                         {% endif %}
@@ -103,7 +103,7 @@
                             <p><b>{{ 'workflow.Those users are also granted to apply a transition by using an access key'|trans }}&nbsp;:</b></p>
                             <ul>
                                 {% for u in step.destUserByAccessKey %}
-                                    <li>{{ u|chill_entity_render_box }}</li>
+                                    <li>{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</li>
                                 {% endfor %}
                             </ul>
                         {% endif %}

src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig

@@ -3,7 +3,7 @@
         {% if step.previous is not null %}
             <li>
                 <span class="item-key">{{ 'By'|trans ~ ' : ' }}</span>
-                <b>{{ step.previous.transitionBy|chill_entity_render_box }}</b>
+                <b>{{ step.previous.transitionBy|chill_entity_render_box({'at_date': step.previous.transitionAt }) }}</b>
             </li>
             <li>
                 <span class="item-key">{{ 'Le'|trans ~ ' : ' }}</span>
@@ -12,19 +12,19 @@
             <li>
                 <span class="item-key">{{ 'workflow.For'|trans ~ ' : ' }}</span>
                 <b>
-                    {% for d in step.destUser %}{{ d|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
+                    {% for d in step.destUser %}{{ d|chill_entity_render_string({'at_date': step.previous.transitionAt}) }}{% if not loop.last %}, {% endif %}{% endfor %}
                 </b>
             </li>
             <li>
                 <span class="item-key">{{ 'workflow.Cc'|trans ~ ' : ' }}</span>
                 <b>
-                    {% for u in step.ccUser %}{{ u|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
+                    {% for u in step.ccUser %}{{ u|chill_entity_render_string({'at_date': step.previous.transitionAt }) }}{% if not loop.last %}, {% endif %}{% endfor %}
                 </b>
             </li>
         {% else %}
             <li>
                 <span class="item-key">{{ 'workflow.Created by'|trans ~ ' : ' }}</span>
-                <b>{{ step.entityWorkflow.createdBy|chill_entity_render_box }}</b>
+                <b>{{ step.entityWorkflow.createdBy|chill_entity_render_box({'at_date': step.entityWorkflow.createdAt }) }}</b>
             </li>
             <li>
                 <span class="item-key">{{ 'Le'|trans ~ ' : ' }}</span>