diff options
Diffstat (limited to 'plugins/CoreAdminHome')
| -rw-r--r-- | plugins/CoreAdminHome/Controller.php | 3 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/CoreAdminHome.php | 11 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/templates/_menu.twig | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 77ed3e8f95..ffedbcf624 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -15,6 +15,7 @@ use Piwik\API\ResponseBuilder; use Piwik\ArchiveProcessor\Rules; use Piwik\Common; use Piwik\Config; +use Piwik\Menu\MenuTop; use Piwik\Nonce; use Piwik\Piwik; use Piwik\Plugins\LanguagesManager\API as APILanguagesManager; @@ -144,7 +145,7 @@ class Controller extends \Piwik\Controller\Admin { $view = new View('@CoreAdminHome/trackingCodeGenerator'); $this->setBasicVariablesView($view); - $view->topMenu = Piwik_GetTopMenu(); + $view->topMenu = MenuTop::getInstance()->getMenu(); $viewableIdSites = APISitesManager::getInstance()->getSitesIdWithAtLeastViewAccess(); diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php index 24fb7e52b2..923c729555 100644 --- a/plugins/CoreAdminHome/CoreAdminHome.php +++ b/plugins/CoreAdminHome/CoreAdminHome.php @@ -14,6 +14,7 @@ use Piwik\DataAccess\ArchiveSelector; use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Date; use Piwik\Db; +use Piwik\Menu\MenuAdmin; use Piwik\Piwik; use Piwik\ScheduledTask; use Piwik\ScheduledTime\Daily; @@ -80,14 +81,14 @@ class CoreAdminHome extends \Piwik\Plugin function addMenu() { - Piwik_AddAdminSubMenu('CoreAdminHome_MenuManage', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 1); - Piwik_AddAdminSubMenu('CoreAdminHome_MenuDiagnostic', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 6); - Piwik_AddAdminSubMenu('General_Settings', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 5); - Piwik_AddAdminSubMenu('General_Settings', 'CoreAdminHome_MenuGeneralSettings', + MenuAdmin::getInstance()->add('CoreAdminHome_MenuManage', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 1); + MenuAdmin::getInstance()->add('CoreAdminHome_MenuDiagnostic', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 6); + MenuAdmin::getInstance()->add('General_Settings', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 5); + MenuAdmin::getInstance()->add('General_Settings', 'CoreAdminHome_MenuGeneralSettings', array('module' => 'CoreAdminHome', 'action' => 'generalSettings'), Piwik::isUserHasSomeAdminAccess(), $order = 6); - Piwik_AddAdminSubMenu('CoreAdminHome_MenuManage', 'CoreAdminHome_TrackingCode', + MenuAdmin::getInstance()->add('CoreAdminHome_MenuManage', 'CoreAdminHome_TrackingCode', array('module' => 'CoreAdminHome', 'action' => 'trackingCodeGenerator'), Piwik::isUserHasSomeAdminAccess(), $order = 4); diff --git a/plugins/CoreAdminHome/templates/_menu.twig b/plugins/CoreAdminHome/templates/_menu.twig index 70ba3572c2..5ec9b95cbd 100644 --- a/plugins/CoreAdminHome/templates/_menu.twig +++ b/plugins/CoreAdminHome/templates/_menu.twig @@ -1,7 +1,7 @@ -{% if menu|length > 1 %} +{% if adminMenu|length > 1 %} <div class="Menu Menu--admin"> <ul class="Menu-tabList"> - {% for name,submenu in menu %} + {% for name,submenu in adminMenu %} {% if submenu._hasSubmenu %} <li> <span>{{ name|translate }}</span> |