diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
index ba6603de1eb..7e254387b07 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
@@ -41,7 +41,7 @@ public function preDispatch()
protected function _initAction()
{
$this->loadLayout();
- $this->_setActiveMenu('system/services/roles');
+ $this->_setActiveMenu('system/api/roles');
$this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
$this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
$this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
index cf8bf40f45e..a822c710b23 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
@@ -39,7 +39,7 @@ public function preDispatch()
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('system/services/users')
+ ->_setActiveMenu('system/api/users')
->_addBreadcrumb($this->__('Web Services'), $this->__('Web Services'))
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
->_addBreadcrumb($this->__('Users'), $this->__('Users'))
diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
index d9daa9f5315..ae6c8398426 100644
--- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
@@ -155,7 +155,7 @@ public function editAction()
/**
* Set active menu item
*/
- $this->_setActiveMenu('customer/new');
+ $this->_setActiveMenu('customer/manage');
$this->renderLayout();
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php
index f3f4989046d..2a71cc58cea 100644
--- a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php
@@ -26,7 +26,7 @@ public function indexAction()
$this->_title($this->__('System'))->_title($this->__('Notifications'));
$this->loadLayout()
- ->_setActiveMenu('system/notification')
+ ->_setActiveMenu('system/adminnotification')
->_addBreadcrumb(Mage::helper('adminnotification')->__('Messages Inbox'), Mage::helper('adminhtml')->__('Messages Inbox'))
->_addContent($this->getLayout()->createBlock('adminhtml/notification_inbox'))
->renderLayout();
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
index 6632cac2083..8ffb7d3c546 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
@@ -33,7 +33,7 @@ class Mage_Adminhtml_Permissions_BlockController extends Mage_Adminhtml_Controll
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('system/acl')
+ ->_setActiveMenu('system/acl/blocks')
->_addBreadcrumb($this->__('System'), $this->__('System'))
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
->_addBreadcrumb($this->__('Blocks'), $this->__('Blocks'));
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
index 3ca9ccece9e..7c3d53d8ef5 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
@@ -28,7 +28,7 @@ class Mage_Adminhtml_Permissions_OrphanedResourceController extends Mage_Adminht
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('system/acl')
+ ->_setActiveMenu('system/acl/orphaned_resources')
->_addBreadcrumb($this->__('System'), $this->__('System'))
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
->_addBreadcrumb($this->__('Orphaned Resources'), $this->__('Orphaned Role Resources'));
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
index 852e56ec3b8..e8c42b4576e 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
@@ -46,7 +46,7 @@ public function preDispatch()
protected function _initAction()
{
$this->loadLayout();
- $this->_setActiveMenu('system/acl');
+ $this->_setActiveMenu('system/acl/roles');
$this->_addBreadcrumb($this->__('System'), $this->__('System'));
$this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
$this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
index c2fa224a18f..ada91c84683 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
@@ -39,7 +39,7 @@ public function preDispatch()
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('system/acl')
+ ->_setActiveMenu('system/acl/users')
->_addBreadcrumb($this->__('System'), $this->__('System'))
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
->_addBreadcrumb($this->__('Users'), $this->__('Users'))
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
index 76a1465d5c8..f9d8800642a 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
@@ -33,7 +33,7 @@ class Mage_Adminhtml_Permissions_VariableController extends Mage_Adminhtml_Contr
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('system/acl')
+ ->_setActiveMenu('system/acl/variables')
->_addBreadcrumb($this->__('System'), $this->__('System'))
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
->_addBreadcrumb($this->__('Variables'), $this->__('Variables'));
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
index 8453d0d3f5a..79a3d675f4f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
@@ -42,7 +42,7 @@ public function accountsAction()
->_title($this->__('New Accounts'));
$this->_initAction()
- ->_setActiveMenu('report/customer/accounts')
+ ->_setActiveMenu('report/customers/accounts')
->_addBreadcrumb(Mage::helper('adminhtml')->__('New Accounts'), Mage::helper('adminhtml')->__('New Accounts'))
->_addContent($this->getLayout()->createBlock('adminhtml/report_customer_accounts'))
->renderLayout();
@@ -79,7 +79,7 @@ public function ordersAction()
->_title($this->__('Customers by Number of Orders'));
$this->_initAction()
- ->_setActiveMenu('report/customer/orders')
+ ->_setActiveMenu('report/customers/orders')
->_addBreadcrumb(
Mage::helper('reports')->__('Customers by Number of Orders'),
Mage::helper('reports')->__('Customers by Number of Orders')
@@ -119,7 +119,7 @@ public function totalsAction()
->_title($this->__('Customers by Orders Total'));
$this->_initAction()
- ->_setActiveMenu('report/customer/totals')
+ ->_setActiveMenu('report/customers/totals')
->_addBreadcrumb(
Mage::helper('reports')->__('Customers by Orders Total'),
Mage::helper('reports')->__('Customers by Orders Total')
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
index 3c2fc7a952c..daa7cb8dd75 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
@@ -73,7 +73,7 @@ public function soldAction()
->_title($this->__('Products Ordered'));
$this->_initAction()
- ->_setActiveMenu('report/product/sold')
+ ->_setActiveMenu('report/products/sold')
->_addBreadcrumb(Mage::helper('reports')->__('Products Ordered'), Mage::helper('reports')->__('Products Ordered'))
->_addContent($this->getLayout()->createBlock('adminhtml/report_product_sold'))
->renderLayout();
@@ -161,7 +161,7 @@ public function lowstockAction()
->_title($this->__('Low Stock'));
$this->_initAction()
- ->_setActiveMenu('report/product/lowstock')
+ ->_setActiveMenu('report/products/lowstock')
->_addBreadcrumb(Mage::helper('reports')->__('Low Stock'), Mage::helper('reports')->__('Low Stock'))
->_addContent($this->getLayout()->createBlock('adminhtml/report_product_lowstock'))
->renderLayout();
@@ -203,7 +203,7 @@ public function downloadsAction()
->_title($this->__('Downloads'));
$this->_initAction()
- ->_setActiveMenu('report/product/downloads')
+ ->_setActiveMenu('report/products/downloads')
->_addBreadcrumb(Mage::helper('reports')->__('Downloads'), Mage::helper('reports')->__('Downloads'))
->_addContent($this->getLayout()->createBlock('adminhtml/report_product_downloads'))
->renderLayout();
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
index 43dbcd7fdfb..a73ef0963d7 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
@@ -40,7 +40,7 @@ public function salesAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_ORDER_FLAG_CODE, 'sales');
$this->_initAction()
- ->_setActiveMenu('report/sales/sales')
+ ->_setActiveMenu('report/salesroot/sales')
->_addBreadcrumb(Mage::helper('adminhtml')->__('Sales Report'), Mage::helper('adminhtml')->__('Sales Report'));
$gridBlock = $this->getLayout()->getBlock('report_sales_sales.grid');
@@ -159,7 +159,7 @@ public function taxAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_TAX_FLAG_CODE, 'tax');
$this->_initAction()
- ->_setActiveMenu('report/sales/tax')
+ ->_setActiveMenu('report/salesroot/tax')
->_addBreadcrumb(Mage::helper('adminhtml')->__('Tax'), Mage::helper('adminhtml')->__('Tax'));
$gridBlock = $this->getLayout()->getBlock('report_sales_tax.grid');
@@ -202,7 +202,7 @@ public function shippingAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_SHIPPING_FLAG_CODE, 'shipping');
$this->_initAction()
- ->_setActiveMenu('report/sales/shipping')
+ ->_setActiveMenu('report/salesroot/shipping')
->_addBreadcrumb(Mage::helper('adminhtml')->__('Shipping'), Mage::helper('adminhtml')->__('Shipping'));
$gridBlock = $this->getLayout()->getBlock('report_sales_shipping.grid');
@@ -245,7 +245,7 @@ public function invoicedAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_INVOICE_FLAG_CODE, 'invoiced');
$this->_initAction()
- ->_setActiveMenu('report/sales/invoiced')
+ ->_setActiveMenu('report/salesroot/invoiced')
->_addBreadcrumb(Mage::helper('adminhtml')->__('Total Invoiced'), Mage::helper('adminhtml')->__('Total Invoiced'));
$gridBlock = $this->getLayout()->getBlock('report_sales_invoiced.grid');
@@ -288,7 +288,7 @@ public function refundedAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_REFUNDED_FLAG_CODE, 'refunded');
$this->_initAction()
- ->_setActiveMenu('report/sales/refunded')
+ ->_setActiveMenu('report/salesroot/refunded')
->_addBreadcrumb(Mage::helper('adminhtml')->__('Total Refunded'), Mage::helper('adminhtml')->__('Total Refunded'));
$gridBlock = $this->getLayout()->getBlock('report_sales_refunded.grid');
@@ -331,7 +331,7 @@ public function couponsAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_COUPONS_FLAG_CODE, 'coupons');
$this->_initAction()
- ->_setActiveMenu('report/sales/coupons')
+ ->_setActiveMenu('report/salesroot/coupons')
->_addBreadcrumb(Mage::helper('adminhtml')->__('Coupons'), Mage::helper('adminhtml')->__('Coupons'));
$gridBlock = $this->getLayout()->getBlock('report_sales_coupons.grid');
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
index 8802e21b804..71c02bd943c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
@@ -57,7 +57,7 @@ protected function _initStatus()
public function indexAction()
{
$this->_title($this->__('Sales'))->_title($this->__('Order Statuses'));
- $this->loadLayout()->_setActiveMenu('system')->renderLayout();
+ $this->loadLayout()->_setActiveMenu('system/order_statuses')->renderLayout();
}
/**
@@ -73,6 +73,7 @@ public function newAction()
}
$this->_title($this->__('Sales'))->_title($this->__('Create New Order Status'));
$this->loadLayout()
+ ->_setActiveMenu('system/order_statuses')
->renderLayout();
}
@@ -86,6 +87,7 @@ public function editAction()
Mage::register('current_status', $status);
$this->_title($this->__('Sales'))->_title($this->__('Edit Order Status'));
$this->loadLayout()
+ ->_setActiveMenu('system/order_statuses')
->renderLayout();
} else {
$this->_getSession()->addError(
@@ -161,6 +163,7 @@ public function assignAction()
{
$this->_title($this->__('Sales'))->_title($this->__('Assign Order Status to State'));
$this->loadLayout()
+ ->_setActiveMenu('system/order_statuses')
->renderLayout();
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
index ff918684433..5f94f81875a 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
@@ -32,7 +32,7 @@ public function indexAction()
$this->_title($this->__('System'))->_title($this->__('My Account'));
$this->loadLayout();
- $this->_setActiveMenu('system/account');
+ $this->_setActiveMenu('system/myaccount');
$this->_addContent($this->getLayout()->createBlock('adminhtml/system_account_edit'));
$this->renderLayout();
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
index 21a0610665b..1d64fd8818d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
@@ -47,7 +47,7 @@ public function indexAction()
/**
* Set active menu item
*/
- $this->_setActiveMenu('system/convert');
+ $this->_setActiveMenu('system/convert/gui');
/**
* Append profiles block to content
@@ -89,7 +89,7 @@ public function editAction()
$this->_title($profile->getId() ? $profile->getName() : $this->__('New Profile'));
- $this->_setActiveMenu('system/convert');
+ $this->_setActiveMenu('system/convert/gui');
$this->_addContent(
$this->getLayout()->createBlock('adminhtml/system_convert_gui_edit')
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
index a2af8665a01..9a3c12bdfc4 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
@@ -71,7 +71,7 @@ public function indexAction()
/**
* Set active menu item
*/
- $this->_setActiveMenu('system/convert');
+ $this->_setActiveMenu('system/convert/profiles');
/**
* Append profiles block to content
@@ -121,7 +121,7 @@ public function editAction()
$this->_title($profile->getId() ? $profile->getName() : $this->__('New Profile'));
- $this->_setActiveMenu('system/convert');
+ $this->_setActiveMenu('system/convert/profiles');
$this->_addContent(
$this->getLayout()->createBlock('adminhtml/system_convert_profile_edit')
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
index 2a042a75a5b..9b1e7beca0e 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
@@ -50,7 +50,7 @@ public function indexAction()
$this->_title($this->__('System'))->_title($this->__('Manage Currency Rates'));
$this->loadLayout();
- $this->_setActiveMenu('system/currency');
+ $this->_setActiveMenu('system/currency/rates');
$this->_addContent($this->getLayout()->createBlock('adminhtml/system_currency'));
$this->renderLayout();
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php
index 50eb483e9fe..5e38ff397d0 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php
@@ -41,7 +41,7 @@ public function indexAction()
$this->_title($this->__('System'))->_title($this->__('Design'));
$this->loadLayout();
- $this->_setActiveMenu('system');
+ $this->_setActiveMenu('system/design');
$this->_addContent($this->getLayout()->createBlock('adminhtml/system_design'));
$this->renderLayout();
}
@@ -61,7 +61,7 @@ public function editAction()
$this->_title($this->__('System'))->_title($this->__('Design'));
$this->loadLayout();
- $this->_setActiveMenu('system');
+ $this->_setActiveMenu('system/design');
$this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
$id = (int) $this->getRequest()->getParam('id');
diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php
index 625c2e5f228..11f8b6ace35 100644
--- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php
+++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php
@@ -47,7 +47,7 @@ public function indexAction()
->_title($this->__('Web Services'))
->_title($this->__('REST Attributes'));
- $this->loadLayout()->_setActiveMenu('system/services/attributes');
+ $this->loadLayout()->_setActiveMenu('system/api/rest_attributes');
$this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'))
->_addBreadcrumb($this->__('REST Attributes'), $this->__('REST Attributes'))
@@ -62,7 +62,7 @@ public function indexAction()
public function editAction()
{
$this->loadLayout()
- ->_setActiveMenu('system/services/attributes');
+ ->_setActiveMenu('system/api/rest_attributes');
$type = $this->getRequest()->getParam('type');
diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php
index 5fe7b2d4356..4b33cca7072 100644
--- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php
+++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php
@@ -41,7 +41,7 @@ public function indexAction()
->_title($this->__('Web Services'))
->_title($this->__('REST Roles'));
- $this->loadLayout()->_setActiveMenu('system/services/roles');
+ $this->loadLayout()->_setActiveMenu('system/api/rest_roles');
$this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
$this->_addBreadcrumb($this->__('REST Roles'), $this->__('REST Roles'));
$this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
@@ -82,7 +82,7 @@ public function newAction()
->_title($this->__('Web Services'))
->_title($this->__('Rest Roles'));
- $this->loadLayout()->_setActiveMenu('system/services/roles');
+ $this->loadLayout()->_setActiveMenu('system/api/rest_roles');
$this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
$this->_addBreadcrumb($this->__('REST Roles'), $this->__('REST Roles'));
$this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
diff --git a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php
index 08121796702..f397dc5ceed 100644
--- a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php
+++ b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php
@@ -34,7 +34,7 @@ public function indexAction()
{
// set active menu and breadcrumbs
$this->loadLayout()
- ->_setActiveMenu('system/currency')
+ ->_setActiveMenu('system/currency/symbols')
->_addBreadcrumb(
Mage::helper('currencysymbol')->__('System'),
Mage::helper('currencysymbol')->__('System')
diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php
index 43288f8c1b5..438497e8440 100644
--- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php
+++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php
@@ -45,7 +45,7 @@ protected function _initAction()
{
$this->_title($this->__('Import/Export'))
->loadLayout()
- ->_setActiveMenu('system/importexport');
+ ->_setActiveMenu('system/convert/export');
return $this;
}
diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php
index 880bcb549e6..3575a00b47b 100644
--- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php
+++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php
@@ -45,7 +45,7 @@ protected function _initAction()
{
$this->_title($this->__('Import/Export'))
->loadLayout()
- ->_setActiveMenu('system/importexport');
+ ->_setActiveMenu('system/convert/import');
return $this;
}
diff --git a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php
index f93f1e39dc7..bc96028993a 100644
--- a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php
+++ b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php
@@ -71,6 +71,7 @@ public function editAction()
Mage::register('current_index_process', $process);
$this->loadLayout();
+ $this->_setActiveMenu('system/index');
$this->renderLayout();
} else {
$this->_getSession()->addError(
diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php
index 7fddc2e9d84..fb37e09189e 100644
--- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php
+++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php
@@ -43,6 +43,7 @@ public function preDispatch()
public function indexAction()
{
$this->loadLayout();
+ $this->_setActiveMenu('system/api/oauth_admin_token');
$this->renderLayout();
}
diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php
index e0457c2392b..bc9ddd14893 100644
--- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php
+++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php
@@ -40,7 +40,8 @@ public function preDispatch()
*/
public function indexAction()
{
- $this->loadLayout()->_setActiveMenu('system/oauth');
+ $this->loadLayout();
+ $this->_setActiveMenu('system/api/oauth_authorized_tokens');
$this->renderLayout();
}
diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php
index fd49a6f26bc..0cb65932db4 100644
--- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php
+++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php
@@ -58,6 +58,7 @@ public function preDispatch()
public function indexAction()
{
$this->loadLayout();
+ $this->_setActiveMenu('system/api/oauth_consumer');
$this->renderLayout();
}
@@ -93,6 +94,7 @@ public function newAction()
Mage::register('current_consumer', $model);
$this->loadLayout();
+ $this->_setActiveMenu('system/api/oauth_consumer');
$this->renderLayout();
}
@@ -123,6 +125,7 @@ public function editAction()
Mage::register('current_consumer', $model);
$this->loadLayout();
+ $this->_setActiveMenu('system/api/oauth_consumer');
$this->renderLayout();
}
diff --git a/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php
index 4f11ff29f50..0bcb2c4d134 100644
--- a/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php
+++ b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php
@@ -101,7 +101,7 @@ protected function _initAction()
{
$this->_title($this->__('Reports'))->_title($this->__('Sales'))->_title($this->__('PayPal Settlement Reports'));
$this->loadLayout()
- ->_setActiveMenu('report/sales')
+ ->_setActiveMenu('report/salesroot/paypal_settlement_reports')
->_addBreadcrumb(Mage::helper('paypal')->__('Reports'), Mage::helper('paypal')->__('Reports'))
->_addBreadcrumb(Mage::helper('paypal')->__('Sales'), Mage::helper('paypal')->__('Sales'))
->_addBreadcrumb(Mage::helper('paypal')->__('PayPal Settlement Reports'), Mage::helper('paypal')->__('PayPal Settlement Reports'));
diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
index 58a93a3a6f0..09e5defd4d1 100644
--- a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
+++ b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
@@ -45,7 +45,7 @@ protected function _getSession()
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('cms/widgets')
+ ->_setActiveMenu('cms/widget_instance')
->_addBreadcrumb(
Mage::helper('widget')->__('CMS'),
Mage::helper('widget')->__('CMS')