diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php index 2225fdd0e..6347794a8 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php @@ -36,51 +36,51 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface $menu->addChild('Users and permissions') ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 100, 'header' => true]); + ->setExtras(['order' => 1000, 'header' => true]); $menu->addChild('Center list', [ 'route' => 'admin_center', - ])->setExtras(['order' => 110]); + ])->setExtras(['order' => 1010]); $menu->addChild('List circles', [ 'route' => 'admin_scope', - ])->setExtras(['order' => 120]); + ])->setExtras(['order' => 1020]); $menu->addChild('Permissions group list', [ 'route' => 'admin_permissionsgroup', - ])->setExtras(['order' => 130]); + ])->setExtras(['order' => 1030]); $menu->addChild('crud.admin_user.index.title', [ 'route' => 'chill_crud_admin_user_index', - ])->setExtras(['order' => 140]); + ])->setExtras(['order' => 1040]); $menu->addChild('User jobs', [ 'route' => 'chill_crud_admin_user_job_index', - ])->setExtras(['order' => 150]); + ])->setExtras(['order' => 1050]); $menu->addChild('Languages and countries') ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 200, 'header' => true]); + ->setExtras(['order' => 1200, 'header' => true]); $menu->addChild('Language list', [ 'route' => 'chill_crud_main_language_index', - ])->setExtras(['order' => 210]); + ])->setExtras(['order' => 1210]); $menu->addChild('Country list', [ 'route' => 'chill_crud_main_country_index', - ])->setExtras(['order' => 220]); + ])->setExtras(['order' => 1220]); $menu->addChild('Location and location type') ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 300, 'header' => true]); + ->setExtras(['order' => 1300, 'header' => true]); $menu->addChild('Location type list', [ 'route' => 'chill_crud_main_location_type_index', - ])->setExtras(['order' => 310]); + ])->setExtras(['order' => 1310]); $menu->addChild('Location list', [ 'route' => 'chill_crud_main_location_index', - ])->setExtras(['order' => 320]); + ])->setExtras(['order' => 1320]); } public static function getMenuIds(): array diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php index 9d16bdc13..813f36983 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php @@ -18,16 +18,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; */ class AdminController extends AbstractController { - /** - * @param $_locale - * - * @return \Symfony\Component\HttpFoundation\Response - */ - public function indexAction($_locale) - { - return $this->render('ChillPersonBundle:Admin:layout.html.twig', []); - } - /** * @return \Symfony\Component\HttpFoundation\RedirectResponse */ diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php index 25996f7bf..6004bb1cb 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php @@ -33,12 +33,13 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface return; } - $menu->addChild('Person', [ - 'route' => 'chill_person_admin', - ]) - ->setExtras([ - 'order' => 20, - ]); + $menu->addChild('Person') + ->setAttribute('class', 'list-group-item-header') + ->setExtras(['order' => 2000, 'header' => true]); + + $menu->addChild('Marital status', [ + 'route' => 'chill_crud_person_marital-status_index', + ])->setExtras(['order' => 2010]); } public static function getMenuIds(): array diff --git a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig index e61f3f7c0..28678bf6d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig @@ -4,9 +4,8 @@ {% include('@ChillMain/CRUD/_edit_title.html.twig') %} {% endblock %} -{% block 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 %} {% endembed %} -{% endblock %} \ No newline at end of file +{% endblock admin_content %} \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig index ce8202fb2..a7aca2235 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig @@ -1,6 +1,6 @@ {% extends '@ChillMain/CRUD/Admin/index.html.twig' %} -{% block content %} +{% block admin_content %} {% embed '@ChillMain/CRUD/_index.html.twig' %} {% block table_entities_thead_tr %}