more template fixes

This commit is contained in:
Julie Lenaerts 2024-04-24 18:02:06 +02:00
parent 6f55ba15d6
commit cba8a342d5
16 changed files with 41 additions and 34 deletions

View File

@ -7,7 +7,7 @@
{% block title 'Dispositifs de ' ~ entity.person.firstName ~ ' ' ~ entity.person.lastName %}
{% block content %}
{% embed '@ChillPerson/CRUD/_edit_content.html.twig' %}
{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
{% block crud_content_header %}
<h1>Dispositifs</h1>
{% endblock %}
@ -15,7 +15,7 @@
{# surcharge le block "retour" par un lien vers la page vue #}
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_dispositifs_view', { 'id': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_job_dispositifs_view', { 'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -3,7 +3,7 @@
{% block title 'Situation personnelle de ' ~ entity.person.firstName ~ ' ' ~ entity.person.lastName %}
{% block content %}
{% embed '@ChillPerson/CRUD/_edit_content.html.twig' %}
{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
{% block crud_content_header %}
<h1>Situation personnelle</h1>
{% endblock %}
@ -11,7 +11,7 @@
{# surcharge le block "retour" par un lien vers la page vue #}
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_personal_situation_view', { 'id': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_job_personal_situation_view', { 'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -48,7 +48,7 @@
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -119,7 +119,7 @@
{% block content_view_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -11,7 +11,7 @@
{% embed '@ChillPerson/CRUD/_edit_content.html.twig' %}
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -14,7 +14,7 @@
{% endblock crud_content_header %}
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -49,7 +49,7 @@
{% block content_view_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -15,7 +15,7 @@ Bilan d'immersion
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>
@ -27,7 +27,7 @@ Bilan d'immersion
auprès de <pre>{{ entity.entreprise.name }}</pre>
Domaine d'activité: {{ entity.domaineActivite }}
<br/><br/>
<a class="sc-button bt-edit" href={{ path('chill_crud_immersion_edit', {'id': entity.id}) }}>Modifier</a>
<a class="btn btn-edit" href={{ path('chill_crud_immersion_edit', {'id': entity.id}) }}>Modifier</a>
</p>
<h2>Savoir-être du jeune</h2>

View File

@ -11,7 +11,7 @@
{% embed '@ChillPerson/CRUD/_edit_content.html.twig' %}
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -3,6 +3,10 @@
{% set person = entity.person %}
{% set activeRouteKey = '' %}
{% block css %}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
{% block title %}
{% embed('@ChillPerson/CRUD/_new_title.html.twig') %}{% endembed %}
{% endblock %}
@ -14,7 +18,7 @@
{% endblock crud_content_header %}
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>
@ -64,5 +68,8 @@
{% endblock %}
{% block js %}
<script type="text/javascript" src="{{ asset('build/immersion_edit.js') }}"></script>
{{ parent() }}
{{ encore_entry_script_tags('mod_pickentity_type') }}
<script type="text/javascript" src="{{ asset('build/immersion_edit.js') }}"></script>
{% endblock %}

View File

@ -7,7 +7,7 @@
{% endblock crud_content_header %}
{% block crud_content_view_details %}
{% import 'ChillMainBundle:Address:macro.html.twig' as macro_address %}
{# {% import 'ChillMainBundle:Address:macro.html.twig' as macro_address %}#}
<dl class="chill_view_data">
<h2>Entreprise</h2>
@ -188,14 +188,14 @@
{% block content_view_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">
{{ 'Cancel'|trans }}
</a>
</li>
{% endblock %}
{% block content_view_actions_after %}
<li>
<a class="sc-button" href="{{ chill_return_path_or('chill_crud_immersion_bilan', { 'id': entity.id }) }}">
<a class="btn" href="{{ chill_return_path_or('chill_crud_immersion_bilan', { 'id': entity.id }) }}">
<svg style="height: 1rem;" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="graduation-cap" class="svg-inline--fa fa-graduation-cap fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M622.34 153.2L343.4 67.5c-15.2-4.67-31.6-4.67-46.79 0L17.66 153.2c-23.54 7.23-23.54 38.36 0 45.59l48.63 14.94c-10.67 13.19-17.23 29.28-17.88 46.9C38.78 266.15 32 276.11 32 288c0 10.78 5.68 19.85 13.86 25.65L20.33 428.53C18.11 438.52 25.71 448 35.94 448h56.11c10.24 0 17.84-9.48 15.62-19.47L82.14 313.65C90.32 307.85 96 298.78 96 288c0-11.57-6.47-21.25-15.66-26.87.76-15.02 8.44-28.3 20.69-36.72L296.6 284.5c9.06 2.78 26.44 6.25 46.79 0l278.95-85.7c23.55-7.24 23.55-38.36 0-45.6zM352.79 315.09c-28.53 8.76-52.84 3.92-65.59 0l-145.02-44.55L128 384c0 35.35 85.96 64 192 64s192-28.65 192-64l-14.18-113.47-145.03 44.56z"></path></svg>
Bilan
</a>

View File

@ -43,7 +43,7 @@
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -43,7 +43,7 @@
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -97,7 +97,7 @@
{% block content_view_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -7,7 +7,7 @@
{% embed '@ChillMain/CRUD/_delete_content.html.twig' %}
{% block content_form_actions_back %}
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', {'person': entity.person.id}) }}">
{{ 'Cancel'|trans }}
</a>
</li>

View File

@ -26,14 +26,14 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ chill_path_add_return_path('chill_crud_cscv_view', {'id': cv.id, 'person_id': person.id}) }}" class="sc-button bt-show"></a>
<a href="{{ chill_path_add_return_path('chill_crud_cscv_view', {'id': cv.id, 'person_id': person.id}) }}" class="btn btn-show"></a>
</li>
<li>
<a href="{{ chill_path_add_return_path('chill_crud_cscv_edit', {'id': cv.id, 'person_id': person.id}) }}" class="sc-button bt-edit"></a>
<a href="{{ chill_path_add_return_path('chill_crud_cscv_edit', {'id': cv.id, 'person_id': person.id}) }}" class="btn btn-edit"></a>
</li>
{% if is_granted('CHILL_CSCONNECTES_REPORT_DELETE', cv) %}
<li>
<a href="{{ chill_path_add_return_path('chill_crud_cscv_delete', {'id': cv.id, 'person_id': person.id}) }}" class="sc-button bt-delete"></a>
<a href="{{ chill_path_add_return_path('chill_crud_cscv_delete', {'id': cv.id, 'person_id': person.id}) }}" class="btn btn-delete"></a>
</li>
{% endif %}
</ul>
@ -88,14 +88,14 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_crud_csfrein_view', {'id': frein.id, 'person_id': person.id}) }}" class="sc-button bt-show"></a>
<a href="{{ path('chill_crud_csfrein_view', {'id': frein.id, 'person_id': person.id}) }}" class="btn btn-show"></a>
</li>
<li>
<a href="{{ path('chill_crud_csfrein_edit', {'id': frein.id, 'person_id': person.id}) }}" class="sc-button bt-edit"></a>
<a href="{{ path('chill_crud_csfrein_edit', {'id': frein.id, 'person_id': person.id}) }}" class="btn btn-edit"></a>
</li>
{% if is_granted('CHILL_CSCONNECTES_REPORT_DELETE', frein) %}
<li>
<a href="{{ chill_path_add_return_path('chill_crud_csfrein_delete', {'id': frein.id, 'person_id': person.id}) }}" class="sc-button bt-delete"></a>
<a href="{{ chill_path_add_return_path('chill_crud_csfrein_delete', {'id': frein.id, 'person_id': person.id}) }}" class="btn btn-delete"></a>
</li>
{% endif %}
</ul>
@ -140,19 +140,19 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_crud_immersion_view', {'id': im.id, 'person_id': person.id}) }}" class="sc-button bt-show"></a>
<a href="{{ path('chill_crud_immersion_view', {'id': im.id, 'person_id': person.id}) }}" class="btn btn-show"></a>
</li>
<li>
<a href="{{ path('chill_crud_immersion_edit', {'id': im.id, 'person_id': person.id}) }}" class="sc-button bt-edit"></a>
<a href="{{ path('chill_crud_immersion_edit', {'id': im.id, 'person_id': person.id}) }}" class="btn btn-edit"></a>
</li>
<li>
<a href="{{ path('chill_crud_immersion_bilan', {'id': im.id, 'person_id': person.id}) }}" class="sc-button bt-bilan">
<a href="{{ path('chill_crud_immersion_bilan', {'id': im.id, 'person_id': person.id}) }}" class="btn btn-bilan">
<svg style="height: 1rem;" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="graduation-cap" class="svg-inline--fa fa-graduation-cap fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M622.34 153.2L343.4 67.5c-15.2-4.67-31.6-4.67-46.79 0L17.66 153.2c-23.54 7.23-23.54 38.36 0 45.59l48.63 14.94c-10.67 13.19-17.23 29.28-17.88 46.9C38.78 266.15 32 276.11 32 288c0 10.78 5.68 19.85 13.86 25.65L20.33 428.53C18.11 438.52 25.71 448 35.94 448h56.11c10.24 0 17.84-9.48 15.62-19.47L82.14 313.65C90.32 307.85 96 298.78 96 288c0-11.57-6.47-21.25-15.66-26.87.76-15.02 8.44-28.3 20.69-36.72L296.6 284.5c9.06 2.78 26.44 6.25 46.79 0l278.95-85.7c23.55-7.24 23.55-38.36 0-45.6zM352.79 315.09c-28.53 8.76-52.84 3.92-65.59 0l-145.02-44.55L128 384c0 35.35 85.96 64 192 64s192-28.65 192-64l-14.18-113.47-145.03 44.56z"></path></svg>
</a>
</li>
{% if is_granted('CHILL_CSCONNECTES_REPORT_DELETE', im) %}
<li>
<a href="{{ chill_path_add_return_path('chill_crud_immersion_delete', {'id': im.id, 'person_id': person.id}) }}" class="sc-button bt-delete"></a>
<a href="{{ chill_path_add_return_path('chill_crud_immersion_delete', {'id': im.id, 'person_id': person.id}) }}" class="btn btn-delete"></a>
</li>
{% endif %}
</ul>
@ -221,14 +221,14 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_crud_projet_prof_view', {'id': pr.id, 'person_id' : person.id}) }}" class="sc-button bt-show"></a>
<a href="{{ path('chill_crud_projet_prof_view', {'id': pr.id, 'person_id' : person.id}) }}" class="btn btn-show"></a>
</li>
<li>
<a href="{{ path('chill_crud_projet_prof_edit', {'id': pr.id, 'person_id' : person.id}) }}" class="sc-button bt-edit"></a>
<a href="{{ path('chill_crud_projet_prof_edit', {'id': pr.id, 'person_id' : person.id}) }}" class="btn btn-edit"></a>
</li>
{% if is_granted('CHILL_CSCONNECTES_REPORT_DELETE', pr) %}
<li>
<a href="{{ chill_path_add_return_path('chill_crud_projet_prof_delete', {'id': pr.id, 'person_id' : person.id}) }}" class="sc-button bt-delete"></a>
<a href="{{ chill_path_add_return_path('chill_crud_projet_prof_delete', {'id': pr.id, 'person_id' : person.id}) }}" class="btn btn-delete"></a>
</li>
{% endif %}
</ul>