From cba8a342d53650387ee079aa8dc03271b2e027ef Mon Sep 17 00:00:00 2001
From: Julie Lenaerts
Date: Wed, 24 Apr 2024 18:02:06 +0200
Subject: [PATCH] more template fixes
---
.../views/CSPerson/dispositifs_edit.html.twig | 4 +--
.../personal_situation_edit.html.twig | 4 +--
.../src/Resources/views/CV/edit.html.twig | 2 +-
.../src/Resources/views/CV/view.html.twig | 2 +-
.../src/Resources/views/Frein/edit.html.twig | 2 +-
.../src/Resources/views/Frein/new.html.twig | 2 +-
.../src/Resources/views/Frein/view.html.twig | 2 +-
.../views/Immersion/edit-bilan.html.twig | 4 +--
.../Resources/views/Immersion/edit.html.twig | 2 +-
.../Resources/views/Immersion/new.html.twig | 11 ++++++--
.../Resources/views/Immersion/view.html.twig | 6 ++---
.../views/ProjetProfessionnel/edit.html.twig | 2 +-
.../views/ProjetProfessionnel/new.html.twig | 2 +-
.../views/ProjetProfessionnel/view.html.twig | 2 +-
.../Resources/views/Report/delete.html.twig | 2 +-
.../Resources/views/Report/index.html.twig | 26 +++++++++----------
16 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_edit.html.twig
index 5e0c53d87..e0d7abc68 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_edit.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_edit.html.twig
@@ -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 %}
Dispositifs
{% endblock %}
@@ -15,7 +15,7 @@
{# surcharge le block "retour" par un lien vers la page vue #}
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig
index 5b4982ede..3265679dc 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig
@@ -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 %}
Situation personnelle
{% endblock %}
@@ -11,7 +11,7 @@
{# surcharge le block "retour" par un lien vers la page vue #}
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CV/edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CV/edit.html.twig
index 9d674137f..aabbef4e4 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/CV/edit.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/CV/edit.html.twig
@@ -48,7 +48,7 @@
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig
index ec938933a..c4db35bb9 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig
@@ -119,7 +119,7 @@
{% block content_view_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/edit.html.twig
index 1b685203a..f18c0e964 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/edit.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/edit.html.twig
@@ -11,7 +11,7 @@
{% embed '@ChillPerson/CRUD/_edit_content.html.twig' %}
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/new.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/new.html.twig
index bdf6d462e..153f669be 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/new.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/new.html.twig
@@ -14,7 +14,7 @@
{% endblock crud_content_header %}
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig
index 39ef73b64..04cd6e152 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig
@@ -49,7 +49,7 @@
{% block content_view_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit-bilan.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit-bilan.html.twig
index f6b27109c..6c7f2ddb6 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit-bilan.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit-bilan.html.twig
@@ -15,7 +15,7 @@ Bilan d'immersion
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
@@ -27,7 +27,7 @@ Bilan d'immersion
auprès de {{ entity.entreprise.name }}
Domaine d'activité: {{ entity.domaineActivite }}
- Modifier
+ Modifier
Savoir-être du jeune
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit.html.twig
index 8a383ac82..f817dbc19 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit.html.twig
@@ -11,7 +11,7 @@
{% embed '@ChillPerson/CRUD/_edit_content.html.twig' %}
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/new.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/new.html.twig
index 4410bf1db..e10722fed 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/new.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/new.html.twig
@@ -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 %}
-
+
{{ 'Cancel'|trans }}
@@ -64,5 +68,8 @@
{% endblock %}
{% block js %}
-
+ {{ parent() }}
+ {{ encore_entry_script_tags('mod_pickentity_type') }}
+
+
{% endblock %}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig
index c01568df4..70d0f3f28 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig
@@ -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 %}#}
Entreprise
@@ -188,14 +188,14 @@
{% block content_view_actions_back %}
-
+
{{ 'Cancel'|trans }}
{% endblock %}
{% block content_view_actions_after %}
-
+
Bilan
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/edit.html.twig
index 462807322..e38cbf480 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/edit.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/edit.html.twig
@@ -43,7 +43,7 @@
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/new.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/new.html.twig
index d67f8a218..34d5b9b39 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/new.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/new.html.twig
@@ -43,7 +43,7 @@
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig
index 6f5cb22c0..75687f70f 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig
@@ -97,7 +97,7 @@
{% block content_view_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Report/delete.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Report/delete.html.twig
index 6f1013d0c..fb3235246 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Report/delete.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Report/delete.html.twig
@@ -7,7 +7,7 @@
{% embed '@ChillMain/CRUD/_delete_content.html.twig' %}
{% block content_form_actions_back %}
-
+
{{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Report/index.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Report/index.html.twig
index f9762c445..a88fb6b29 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Report/index.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Report/index.html.twig
@@ -26,14 +26,14 @@
-
-
+
-
-
+
{% if is_granted('CHILL_CSCONNECTES_REPORT_DELETE', cv) %}
-
-
+
{% endif %}
@@ -88,14 +88,14 @@
|
-
-
+
-
-
+
{% if is_granted('CHILL_CSCONNECTES_REPORT_DELETE', frein) %}
-
-
+
{% endif %}
@@ -140,19 +140,19 @@
|
-
-
+
-
-
+
-
-
+
{% if is_granted('CHILL_CSCONNECTES_REPORT_DELETE', im) %}
-
-
+
{% endif %}
@@ -221,14 +221,14 @@
|
-
-
+
-
-
+
{% if is_granted('CHILL_CSCONNECTES_REPORT_DELETE', pr) %}
-
-
+
{% endif %}
|