diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php new file mode 100644 index 000000000..70d295027 --- /dev/null +++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php @@ -0,0 +1,30 @@ +render('ChillAsideActivityBundle:Admin:index.html.twig'); + } + +} diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php index 4fa2c2c96..e58d98fc2 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php @@ -32,27 +32,26 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild return; } - if (in_array($menuId, ['admin_index', 'admin_section'], true)) { - $menu->addChild('Aside activities', [ + $menu->addChild('Aside activities', [ + 'route' => 'chill_aside_activity_admin', + ]) + ->setAttribute('class', 'list-group-item-header') + ->setExtras([ + 'order' => 7000, + 'header' => true, + 'explain' => 'Aside activity type configuration', + ]); + $menu + ->addChild('Aside activity categories', [ 'route' => 'chill_crud_aside_activity_category_index', ]) - ->setExtras([ - 'order' => 900, - 'explain' => 'Aside activity type configuration', - ]); - } else { - $menu - ->addChild('Aside activity categories', [ - 'route' => 'chill_crud_aside_activity_category_index', - ]) - ->setExtras([ - 'order' => '50', - ]); - } + ->setExtras([ + 'order' => 7010, + ]); } public static function getMenuIds(): array { - return ['admin_index', 'admin_section', 'admin_aside_activity']; + return ['admin_section', 'admin_aside_activity']; } } diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/index.html.twig similarity index 71% rename from src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig rename to src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/index.html.twig index c328d2030..8325c0ed6 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/index.html.twig @@ -1,7 +1,9 @@ {% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %} {% block vertical_menu_content %} - {{ chill_menu('admin_aside_activity') }} + {{ chill_menu('admin_aside_activity', { + 'layout': '@ChillMain/Admin/menu_admin_section.html.twig', + }) }} {% endblock %} {% block layout_wvm_content %} diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig index 3fb6fb612..3a60d3e9c 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig @@ -1,10 +1,10 @@ -{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %} +{% extends '@ChillMain/CRUD/Admin/index.html.twig' %} {% block title %} {% include('@ChillMain/CRUD/_edit_title.html.twig') %} {% endblock %} -{% block layout_wvm_content %} +{% block admin_content %} {% embed '@ChillMain/CRUD/_edit_content.html.twig' %} {% block content_form_actions_view %}{% endblock %} {% block content_form_actions_save_and_show %}{% endblock %} diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig index 00dc1d3ea..741ff7dc9 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig @@ -1,7 +1,10 @@ -{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %} +{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %} + +{% block title %}{{ 'Aside Activity Type List'|trans }}{% endblock title %} {% block admin_content %} -