mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Fix: align ux design styles to chill theme
This commit is contained in:
parent
3576f7f14f
commit
ba43b6b025
@ -1,5 +1,5 @@
|
|||||||
{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
|
{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
|
||||||
<div
|
<div class="d-inline-flex"
|
||||||
data-download-buttons
|
data-download-buttons
|
||||||
data-stored-object="{{ document_json|json_encode|escape('html_attr') }}"
|
data-stored-object="{{ document_json|json_encode|escape('html_attr') }}"
|
||||||
data-can-edit="{{ can_edit ? '1' : '0' }}"
|
data-can-edit="{{ can_edit ? '1' : '0' }}"
|
||||||
|
@ -133,7 +133,7 @@
|
|||||||
<ul class="item-col record_actions">
|
<ul class="item-col record_actions">
|
||||||
{% if displayNotification is defined and displayNotification == true %}
|
{% if displayNotification is defined and displayNotification == true %}
|
||||||
<li>
|
<li>
|
||||||
<a class="btn btn-notify btn-outline-primary" title="{{ 'notification.Notify'|trans }}"
|
<a class="btn btn-notify" title="{{ 'notification.Notify'|trans }}"
|
||||||
href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': w.id}) }}">
|
href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': w.id}) }}">
|
||||||
|
|
||||||
</a>
|
</a>
|
||||||
|
@ -118,9 +118,7 @@
|
|||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
{% if recordAction is defined %}
|
{% if recordAction is defined %}
|
||||||
@ -136,16 +134,19 @@
|
|||||||
{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
|
{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
|
||||||
{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
|
{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
|
||||||
{% if e.documents|length > 0 %}
|
{% if e.documents|length > 0 %}
|
||||||
|
<table class="table table-hover align-middle mt-4 mx-auto">
|
||||||
<table class="table mt-4 mx-auto">
|
|
||||||
{% for d in e.documents %}
|
{% for d in e.documents %}
|
||||||
<tr class="border-0">
|
<tr>
|
||||||
<td class="border-0">{{ d.title }}</td>
|
<td class="border-0">{{ d.title }}</td>
|
||||||
<td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
|
<td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
|
||||||
<td class="border-0">
|
<td class="border-0 text-end">
|
||||||
<a class="btn btn-notify btn-sm btn-outline-primary" title="{{ 'notification.Notify'|trans }} " href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'entityId': d.id}) }}"></a>
|
<a class="btn btn-notify btn-sm"
|
||||||
|
title="{{ 'notification.Notify'|trans }}"
|
||||||
|
href="{{ chill_path_add_return_path('chill_main_notification_create', {
|
||||||
|
'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'entityId': d.id
|
||||||
|
}) }}"></a>
|
||||||
|
{{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}
|
||||||
</td>
|
</td>
|
||||||
<td class="border-0 text-end">{{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
<a href="{{ path('chill_person_accompanying_period_work_list', { 'id': accompanyingCourse.id }) }}"
|
<a href="{{ path('chill_person_accompanying_period_work_list', { 'id': accompanyingCourse.id }) }}"
|
||||||
class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
|
class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
|
||||||
</li>
|
</li>
|
||||||
<li>{{ macro.workflowButton(work) }}</li>
|
|
||||||
<li>
|
<li>
|
||||||
<div class="d-grid gap-2 {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}btn-group{% endif %}" {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}role="group"{% endif %}>
|
<div class="d-grid gap-2 {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}btn-group{% endif %}" {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}role="group"{% endif %}>
|
||||||
{% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}
|
{% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}
|
||||||
@ -46,21 +45,21 @@
|
|||||||
<a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id, 'tos': [accompanyingCourse.user.id]}) }}">{{ 'notification.Notify referrer'|trans }}</a>
|
<a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id, 'tos': [accompanyingCourse.user.id]}) }}">{{ 'notification.Notify referrer'|trans }}</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a class="dropdown-item btn-outline-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">"{{ 'notification.Notify any'|trans }}"</a>
|
<a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">{{ 'notification.Notify any'|trans }}</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
{% else %}
|
{% else %}
|
||||||
<a class="btn btn-notify btn-outline-primary" title="{{ 'notification.Notify'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">
|
<a class="btn btn-notify" title="{{ 'notification.Notify'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
<li>{{ macro.workflowButton(work) }}</li>
|
||||||
{% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', work) %}
|
{% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', work) %}
|
||||||
<li>
|
<li>
|
||||||
<a class="btn btn-edit" title="{{ 'Edit'|trans }}"
|
<a class="btn btn-edit"
|
||||||
href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': work.id }) }}"
|
href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': work.id }) }}"
|
||||||
></a>
|
>{{ 'Edit'|trans }}</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', work) %}
|
{% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', work) %}
|
||||||
|
@ -1,23 +1,24 @@
|
|||||||
{% macro recordAction(document) %}
|
{% macro recordAction(document) %}
|
||||||
{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
|
{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
|
||||||
<div class="item-row">
|
<div class="item-row">
|
||||||
|
<table class="table table-hover align-middle mt-4 mx-auto">
|
||||||
<table class="table table-bordered border-dark mt-4 mx-auto">
|
|
||||||
<tr>
|
<tr>
|
||||||
<td class="text-lg-center text-bg-primary">{{ document.title }}</td>
|
<td class="border-0">{{ document.title }}</td>
|
||||||
<td class="text-lg-center m-3">{{ mm.mimeIcon(document.storedObject.type) }}</td>
|
<td class="border-0">{{ mm.mimeIcon(document.storedObject.type) }}</td>
|
||||||
<td class="record-actions text-lg-center"><a
|
<td class="border-0 text-end record-actions">
|
||||||
|
<a class="btn btn-show"
|
||||||
href="{{ path('chill_person_accompanying_period_work_show', { 'id': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork.id }) }}"
|
href="{{ path('chill_person_accompanying_period_work_show', { 'id': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork.id }) }}"
|
||||||
class="btn btn-show" title="{{ 'See the document'|trans }}"></a></td>
|
title="{{ 'See the document'|trans }}"></a>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
{% if document is not null %}
|
{% if document is not null %}
|
||||||
|
|
||||||
<div class="flex-table">
|
<div class="flex-table accompanying-course-work">
|
||||||
{% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_DOCUMENT_SHOW', document) %}
|
{% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_DOCUMENT_SHOW', document) %}
|
||||||
<div class="item-bloc">
|
<div class="item-bloc colored">
|
||||||
{% include '@ChillPerson/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig' with {
|
{% include '@ChillPerson/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig' with {
|
||||||
'w': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork,
|
'w': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork,
|
||||||
'd': document.storedObject,
|
'd': document.storedObject,
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
</li>
|
</li>
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
{% if work is not null %}
|
{% if work is not null %}
|
||||||
<div class="flex-table">
|
<div class="flex-table accompanying-course-work">
|
||||||
{% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', work) %}
|
{% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', work) %}
|
||||||
{% include "@ChillPerson/AccompanyingCourseWork/_item.html.twig" with {
|
{% include "@ChillPerson/AccompanyingCourseWork/_item.html.twig" with {
|
||||||
'itemBlocClass': 'bg-chill-llight-gray',
|
'itemBlocClass': 'bg-chill-llight-gray',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user