diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
index 9a57b9067..900a794b6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
@@ -1,14 +1,13 @@
{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
-{% block navigation_search_bar %}{% endblock %}
-{% block navigation_section_menu %}
- {{ chill_menu('admin_section', {
+{% block vertical_menu_content %}
+ {{ chill_menu('admin_section', {
'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
}) }}
{% endblock %}
{% block layout_wvm_content %}
{% block admin_content %}
-
+
{% endblock %}
{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig
deleted file mode 100644
index b76e60861..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
- * Copyright (C) 2014-2015, 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
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
-#}
-
-{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
-
-{% block vertical_menu_content %}
- {{ chill_menu('admin_language_country', {
- 'layout': '@ChillMain/Admin/menu_admin_language_country.html.twig',
- }) }}
-{% endblock %}
-
-
-
-{% block layout_wvm_content %}
- {% block admin_content %}
- {{ 'Management of languages and countries' |trans }}
- {% endblock %}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_location.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_location.html.twig
deleted file mode 100644
index fc0708af9..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_location.html.twig
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
- * Copyright (C) 2014-2015, 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
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
-#}
-
-{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
-
-{% block vertical_menu_content %}
- {{ chill_menu('admin_location', {
- 'layout': '@ChillMain/Admin/menu_admin_location.html.twig',
- }) }}
-{% endblock %}
-
-
-
-{% block layout_wvm_content %}
- {% block admin_content %}
- {{ 'Management of location' |trans }}
- {% endblock %}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig
deleted file mode 100644
index 55883069f..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-{#
- * Copyright (C) 2014-2015, 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
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
-#}
-
-{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
-
-{% block vertical_menu_content %}
- {{ chill_menu('admin_permissions', {
- 'layout': '@ChillMain/Admin/menu_admin_permissions.html.twig',
- }) }}
-{% endblock %}
-
-{% block layout_wvm_content %}
- {% block admin_content %}
- {{ 'Permissions management of your chill installation' |trans }}
- {% endblock %}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_index.html.twig
deleted file mode 100644
index b766b6440..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_index.html.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig
deleted file mode 100644
index e6b4fa5fe..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
- * Copyright (C) 2014-2015, 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
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
-#}
-
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Language and countries menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_location.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_location.html.twig
deleted file mode 100644
index b4112ff60..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_location.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
- * Copyright (C) 2014-2015, 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
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
-#}
-
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Location Menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_permissions.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_permissions.html.twig
deleted file mode 100644
index 77032edca..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_permissions.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
- * Copyright (C) 2014-2015, 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
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
-#}
-
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Permissions Menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig
index 7fabd0ae9..d0c777a4e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig
@@ -1,41 +1,28 @@
-{#
- * Copyright (C) 2014-2015, 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
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
-#}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
index 1dc0acc81..d410abcea 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
@@ -1,8 +1,13 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
{% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
-{% block content %}
+{% block admin_content %}
{% embed '@ChillMain/CRUD/_index.html.twig' %}
+ {% block actions_before %}
+
+ {{'Back to the admin'|trans}}
+
+ {% endblock %}
{% endembed %}
-{% endblock content %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
index b1326a85b..b21f83846 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
@@ -34,32 +34,58 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
return;
}
- $menu->addChild('Users and permissions', [
- 'route' => 'chill_main_admin_permissions',
- ])
- ->setExtras([
- 'icons' => ['key'],
- 'order' => 200,
- 'explain' => 'Configure permissions for users',
- ]);
+ $menu->addChild('Users and permissions')
+ ->setAttribute('class', 'list-group-item-header')
+ ->setExtras(['order' => 100, 'header' => true]);
- $menu->addChild('Location and location type', [
- 'route' => 'chill_main_admin_locations',
- ])
- ->setExtras([
- 'icons' => ['key'],
- 'order' => 205,
- 'explain' => 'Configure location and location type',
- ]);
+ $menu->addChild('Center list', [
+ 'route' => 'admin_center',
+ ])->setExtras(['order' => 110]);
+
+ $menu->addChild('List circles', [
+ 'route' => 'admin_scope',
+ ])->setExtras(['order' => 120]);
+
+ $menu->addChild('Permissions group list', [
+ 'route' => 'admin_permissionsgroup',
+ ])->setExtras(['order' => 130]);
+
+ $menu->addChild('crud.admin_user.index.title', [
+ 'route' => 'chill_crud_admin_user_index',
+ ])->setExtras(['order' => 140]);
+
+ $menu->addChild('User jobs', [
+ 'route' => 'chill_crud_admin_user_job_index',
+ ])->setExtras(['order' => 150]);
+
+
+
+ $menu->addChild('Languages and countries')
+ ->setAttribute('class', 'list-group-item-header')
+ ->setExtras(['order' => 200, 'header' => 'true']);
+
+ $menu->addChild('Language list', [
+ 'route' => 'chill_crud_main_language_index',
+ ])->setExtras(['order' => 210]);
+
+ $menu->addChild('Country list', [
+ 'route' => 'chill_crud_main_country_index',
+ ])->setExtras(['order' => 220]);
+
+
+
+ $menu->addChild('Location and location type')
+ ->setAttribute('class', 'list-group-item-header')
+ ->setExtras(['order' => 300, 'header' => 'true']);
+
+ $menu->addChild('Location type list', [
+ 'route' => 'chill_crud_main_location_type_index',
+ ])->setExtras(['order' => 310]);
+
+ $menu->addChild('Location list', [
+ 'route' => 'chill_crud_main_location_index',
+ ])->setExtras(['order' => 320]);
- $menu->addChild('Languages and countries', [
- 'route' => 'chill_main_admin_language_country',
- ])
- ->setExtras([
- 'icons' => ['key'],
- 'order' => 210,
- 'explain' => 'Configure languages and countries',
- ]);
}
public static function getMenuIds(): array
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php
deleted file mode 100644
index 540f1344e..000000000
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php
+++ /dev/null
@@ -1,33 +0,0 @@
-addChild('Language list', [
- 'route' => 'chill_crud_main_language_index',
- ])->setExtras(['order' => 205]);
-
- $menu->addChild('Country list', [
- 'route' => 'chill_crud_main_country_index',
- ])->setExtras(['order' => 206]);
- }
-
- public static function getMenuIds(): array
- {
- return ['admin_language_country'];
- }
-}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php
deleted file mode 100644
index da1ce479b..000000000
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php
+++ /dev/null
@@ -1,33 +0,0 @@
-addChild('Location type list', [
- 'route' => 'chill_crud_main_location_type_index',
- ])->setExtras(['order' => 205]);
-
- $menu->addChild('Location list', [
- 'route' => 'chill_crud_main_location_index',
- ])->setExtras(['order' => 206]);
- }
-
- public static function getMenuIds(): array
- {
- return ['admin_location'];
- }
-}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php
deleted file mode 100644
index 6fab6b635..000000000
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php
+++ /dev/null
@@ -1,47 +0,0 @@
-addChild('Permissions group list', [
- 'route' => 'admin_permissionsgroup',
- ])->setExtras([
- 'order' => 300,
- ]);
-
- $menu->addChild('crud.admin_user.index.title', [
- 'route' => 'chill_crud_admin_user_index',
- ])->setExtras(['order' => 400]);
-
- $menu->addChild('List circles', [
- 'route' => 'admin_scope',
- ])->setExtras(['order' => 200]);
-
- $menu->addChild('Center list', [
- 'route' => 'admin_center',
- ])->setExtras(['order' => 100]);
-
- $menu->addChild('User jobs', [
- 'route' => 'chill_crud_admin_user_job_index',
- ])->setExtras(['order' => 150]);
- }
-
- public static function getMenuIds(): array
- {
- return ['admin_permissions'];
- }
-}
diff --git a/src/Bundle/ChillMainBundle/config/routes.yaml b/src/Bundle/ChillMainBundle/config/routes.yaml
index b0ee2c956..d25f2aaff 100644
--- a/src/Bundle/ChillMainBundle/config/routes.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes.yaml
@@ -62,17 +62,6 @@ chill_main_homepage:
# order: 0
# label: Main admin menu
#
-chill_main_admin_permissions:
- path: /{_locale}/admin/permissions
- controller: Chill\MainBundle\Controller\AdminController::indexPermissionsAction
-
-chill_main_admin_locations:
- path: /{_locale}/admin/locations
- controller: Chill\MainBundle\Controller\AdminController::indexLocationsAction
-
-chill_main_admin_language_country:
- path: /{_locale}/admin/language-country
- controller: Chill\MainBundle\Controller\AdminController::indexLanguageCountryAction
chill_main_search:
path: /{_locale}/search.{_format}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index f23fa7382..e679db535 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -120,6 +120,7 @@ Main admin menu: Menu d'administration principal
Actions: Actions
Users and permissions: Utilisateurs et permissions
Location and location type: Localisations et types de localisation
+Back to the admin: Retour
#permissions
Permissions Menu: Gestion des droits