Merge branch 'list_documents_page'

This commit is contained in:
Mathieu Jaumotte 2022-03-01 15:11:01 +01:00
commit 4536f30da2
2 changed files with 4 additions and 4 deletions

View File

@ -24,8 +24,8 @@
<div class="item-col"> <div class="item-col">
<div class="container"> <div class="container">
{% if document.date is not null %} {% if document.date is not null %}
<div class="dates row" style="float: right;"> <div class="dates row text-end">
<span>{{ document.createdAt|format_date('short') }}</span> <span>{{ document.date|format_date('short') }}</span>
</div> </div>
{% endif %} {% endif %}
</div> </div>

View File

@ -8,7 +8,7 @@
{% endif %} {% endif %}
{% if entity.updatedBy != null %} {% if entity.updatedBy != null %}
{% if entity.updatedAt != null %} {% if entity.updatedAt != null %}
{{ ', ' ~ 'by_user'|trans }} {{ ', ' }}<br>{{ 'by_user'|trans }}
{% else %} {% else %}
{{ 'Last updated by'|trans }} {{ 'Last updated by'|trans }}
{% endif %} {% endif %}
@ -29,7 +29,7 @@
{% endif %} {% endif %}
{% if entity.createdBy != null %} {% if entity.createdBy != null %}
{% if entity.createdAt != null %} {% if entity.createdAt != null %}
{{ ', ' ~ 'by_user'|trans }} {{ ', ' }}<br>{{ 'by_user'|trans }}
{% else %} {% else %}
{{ 'Created by'|trans }} {{ 'Created by'|trans }}
{% endif %} {% endif %}