[4.x] Move plugin related sub menu items to new Plugins menu item (#2…

…1609)

* Move plugin related sub menu items to new Plugins menu item

* add plugin icon to font

* add missing translation

* updates expected UI test files

* submodule update

* updates expected UI test files

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

lang/en.json

@@ -375,6 +375,8 @@
         "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Please upgrade your PHP version to at least PHP %s so your Matomo analytics data stays secure.",
         "Plugin": "Plugin",
         "Plugins": "Plugins",
+        "ManageSubscriptions": "Manage Subscriptions",
+        "ManagePlugins": "Manage Plugins",
         "PoweredBy": "Powered by",
         "Previous": "Previous",
         "PreviousDays": "Previous %s days (not including today)",

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',

plugins/CorePluginsAdmin/Menu.php

@@ -1,11 +1,13 @@
 <?php
+
 /**
  * Matomo - free/libre analytics platform
  *
  * @link https://matomo.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
+
 namespace Piwik\Plugins\CorePluginsAdmin;
 
 use Piwik\Container\StaticContainer;
@@ -45,13 +47,13 @@ public function configureTopMenu(MenuTop $menu)
 
     public function configureAdminMenu(MenuAdmin $menu)
     {
-        $hasSuperUserAcess    = Piwik::hasUserSuperUserAccess();
+        $hasSuperUserAccess    = Piwik::hasUserSuperUserAccess();
         $isAnonymous          = Piwik::isUserIsAnonymous();
         $isMarketplaceEnabled = Marketplace::isMarketplaceEnabled();
 
         $pluginsUpdateMessage = '';
 
-        if ($hasSuperUserAcess && $isMarketplaceEnabled && $this->marketplacePlugins) {
+        if ($hasSuperUserAccess && $isMarketplaceEnabled && $this->marketplacePlugins) {
             $pluginsHavingUpdate = $this->marketplacePlugins->getPluginsHavingUpdate();
 
             if (!empty($pluginsHavingUpdate)) {
@@ -60,13 +62,15 @@ public function configureAdminMenu(MenuAdmin $menu)
         }
 
         if (!$isAnonymous) {
-            $menu->addPlatformItem(null, "", $order = 7);
+            $menu->addPlatformItem('', [], 7);
         }
 
-        if ($hasSuperUserAcess) {
-            $menu->addSystemItem(Piwik::translate('General_Plugins') . $pluginsUpdateMessage,
-                $this->urlForAction('plugins', array('activated' => '')),
-                $order = 20);
+        if ($hasSuperUserAccess) {
+            $menu->addPluginItem(
+                Piwik::translate('General_ManagePlugins') . $pluginsUpdateMessage,
+                $this->urlForAction('plugins', ['activated' => '']),
+                10
+            );
         }
     }
 

plugins/Marketplace/Menu.php

@@ -20,8 +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->addPluginItem(Piwik::translate('General_ManageSubscriptions'),
+                $this->urlForAction('subscriptionOverview'),
+                20);
         }
     }
 

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');

plugins/Morpheus/stylesheets/base/icons.css

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'matomo';
   src:
-          url('plugins/Morpheus/fonts/matomo.woff2?19vk91') format('woff2'),
-          url('plugins/Morpheus/fonts/matomo.woff?19vk91') format('woff'),
-          url('plugins/Morpheus/fonts/matomo.ttf?19vk91') format('truetype'),
-          url('plugins/Morpheus/fonts/matomo.svg?19vk91#matomo') format('svg');
+          url('plugins/Morpheus/fonts/matomo.woff2?sbh6bh') format('woff2'),
+          url('plugins/Morpheus/fonts/matomo.woff?sbh6bh') format('woff'),
+          url('plugins/Morpheus/fonts/matomo.ttf?sbh6bh') format('truetype'),
+          url('plugins/Morpheus/fonts/matomo.svg?sbh6bh#matomo') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -433,3 +433,6 @@
 .icon-marketplace:before {
   content: "\e90b";
 }
+.icon-plugin:before {
+  content: "\e90c";
+}

plugins/PrivacyManager/Menu.php

@@ -18,7 +18,7 @@ public function configureAdminMenu(MenuAdmin $menu)
         if (Piwik::isUserHasSomeAdminAccess()) {
             $category = 'PrivacyManager_MenuPrivacySettings';
             $menu->registerMenuIcon($category, 'icon-locked-4');
-            $menu->addItem($category, null, array(), 2);
+            $menu->addItem($category, null, [], 3);
 
             if (Piwik::hasUserSuperUserAccess()) {
                 $menu->addItem($category, 'PrivacyManager_AnonymizeData', $this->urlForAction('privacySettings'), 5);