Move plugin related sub menu items to new Plugins menu item

matomo-org · Nov 29, 2023 · 912cf4f · 912cf4f
1 parent a800b65
commit 912cf4f
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 15 deletions.
diff --git a/core/Menu/MenuAdmin.php b/core/Menu/MenuAdmin.php
@@ -77,6 +77,20 @@ public function addPlatformItem($menuName, $url, $order = 50, $tooltip = false)
         $this->addItem('CorePluginsAdmin_MenuPlatform', $menuName, $url, $order, $tooltip);
     }
 
+    /**
+     * See {@link add()}. Adds a new menu item to the plugins section of the admin menu.
+     * @param string $menuName
+     * @param array $url
+     * @param int $order
+     * @param bool|string $tooltip
+     * @api
+     * @since 5.0.0
+     */
+    public function addPluginItem(string $menuName, array $url, int $order = 50, $tooltip = false)
+    {
+        $this->addItem('General_Plugins', $menuName, $url, $order, $tooltip);
+    }
+
     /**
      * See {@link add()}. Adds a new menu item to the measurable section of the admin menu.
      * @param string $menuName

diff --git a/lang/en.json b/lang/en.json
@@ -376,7 +376,7 @@
         "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Please upgrade your PHP version to at least PHP %s so your Matomo analytics data stays secure.",
         "Plugin": "Plugin",
         "Plugins": "Plugins",
-        "PluginSubscriptions": "Plugin Subscriptions",
+        "ManageSubscriptions": "Manage Subscriptions",
         "PoweredBy": "Powered by",
         "Previous": "Previous",
         "PreviousDays": "Previous %s days (not including today)",

diff --git a/plugins/CoreAdminHome/Menu.php b/plugins/CoreAdminHome/Menu.php
@@ -19,12 +19,13 @@ class Menu extends \Piwik\Plugin\Menu
 {
     public function configureAdminMenu(MenuAdmin $menu)
     {
-        $menu->addPersonalItem(null, array(), 1, false);
-        $menu->addSystemItem(null, array(), 2, false);
-        $menu->addMeasurableItem(null, array(), $order = 3);
-        $menu->addPlatformItem(null, array(), 4, false);
-        $menu->addDiagnosticItem(null, array(), $order = 5);
-        $menu->addDevelopmentItem(null, array(), $order = 40);
+        $menu->addPersonalItem('', [], 1);
+        $menu->addSystemItem('', [], 2);
+        $menu->addPluginItem('', [], 3);
+        $menu->addMeasurableItem('', [], 4);
+        $menu->addPlatformItem('', [], 5);
+        $menu->addDiagnosticItem('', [], 6);
+        $menu->addDevelopmentItem('', [], 40);
 
         if (Piwik::hasUserSuperUserAccess()) {
             $menu->addSystemItem('General_GeneralSettings',

diff --git a/plugins/CorePluginsAdmin/Menu.php b/plugins/CorePluginsAdmin/Menu.php
@@ -65,9 +65,8 @@ public function configureAdminMenu(MenuAdmin $menu)
         }
 
         if ($hasSuperUserAccess) {
-            $menu->addSystemItem(Piwik::translate('General_ManagePlugins') . $pluginsUpdateMessage,
-                $this->urlForAction('plugins', array('activated' => '')),
-                $order = 20);
+            $menu->addPluginItem(Piwik::translate('General_ManagePlugins') . $pluginsUpdateMessage,
+                           $this->urlForAction('plugins', array('activated' => '')), 10);
         }
     }
 

diff --git a/plugins/Marketplace/Menu.php b/plugins/Marketplace/Menu.php
@@ -20,14 +20,14 @@ public function configureAdminMenu(MenuAdmin $menu)
     {
         if (!Piwik::isUserIsAnonymous()) {
             $menu->addPlatformItem('Marketplace_Marketplace',
-                $this->urlForAction('overview', array('activated' => '', 'mode' => 'admin', 'type' => '', 'show' => '')),
-                $order = 5);
+                $this->urlForAction('overview', ['activated' => '', 'mode' => 'admin', 'type' => '', 'show' => '']),
+                5);
         }
 
         if (Piwik::hasUserSuperUserAccess()) {
-            $menu->addSystemItem(Piwik::translate('General_PluginSubscriptions'),
+            $menu->addPluginItem(Piwik::translate('General_ManageSubscriptions'),
                 $this->urlForAction('subscriptionOverview'),
-                $order = 21);
+                20);
         }
     }
 

diff --git a/plugins/Morpheus/Menu.php b/plugins/Morpheus/Menu.php
@@ -20,6 +20,7 @@ public function configureAdminMenu(MenuAdmin $menu)
         $menu->registerMenuIcon('CoreAdminHome_MenuDiagnostic', 'icon-admin-diagnostic');
         $menu->registerMenuIcon('CorePluginsAdmin_MenuPlatform', 'icon-admin-platform');
         $menu->registerMenuIcon('General_Settings', 'icon-admin-settings');
+        $menu->registerMenuIcon('General_Plugins', 'icon-plugin');
         $menu->registerMenuIcon('CoreAdminHome_Administration', 'icon-settings');
         $menu->registerMenuIcon('UsersManager_MenuPersonal', 'icon-user-personal');
         $menu->registerMenuIcon('CoreAdminHome_MenuSystem', 'icon-server');

diff --git a/plugins/PrivacyManager/Menu.php b/plugins/PrivacyManager/Menu.php
@@ -18,7 +18,7 @@ public function configureAdminMenu(MenuAdmin $menu)
         if (Piwik::isUserHasSomeAdminAccess()) {
             $category = 'PrivacyManager_MenuPrivacySettings';
             $menu->registerMenuIcon($category, 'icon-locked');
-            $menu->addItem($category, null, array(), 2);
+            $menu->addItem($category, null, [], 3);
 
             if (Piwik::hasUserSuperUserAccess()) {
                 $menu->addItem($category, 'PrivacyManager_AnonymizeData', $this->urlForAction('privacySettings'), 5);