admin: reorganise person admin menu + fix marital status admin

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

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
      */

src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php

@@ -33,12 +33,13 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('Person', [
+        $menu->addChild('Person')
-            'route' => 'chill_person_admin',
+            ->setAttribute('class', 'list-group-item-header')
-        ])
+            ->setExtras(['order' => 2000, 'header' => true]);
-            ->setExtras([
+
-                'order' => 20,
+        $menu->addChild('Marital status', [
-            ]);
+            'route' => 'chill_crud_person_marital-status_index',
+        ])->setExtras(['order' => 2010]);
     }
 
     public static function getMenuIds(): array

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 %}
+{% endblock admin_content %}

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 %}
             <th>{{ 'Id'|trans }}</th>
@@ -21,7 +21,13 @@
                         </ul>
                     </td>
                 </tr>
-            {% endfor %}
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
         {% endblock %}
     {% endembed %}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig

@@ -4,8 +4,9 @@
     {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock %}
+{% endblock admin_content %}
+

src/Bundle/ChillPersonBundle/config/routes.yaml

@@ -96,10 +96,6 @@ chill_person_timeline:
     path: /{_locale}/person/{person_id}/timeline
     controller: Chill\PersonBundle\Controller\TimelinePersonController::personAction
 
-chill_person_admin:
-    path: "/{_locale}/admin/person"
-    controller: Chill\PersonBundle\Controller\AdminController::indexAction
-
 chill_person_duplicate_view:
     path: /{_locale}/person/{person_id}/duplicate/view
     controller: Chill\PersonBundle\Controller\PersonDuplicateController::viewAction