show a menu in the user area, lots of improvements to be more consistent

1 files changed, 15 insertions, 5 deletions

diff --git a/plugins/CoreAdminHome/Menu.php b/plugins/CoreAdminHome/Menu.php
index 17be9db0e0..3d99ba6a4b 100644
--- a/plugins/CoreAdminHome/Menu.php
+++ b/plugins/CoreAdminHome/Menu.php
@@ -31,14 +31,11 @@ class Menu extends \Piwik\Plugin\Menu
             $menu->addSettingsItem('General_General',
                                    $this->urlForAction('generalSettings'),
                                    $order = 6);
-            $menu->addManageItem('CoreAdminHome_TrackingCode',
-                                 $this->urlForAction('trackingCodeGenerator'),
-                                 $order = 10);
         }
 
-        if (SettingsManager::hasPluginsSettingsForCurrentUser()) {
+        if (Piwik::hasUserSuperUserAccess() && SettingsManager::hasSystemPluginsSettingsForCurrentUser()) {
             $menu->addSettingsItem('General_Plugins',
-                                   $this->urlForAction('pluginSettings'),
+                                   $this->urlForAction('adminPluginSettings'),
                                    $order = 7);
         }
     }
@@ -50,4 +47,17 @@ class Menu extends \Piwik\Plugin\Menu
         }
     }
 
+    public function configureUserMenu(MenuUser $menu)
+    {
+        $menu->addManageItem('CoreAdminHome_TrackingCode',
+            $this->urlForAction('trackingCodeGenerator'),
+            $order = 10);
+
+        if (SettingsManager::hasUserPluginsSettingsForCurrentUser()) {
+            $menu->addPersonalItem('CoreAdminHome_PluginSettings',
+                $this->urlForAction('userPluginSettings'),
+                $order = 15);
+        }
+    }
+
 }