From 17ff80c39cdb3aea028880899bebb8fcaa6e5636 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 12 Jul 2021 10:23:23 +0200 Subject: [PATCH] accompanyingCourse, household and person use uniq menu template --- .../Resources/views/AccompanyingCourse/layout.html.twig | 2 +- .../Resources/views/AccompanyingCourse/menu.html.twig | 9 --------- .../Resources/views/Household/layout.html.twig | 2 +- .../Resources/views/Household/menu.html.twig | 8 -------- .../ChillPersonBundle/Resources/views/menu.html.twig | 2 +- 5 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/menu.html.twig delete mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Household/menu.html.twig diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig index 58591a618..ff1901fe3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig @@ -10,7 +10,7 @@ {% block vertical_menu_content %} {{ chill_menu('accompanyingCourse', { - 'layout': 'ChillPersonBundle:AccompanyingCourse:menu.html.twig', + 'layout': '@ChillPerson/menu.html.twig', 'args' : { 'accompanyingCourse': accompanyingCourse } }) }} {% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/menu.html.twig deleted file mode 100644 index 74fe150c6..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/menu.html.twig +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig index 6b8faa4b0..ffc0df206 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig @@ -10,7 +10,7 @@ {% block vertical_menu_content %} {{ chill_menu('household', { - 'layout': '@ChillPerson/Household/menu.html.twig', + 'layout': '@ChillPerson/menu.html.twig', 'args' : { 'household': household } }) }} {% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/menu.html.twig deleted file mode 100644 index c28c150c6..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/menu.html.twig +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig index 737c57db2..7eb95ef04 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig @@ -1,5 +1,5 @@ {# - * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, + * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as