[UX] Reorder administration panel (mautic#13596)

* reorder * cs fix * api inside integrations + cs fix * marketplace above --------- Co-authored-by: Ruth Cheesley <[email protected]>
lenonleite · Apr 26, 2024 · 6d1027d · 6d1027d
1 parent 3e95053
commit 6d1027d
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 6 deletions.
diff --git a/app/bundles/ApiBundle/Config/config.php b/app/bundles/ApiBundle/Config/config.php
@@ -43,8 +43,9 @@
             'items' => [
                 'mautic.api.client.menu.index' => [
                     'route'     => 'mautic_client_index',
-                    'iconClass' => 'fa-puzzle-piece',
                     'access'    => 'api:clients:view',
+                    'parent'    => 'mautic.core.integrations',
+                    'priority'  => 17,
                     'checks'    => [
                         'parameters' => [
                             'api_enabled' => true,

diff --git a/app/bundles/CategoryBundle/Config/config.php b/app/bundles/CategoryBundle/Config/config.php
@@ -43,6 +43,7 @@
                 'access'    => 'category:categories:view',
                 'iconClass' => 'ri-folder-settings-fill',
                 'id'        => 'mautic_category_index',
+                'priority'  => 20,
             ],
         ],
     ],

diff --git a/app/bundles/ConfigBundle/Config/config.php b/app/bundles/ConfigBundle/Config/config.php
@@ -22,12 +22,14 @@
                 'iconClass'       => 'ri-settings-5-line',
                 'id'              => 'mautic_config_index',
                 'access'          => 'admin',
+                'priority'        => 16,
             ],
             'mautic.sysinfo.menu.index' => [
                 'route'     => 'mautic_sysinfo_index',
                 'iconClass' => 'ri-information-2-fill',
                 'id'        => 'mautic_sysinfo_index',
                 'access'    => 'admin',
+                'priority'  => 04,
                 'checks'    => [
                     'parameters' => [
                         'sysinfo_disabled' => false,

diff --git a/app/bundles/CoreBundle/Config/config.php b/app/bundles/CoreBundle/Config/config.php
@@ -122,6 +122,12 @@
                 'iconClass' => 'ri-palette-fill',
                 'id'        => 'mautic_themes_index',
                 'access'    => 'core:themes:view',
+                'priority'  => 18,
+            ],
+            'mautic.core.integrations' => [
+                'id'        => 'mautic_integrations_root',
+                'iconClass' => 'ri-plug-fill',
+                'priority'  => 15,
             ],
         ],
         'extra' => [

diff --git a/app/bundles/CoreBundle/Translations/en_US/messages.ini b/app/bundles/CoreBundle/Translations/en_US/messages.ini
@@ -75,6 +75,7 @@ mautic.core.command.prepare_upgrade_success="Successfully created mautic.zip and
 mautic.core.command.prepare_upgrade_fail="Failed to create mautic.zip in your web root. Your installation is not ready for upgrade."
 mautic.core.company="Company"
 mautic.core.components="Components"
+mautic.core.integrations="Integrations"
 mautic.core.config.cors.restrict.domains="Restrict Domains"
 mautic.core.config.cors.restrict.domains.tooltip="Would you like to restrict the domains that can send CORS requests to your Mautic installation?"
 mautic.core.config.cors.valid.domains="Valid Domains"

diff --git a/app/bundles/LeadBundle/Config/config.php b/app/bundles/LeadBundle/Config/config.php
@@ -312,6 +312,7 @@
                     'iconClass' => 'ri-input-field',
                     'route'     => 'mautic_contactfield_index',
                     'access'    => 'lead:fields:full',
+                    'priority'  => 19,
                 ],
             ],
         ],

diff --git a/app/bundles/MarketplaceBundle/EventListener/MenuSubscriber.php b/app/bundles/MarketplaceBundle/EventListener/MenuSubscriber.php
@@ -38,8 +38,9 @@ public function onBuildMenu(MenuEvent $event): void
                     'marketplace.title' => [
                         'id'        => 'marketplace',
                         'route'     => RouteProvider::ROUTE_LIST,
-                        'iconClass' => 'ri-shopping-bag-3-fill',
                         'access'    => MarketplacePermissions::CAN_VIEW_PACKAGES,
+                        'parent'    => 'mautic.core.integrations',
+                        'priority'  => 16,
                     ],
                 ],
             ]

diff --git a/app/bundles/PluginBundle/Config/config.php b/app/bundles/PluginBundle/Config/config.php
@@ -49,9 +49,9 @@
             'items'    => [
                 'mautic.plugin.plugins' => [
                     'id'        => 'mautic_plugin_root',
-                    'iconClass' => 'ri-plug-fill',
                     'access'    => 'plugin:plugins:manage',
                     'route'     => 'mautic_plugin_index',
+                    'parent'    => 'mautic.core.integrations',
                 ],
             ],
         ],

diff --git a/app/bundles/UserBundle/Config/config.php b/app/bundles/UserBundle/Config/config.php
@@ -3,15 +3,20 @@
 return [
     'menu' => [
         'admin' => [
+            'mautic.user_management' => [
+                'id'        => 'mautic_user_management_root',
+                'iconClass' => 'ri-user-settings-fill',
+                'priority'  => 17,
+            ],
             'mautic.user.users' => [
                 'access'    => 'user:users:view',
                 'route'     => 'mautic_user_index',
-                'iconClass' => 'ri-user-settings-fill',
+                'parent'    => 'mautic.user_management',
             ],
             'mautic.user.roles' => [
                 'access'    => 'user:roles:view',
                 'route'     => 'mautic_role_index',
-                'iconClass' => 'ri-shield-user-fill',
+                'parent'    => 'mautic.user_management',
             ],
         ],
     ],

diff --git a/app/bundles/UserBundle/Translations/en_US/messages.ini b/app/bundles/UserBundle/Translations/en_US/messages.ini
@@ -31,6 +31,7 @@ mautic.user.role.permission.isadmin.message="The role is set to have full access
 mautic.user.role.permissions="Permissions"
 mautic.user.role.usercount="Number of users in this role"
 mautic.user.roles="Roles"
+mautic.user_management="User management"
 mautic.user.active="Active"
 mautic.user.role.list.viewusers_count="{0} No Users|{1} View 1 User|]1,Inf[ View %count% Users"
 mautic.user.role.list.thead.usercount="User Count"

diff --git a/app/bundles/WebhookBundle/Config/config.php b/app/bundles/WebhookBundle/Config/config.php
@@ -31,9 +31,9 @@
             'items' => [
                 'mautic.webhook.webhooks' => [
                     'id'        => 'mautic_webhook_root',
-                    'iconClass' => 'ri-webhook-fill',
                     'access'    => ['webhook:webhooks:viewown', 'webhook:webhooks:viewother'],
                     'route'     => 'mautic_webhook_index',
+                    'parent'    => 'mautic.core.integrations',
                 ],
             ],
         ],