diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-04-04 03:10:40 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 13:17:27 +0300 |
| commit | 3a6d626c2474b83ea5c4125fd33dfe12b9e0bf8a (patch) | |
| tree | 9de2cd1d85e1f8a7211f0514f8deae2b152faa89 /plugins/CustomVariables | |
| parent | 780c09b144e048cc748429bc06d016354d44746e (diff) | |
refs #9354 merge user and admin menu to one single menu
Diffstat (limited to 'plugins/CustomVariables')
| -rw-r--r-- | plugins/CustomVariables/Menu.php | 6 | ||||
| -rw-r--r-- | plugins/CustomVariables/templates/manage.twig | 2 | ||||
| -rw-r--r-- | plugins/CustomVariables/tests/UI/CustomVariables_spec.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/CustomVariables/Menu.php b/plugins/CustomVariables/Menu.php index b97aa1bb01..25b73712c5 100644 --- a/plugins/CustomVariables/Menu.php +++ b/plugins/CustomVariables/Menu.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\CustomVariables; use Piwik\Common; -use Piwik\Menu\MenuUser; +use Piwik\Menu\MenuAdmin; use Piwik\Piwik; use Piwik\Plugins\UsersManager\UserPreferences; @@ -20,14 +20,14 @@ use Piwik\Plugins\UsersManager\UserPreferences; */ class Menu extends \Piwik\Plugin\Menu { - public function configureUserMenu(MenuUser $menu) + public function configureAdminMenu(MenuAdmin $menu) { $userPreferences = new UserPreferences(); $default = $userPreferences->getDefaultWebsiteId(); $idSite = Common::getRequestVar('idSite', $default, 'int'); if (Piwik::isUserHasAdminAccess($idSite)) { - $menu->addManageItem('Custom Variables', $this->urlForAction('manage'), $orderId = 15); + $menu->addDiagnosticItem('Custom Variables', $this->urlForAction('manage'), $orderId = 20); } } } diff --git a/plugins/CustomVariables/templates/manage.twig b/plugins/CustomVariables/templates/manage.twig index dc170ff2c9..e10e1ee047 100644 --- a/plugins/CustomVariables/templates/manage.twig +++ b/plugins/CustomVariables/templates/manage.twig @@ -1,4 +1,4 @@ -{% extends 'user.twig' %} +{% extends 'admin.twig' %} {% block topcontrols %} <div class="top_bar_sites_selector piwikTopControl"> diff --git a/plugins/CustomVariables/tests/UI/CustomVariables_spec.js b/plugins/CustomVariables/tests/UI/CustomVariables_spec.js index 1e247fca56..b6b036c87e 100644 --- a/plugins/CustomVariables/tests/UI/CustomVariables_spec.js +++ b/plugins/CustomVariables/tests/UI/CustomVariables_spec.js @@ -19,7 +19,7 @@ describe("CustomVariables", function () { }); it('should be visible in the menu', function (done) { - expect.screenshot('link_in_menu').to.be.captureSelector('li:contains(Manage)', function (page) { + expect.screenshot('link_in_menu').to.be.captureSelector('li:contains(Diagnostic)', function (page) { }, done); }); });
\ No newline at end of file |