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

Merge branch 'list_documents_page'

Browse Source
This commit is contained in:
Mathieu Jaumotte 2022-03-01 16:09:10 +01:00
commit aad7a21bc3
5 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
View File

@ -42,41 +42,40 @@
<div class="item-col item-meta"> <div class="item-col item-meta">
{{ mmm.createdBy(document) }} {{ mmm.createdBy(document) }}
</div> </div>
<div class="item-col"> <ul class="item-col record_actions flex-shrink-1">
<ul class="record_actions"> {% if document.course is defined %}
{% if document.course is defined %} {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
<li>
{{ m.download_button(document.object, document.title) }}
</li>
<li>
<a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
</li>
{% endif %}
{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
<li>
<a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
</li>
{% endif %}
<li> <li>
{{ chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) }} {{ m.download_button(document.object, document.title) }}
</li>
<li>
<a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
</li> </li>
{% else %}
{% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
<li>
{{ m.download_button(document.object, document.title) }}
</li>
<li>
<a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
</li>
{% endif %}
{% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
<li>
<a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
</li>
{% endif %}
{% endif %} {% endif %}
</ul> {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
</div> <li>
<a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
</li>
{% endif %}
<li>
{{ chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) }}
</li>
{% else %}
{% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
<li>
{{ m.download_button(document.object, document.title) }}
</li>
<li>
<a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
</li>
{% endif %}
{% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
<li>
<a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
</li>
{% endif %}
{% endif %}
</ul>
</div> </div>
</div> </div>

1
src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
View File

@ -278,6 +278,7 @@ table.table-bordered {
} }
/// meta-data /// meta-data
div.createdBy,
div.updatedBy, div.updatedBy,
div.metadata { div.metadata {
span.user, span.date { span.user, span.date {

1
src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
View File

@ -279,6 +279,7 @@ div.wrap-header {
li { li {
margin-right: 5px; margin-right: 5px;
margin-bottom: 5px;
} }
} }
} }

2
src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss
View File

@ -1,7 +1,7 @@
ul.record_actions { ul.record_actions {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap-reverse; flex-wrap: wrap;
justify-content: flex-end; justify-content: flex-end;
padding: 0.5em 0; padding: 0.5em 0;

4
src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
View File

@ -8,7 +8,7 @@
{% endif %} {% endif %}
{% if entity.updatedBy != null %} {% if entity.updatedBy != null %}
{% if entity.updatedAt != null %} {% if entity.updatedAt != null %}
{{ ', ' }}<br>{{ 'by_user'|trans }} {{ ', ' }}{{ '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 %}
{{ ', ' }}<br>{{ 'by_user'|trans }} {{ ', ' }}{{ 'by_user'|trans }}
{% else %} {% else %}
{{ 'Created by'|trans }} {{ 'Created by'|trans }}
{% endif %} {% endif %}