backports murph-skeleton

core/Controller/Site/NavigationAdminController.php

@@ -22,7 +22,9 @@ class NavigationAdminController extends AdminController
      */
     public function index(int $page = 1, RepositoryQuery $query, Request $request): Response
     {
-        $pager = $query->paginate($page);
+        $pager = $query
+            ->orderBy('.label, .domain')
+            ->paginate($page);
 
         return $this->render('@Core/site/navigation_admin/index.html.twig', [
             'pager' => $pager,

core/Controller/Site/TreeAdminController.php

@@ -55,7 +55,9 @@ class TreeAdminController extends AdminController
         MenuFactory $menuFactory,
         Session $session
     ): Response {
-        $navigations = $navigationQuery->create()->find();
+        $navigations = $navigationQuery->create()
+            ->orderBy('.label, .domain')
+            ->find();
 
         $session->set('site_tree_last_navigation', $navigation->getId());
 

core/Resources/views/site/navigation_admin/index.html.twig

@@ -53,6 +53,7 @@
                         <td class="col-5 miw-200">
                             <a href="" class="btn btn-sm btn-light">
                                 {{ item.domain }}
+                                ({{ item.locale }})
                             </a>
                         </td>
                         <td class="col-2 miw-100 text-right">