Commit e562ca4d authored by alexpott's avatar alexpott

Issue #2085243 by dawehner: Rename Menu module into Menu UI module.

parent 62ba47d2
......@@ -422,8 +422,8 @@ function menu_secondary_menu() {
* Returns menu name, if exist
*/
function _menu_get_links_source($name, $default) {
$config = \Drupal::config('menu.settings');
return \Drupal::moduleHandler()->moduleExists('menu') ? $config->get($name) : $default;
$config = \Drupal::config('menu_ui.settings');
return \Drupal::moduleHandler()->moduleExists('menu_ui') ? $config->get($name) : $default;
}
/**
......
......@@ -21,7 +21,7 @@ class BlockLanguageCacheTest extends WebTestBase {
*
* @var array
*/
public static $modules = array('block', 'language', 'menu');
public static $modules = array('block', 'language', 'menu_ui');
/**
* List of langcodes.
......
......@@ -30,7 +30,7 @@ class ConfigTranslationListUiTest extends WebTestBase {
'custom_block',
'field',
'field_ui',
'menu',
'menu_ui',
'node',
'shortcut',
'taxonomy',
......
......@@ -20,7 +20,7 @@ class ForumTest extends WebTestBase {
*
* @var array
*/
public static $modules = array('taxonomy', 'comment', 'forum', 'node', 'block', 'menu', 'help');
public static $modules = array('taxonomy', 'comment', 'forum', 'node', 'block', 'menu_ui', 'help');
/**
* A user with various administrative privileges.
......
menu.menu_edit:
title: 'Edit menu'
route_name: menu.menu_edit
base_route: menu.menu_edit
menu.overview_page:
title: 'List'
route_name: menu.overview_page
base_route: menu.overview_page
menu.settings:
title: 'Settings'
route_name: menu.settings
base_route: menu.overview_page
weight: 100
......@@ -111,7 +111,7 @@ class MenuLink extends Entity implements \ArrayAccess, MenuLinkInterface {
*
* @var string
*/
public $module = 'menu';
public $module = 'menu_ui';
/**
* A flag for whether the link should be rendered in menus.
......
......@@ -31,7 +31,7 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, A
case 'delete':
// Only items created by the menu module can be deleted.
return $entity->module == 'menu' || $entity->updated == 1;
return $entity->module == 'menu_ui' || $entity->updated == 1;
}
}
......
......@@ -98,7 +98,7 @@ public function form(array $form, array &$form_state) {
if (isset($menu_link->options['fragment'])) {
$path .= '#' . $menu_link->options['fragment'];
}
if ($menu_link->module == 'menu') {
if ($menu_link->module == 'menu_ui') {
$form['link_path'] = array(
'#type' => 'textfield',
'#title' => t('Path'),
......@@ -137,7 +137,7 @@ public function form(array $form, array &$form_state) {
);
// Generate a list of possible parents (not including this link or descendants).
$options = menu_parent_options(menu_get_menus(), $menu_link);
$options = menu_ui_parent_options(menu_ui_get_menus(), $menu_link);
$default = $menu_link->menu_name . ':' . $menu_link->plid;
if (!isset($options[$default])) {
$default = 'tools:0';
......@@ -298,7 +298,7 @@ public function save(array $form, array &$form_state) {
if ($saved) {
drupal_set_message(t('The menu link has been saved.'));
$form_state['redirect_route'] = array(
'route_name' => 'menu.menu_edit',
'route_name' => 'menu_ui.menu_edit',
'route_parameters' => array(
'menu' => $menu_link->menu_name,
),
......
......@@ -15,7 +15,7 @@ function menu_link_help($path, $arg) {
case 'admin/help#menu_link':
$output = '';
$output .= '<h3>' . t('About') . '</h3>';
$output .= '<p>' . t('The Menu Link module allows users to create menu links. It is required by the Menu module, which provides an interface for managing menus. See the <a href="!menu-help">Menu module help page</a> for more information.', array('!menu-help' => \Drupal::url('help.page', array('name' => 'menu')))) . '</p>';
$output .= '<p>' . t('The Menu Link module allows users to create menu links. It is required by the Menu module, which provides an interface for managing menus. See the <a href="!menu-help">Menu module help page</a> for more information.', array('!menu-help' => \Drupal::url('help.page', array('name' => 'menu_ui')))) . '</p>';
return $output;
}
}
......@@ -203,12 +203,12 @@ function menu_link_maintain($module, $op, $link_path, $link_title = NULL) {
function menu_link_system_breadcrumb_alter(array &$breadcrumb, array $attributes, array $context) {
// Custom breadcrumb behavior for editing menu links, we append a link to
// the menu in which the link is found.
if (!empty($attributes[RouteObjectInterface::ROUTE_NAME]) && $attributes[RouteObjectInterface::ROUTE_NAME] == 'menu.link_edit' && !empty($attributes['menu_link'])) {
if (!empty($attributes[RouteObjectInterface::ROUTE_NAME]) && $attributes[RouteObjectInterface::ROUTE_NAME] == 'menu_ui.link_edit' && !empty($attributes['menu_link'])) {
$menu_link = $attributes['menu_link'];
if (($menu_link instanceof MenuLinkInterface) && !$menu_link->isNew()) {
// Add a link to the menu admin screen.
$menu = entity_load('menu', $menu_link->menu_name);
$breadcrumb[] = Drupal::l($menu->label(), 'menu.menu_edit', array('menu' => $menu->id));
$breadcrumb[] = Drupal::l($menu->label(), 'menu_ui.menu_edit', array('menu' => $menu->id));
}
}
}
# Schema for configuration files of the Menu module.
menu.settings:
menu_ui.settings:
type: mapping
label: 'Menu settings'
mapping:
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\menu\Controller\MenuController.
* Contains \Drupal\menu_ui\Controller\MenuController.
*/
namespace Drupal\menu\Controller;
namespace Drupal\menu_ui\Controller;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Controller\ControllerBase;
......@@ -34,7 +34,7 @@ public function getParentOptions(Request $request) {
$available_menus[$menu] = $menu;
}
}
$options = _menu_get_options(menu_get_menus(), $available_menus, array('mlid' => 0));
$options = _menu_ui_get_options(menu_ui_get_menus(), $available_menus, array('mlid' => 0));
return new JsonResponse($options);
}
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\menu\Form\MenuDeleteForm.
* Contains \Drupal\menu_ui\Form\MenuDeleteForm.
*/
namespace Drupal\menu\Form;
namespace Drupal\menu_ui\Form;
use Drupal\Core\Database\Connection;
use Drupal\Core\Entity\EntityConfirmFormBase;
......@@ -66,7 +66,7 @@ public function getQuestion() {
*/
public function getCancelRoute() {
return array(
'route_name' => 'menu.menu_edit',
'route_name' => 'menu_ui.menu_edit',
'route_parameters' => array(
'menu' => $this->entity->id(),
),
......@@ -97,7 +97,7 @@ public function getConfirmText() {
* {@inheritdoc}
*/
public function submit(array $form, array &$form_state) {
$form_state['redirect_route']['route_name'] = 'menu.overview_page';
$form_state['redirect_route']['route_name'] = 'menu_ui.overview_page';
// Locked menus may not be deleted.
if ($this->entity->isLocked()) {
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\menu\Form\MenuLinkDeleteForm.
* Contains \Drupal\menu_ui\Form\MenuLinkDeleteForm.
*/
namespace Drupal\menu\Form;
namespace Drupal\menu_ui\Form;
use Drupal\Core\Entity\EntityConfirmFormBase;
......@@ -26,7 +26,7 @@ public function getQuestion() {
*/
public function getCancelRoute() {
return array(
'route_name' => 'menu.menu_edit',
'route_name' => 'menu_ui.menu_edit',
'route_parameters' => array(
'menu' => $this->entity->menu_name,
),
......@@ -42,7 +42,7 @@ public function submit(array $form, array &$form_state) {
drupal_set_message(t('The menu link %title has been deleted.', $t_args));
watchdog('menu', 'Deleted menu link %title.', $t_args, WATCHDOG_NOTICE);
$form_state['redirect_route'] = array(
'route_name' => 'menu.menu_edit',
'route_name' => 'menu_ui.menu_edit',
'route_parameters' => array(
'menu' => $this->entity->menu_name,
),
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\menu\Form\MenuLinkResetForm.
* Contains \Drupal\menu_ui\Form\MenuLinkResetForm.
*/
namespace Drupal\menu\Form;
namespace Drupal\menu_ui\Form;
use Drupal\Core\Entity\EntityConfirmFormBase;
......@@ -26,7 +26,7 @@ public function getQuestion() {
*/
public function getCancelRoute() {
return array(
'route_name' => 'menu.menu_edit',
'route_name' => 'menu_ui.menu_edit',
'route_parameters' => array(
'menu' => $this->entity->menu_name,
),
......@@ -54,7 +54,7 @@ public function submit(array $form, array &$form_state) {
$new_menu_link = $this->entity->reset();
drupal_set_message(t('The menu link was reset to its default settings.'));
$form_state['redirect_route'] = array(
'route_name' => 'menu.menu_edit',
'route_name' => 'menu_ui.menu_edit',
'route_parameters' => array(
'menu' => $new_menu_link->menu_name,
),
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\menu\MenuFormController.
* Contains \Drupal\menu_ui\MenuFormController.
*/
namespace Drupal\menu;
namespace Drupal\menu_ui;
use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Entity\EntityFormController;
......@@ -240,7 +240,7 @@ public function save(array $form, array &$form_state) {
*
* This form constructor can be integrated as a section into another form. It
* relies on the following keys in $form_state:
* - menu: A loaded menu definition, as returned by menu_load().
* - menu: A loaded menu definition, as returned by menu_ui_load().
* - menu_overview_form_parents: An array containing the parent keys to this
* form.
* Forms integrating this section should call menu_overview_form_submit() from
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\menu\MenuListBuilder.
* Contains \Drupal\menu_ui\MenuListBuilder.
*/
namespace Drupal\menu;
namespace Drupal\menu_ui;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\menu\MenuSettingsForm.
* Contains \Drupal\menu_ui\MenuSettingsForm.
*/
namespace Drupal\menu;
namespace Drupal\menu_ui;
use Drupal\Core\Form\ConfigFormBase;
......@@ -25,13 +25,13 @@ public function getFormId() {
* Implements \Drupal\Core\Form\FormInterface::buildForm().
*/
public function buildForm(array $form, array &$form_state) {
$config = $this->configFactory->get('menu.settings');
$config = $this->configFactory->get('menu_ui.settings');
$form['intro'] = array(
'#type' => 'item',
'#markup' => t('The menu module allows on-the-fly creation of menu links in the content authoring forms. To configure these settings for a particular content type, visit the <a href="@content-types">Content types</a> page, click the <em>edit</em> link for the content type, and go to the <em>Menu settings</em> section.', array('@content-types' => url('admin/structure/types'))),
);
$menu_options = menu_get_menus();
$menu_options = menu_ui_get_menus();
$main = $config->get('main_links');
$form['menu_main_links_source'] = array(
......@@ -61,7 +61,7 @@ public function buildForm(array $form, array &$form_state) {
* Implements \Drupal\Core\Form\FormInterface::submitForm().
*/
public function submitForm(array &$form, array &$form_state) {
$this->configFactory->get('menu.settings')
$this->configFactory->get('menu_ui.settings')
->set('main_links', $form_state['values']['menu_main_links_source'])
->set('secondary_links', $form_state['values']['menu_secondary_links_source'])
->save();
......
......@@ -5,7 +5,7 @@
* Contains \Drupal\menu\Tests\MenuCacheTagsTest.
*/
namespace Drupal\menu\Tests;
namespace Drupal\menu_ui\Tests;
use Drupal\system\Tests\Cache\PageCacheTagsTestBase;
......@@ -17,7 +17,7 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
/**
* {@inheritdoc}
*/
public static $modules = array('menu', 'block', 'test_page_test');
public static $modules = array('menu_ui', 'block', 'test_page_test');
/**
* {@inheritdoc}
......
......@@ -2,10 +2,10 @@
/**
* @file
* Tests for menu language settings.
* Tests for menu_ui language settings.
*/
namespace Drupal\menu\Tests;
namespace Drupal\menu_ui\Tests;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Language\Language;
......@@ -174,7 +174,7 @@ function testMenuLanguageRemovedEnglish() {
$this->drupalPostForm('admin/structure/menu/add', $edit, t('Save'));
// Check that the language settings were saved.
$menu = menu_load($menu_name);
$menu = menu_ui_load($menu_name);
$this->assertEqual($menu->langcode, 'en');
// Remove English language. To do that another language has to be set as
......@@ -186,7 +186,7 @@ function testMenuLanguageRemovedEnglish() {
// Save the menu again and check if the language is still the same.
$this->drupalPostForm("admin/structure/menu/manage/$menu_name", array(), t('Save'));
$menu = menu_load($menu_name);
$menu = menu_ui_load($menu_name);
$this->assertEqual($menu->langcode, 'en');
}
......
......@@ -2,10 +2,10 @@
/**
* @file
* Definition of Drupal\menu\Tests\MenuNodeTest.
* Definition of Drupal\menu_ui\Tests\MenuNodeTest.
*/
namespace Drupal\menu\Tests;
namespace Drupal\menu_ui\Tests;
use Drupal\simpletest\WebTestBase;
......@@ -19,7 +19,7 @@ class MenuNodeTest extends WebTestBase {
*
* @var array
*/
public static $modules = array('menu', 'test_page_test', 'node');
public static $modules = array('menu_ui', 'test_page_test', 'node');
public static function getInfo() {
return array(
......
......@@ -2,10 +2,10 @@
/**
* @file
* Definition of Drupal\menu\Tests\MenuTest.
* Definition of Drupal\menu_ui\Tests\MenuTest.
*/
namespace Drupal\menu\Tests;
namespace Drupal\menu_ui\Tests;
use Drupal\Component\Utility\Json;
......@@ -199,7 +199,7 @@ function addCustomMenu() {
// Enable the block.
$this->drupalPlaceBlock('system_menu_block:' . $menu_name);
return menu_load($menu_name);
return menu_ui_load($menu_name);
}
/**
......@@ -216,7 +216,7 @@ function deleteCustomMenu() {
$this->drupalPostForm("admin/structure/menu/manage/$menu_name/delete", array(), t('Delete'));
$this->assertResponse(200);
$this->assertRaw(t('The custom menu %title has been deleted.', array('%title' => $label)), 'Custom menu was deleted');
$this->assertFalse(menu_load($menu_name), 'Custom menu was deleted');
$this->assertFalse(menu_ui_load($menu_name), 'Custom menu was deleted');
// Test if all menu links associated to the menu were removed from database.
$result = entity_load_multiple_by_properties('menu_link', array('menu_name' => $menu_name));
$this->assertFalse($result, 'All menu links associated to the custom menu were deleted.');
......@@ -477,7 +477,7 @@ public function testBlockContextualLinks() {
$response = $this->drupalPost('contextual/render', 'application/json', $post, array('query' => array('destination' => 'test-page')));
$this->assertResponse(200);
$json = Json::decode($response);
$this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="block-configure"><a href="' . base_path() . 'admin/structure/block/manage/' . $block->id() . '">Configure block</a></li><li class="menu-edit"><a href="' . base_path() . 'admin/structure/menu/manage/tools">Edit menu</a></li></ul>');
$this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="block-configure"><a href="' . base_path() . 'admin/structure/block/manage/' . $block->id() . '">Configure block</a></li><li class="menu-ui-edit"><a href="' . base_path() . 'admin/structure/menu/manage/tools">Edit menu</a></li></ul>');
}
/**
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\menu\Tests\MenuUninstallTest.
* Contains \Drupal\menu_ui\Tests\MenuUninstallTest.
*/
namespace Drupal\menu\Tests;
namespace Drupal\menu_ui\Tests;
use Drupal\simpletest\WebTestBase;
......@@ -19,7 +19,7 @@ class MenuUninstallTest extends WebTestBase {
*
* @var array
*/
public static $modules = array('menu');
public static $modules = array('menu_ui');
public static function getInfo() {
return array(
......@@ -33,7 +33,7 @@ public static function getInfo() {
* Tests Menu uninstall.
*/
public function testMenuUninstall() {
\Drupal::moduleHandler()->uninstall(array('menu'));
\Drupal::moduleHandler()->uninstall(array('menu_ui'));
$this->assertTrue(entity_load('menu', 'admin', TRUE), 'The \'admin\' menu still exists after uninstalling menu module.');
}
......
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\menu\Tests\MenuWebTestBase.
* Contains \Drupal\menu_ui\Tests\MenuWebTestBase.
*/
namespace Drupal\menu\Tests;
namespace Drupal\menu_ui\Tests;
use Drupal\simpletest\WebTestBase;
......@@ -19,7 +19,7 @@ class MenuWebTestBase extends WebTestBase {
*
* @var array
*/
public static $modules = array('menu');
public static $modules = array('menu_ui');
/**
* Fetchs the menu item from the database and compares it to expected item.
......
......@@ -2,16 +2,16 @@
"use strict";
Drupal.behaviors.menuChangeParentItems = {
Drupal.behaviors.menuUiChangeParentItems = {
attach: function (context, settings) {
var $menu = $('#edit-menu');
$menu.once('menu-parent', function () {
// Update the list of available parent menu items to match the initial
// available menus.
Drupal.menuUpdateParentList();
Drupal.menuUiUpdateParentList();
// Update list of available parent menu items.
$menu.on('change', 'input', Drupal.menuUpdateParentList);
$menu.on('change', 'input', Drupal.menuUiUpdateParentList);
});
}
};
......@@ -19,7 +19,7 @@
/**
* Function to set the options of the menu parent item dropdown.
*/
Drupal.menuUpdateParentList = function () {
Drupal.menuUiUpdateParentList = function () {
var $menu = $('#edit-menu');
var values = [];
......
menu_edit:
menu_ui_edit:
title: 'Edit menu'
route_name: 'menu.menu_edit'
route_name: 'menu_ui.menu_edit'
group: menu
name: Menu
name: Menu Ui
type: module
description: 'Allows administrators to customize the site navigation menu.'
package: Core
version: VERSION
core: 8.x
configure: menu.overview_page
configure: menu_ui.overview_page
dependencies:
- menu_link
......@@ -2,7 +2,7 @@
/**
* @file
* Install, update and uninstall functions for the menu module.
* Install, update and uninstall functions for the menu_ui module.
*/
use Drupal\Component\Uuid\Uuid;
......@@ -10,7 +10,7 @@
/**
* Implements hook_install().
*/
function menu_install() {
function menu_ui_install() {
// Rebuild all the menu data.
// @todo - remove this when we understand why removing it breaks the
// standard install profile, possibly need to be handled in
......@@ -31,6 +31,6 @@ function menu_install() {
/**
* Implements hook_uninstall().
*/
function menu_uninstall() {
function menu_ui_uninstall() {
\Drupal::service('router.builder')->setRebuildNeeded();
}
......@@ -2,7 +2,7 @@
"use strict";
Drupal.behaviors.menuDetailsSummaries = {
Drupal.behaviors.menuUiDetailsSummaries = {
attach: function (context) {
$(context).find('.menu-link-form').drupalSetSummary(function (context) {
var $context = $(context);
......@@ -19,7 +19,7 @@
/**
* Automatically fill in a menu link title, if possible.
*/
Drupal.behaviors.menuLinkAutomaticTitle = {
Drupal.behaviors.menuUiLinkAutomaticTitle = {
attach: function (context) {
var $context = $(context);
$context.find('.menu-link-form').each(function () {
......
drupal.menu:
drupal.menu_ui:
version: VERSION
js:
menu.js: {}
menu_ui.js: {}
dependencies:
- core/jquery
- core/drupal
- core/drupal.form
drupal.menu.admin:
drupal.menu_ui.admin:
version: VERSION
js:
menu.admin.js: {}
menu_ui.admin.js: {}
dependencies:
- core/jquery
- core/drupal
menu_link_add:
route_name: menu.link_add
menu_ui_link_add:
route_name: menu_ui.link_add
title: 'Add link'
appears_on:
- menu.menu_edit
- menu_ui.menu_edit
menu.menu_add:
route_name: menu.menu_add
menu_ui.menu_add:
route_name: menu_ui.menu_add
title: 'Add menu'
appears_on:
- menu.overview_page
- menu_ui.overview_page
menu_ui.menu_edit:
title: 'Edit menu'
route_name: menu_ui.menu_edit
base_route: menu_ui.menu_edit
menu_ui.overview_page:
title: 'List'
route_name: menu_ui.overview_page
base_route: menu_ui.overview_page
menu_ui.settings:
title: 'Settings'
route_name: menu_ui.settings
base_route: menu_ui.overview_page
weight: 100
menu.overview_page:
menu_ui.overview_page:
title: Menus
description: 'Add new menus to your site, edit existing menus, and rename and reorganize menu links.'
route_name: menu.overview_page
route_name: menu_ui.overview_page
parent: system.admin_structure
......@@ -30,16 +30,16 @@
/**
* Implements hook_help().
*/
function menu_help($path, $arg) {
function menu_ui_help($path, $arg) {
switch ($path) {
case 'admin/help#menu':
case 'admin/help#menu_ui':
$output = '';
$output .= '<h3>' . t('About') . '</h3>';
$output .= '<p>' . t('The Menu module provides an interface for managing menus. A menu is a hierarchical collection of links, which can be within or external to the site, generally used for navigation. For more information, see the <a href="!menu">online documentation for the Menu module</a>.', array('!menu' => 'https://drupal.org/documentation/modules/menu/')) . '</p>';
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>';
$output .= '<dt>' . t('Managing menus') . '</dt>';
$output .= '<dd>' . t('Users with the <em>Administer menus and menu items</em> permission can add, edit, and delete custom menus on the <a href="!menu">Menus page</a>. Custom menus can be special site menus, menus of external links, or any combination of internal and external links. You may create an unlimited number of additional menus, each of which will automatically have an associated block (if you have the <a href="!block_help">Block module</a> installed). By selecting <em>Edit menu</em>, you can add, edit, or delete links for a given menu. The links listing page provides a drag-and-drop interface for controlling the order of links, and creating a hierarchy within the menu.', array('!block_help' => \Drupal::url('help.page', array('name' => 'block')), '!menu' => \Drupal::url('menu.overview_page'))) . '</dd>';
$output .= '<dd>' . t('Users with the <em>Administer menus and menu items</em> permission can add, edit, and delete custom menus on the <a href="!menu">Menus page</a>. Custom menus can be special site menus, menus of external links, or any combination of internal and external links. You may create an unlimited number of additional menus, each of which will automatically have an associated block (if you have the <a href="!block_help">Block module</a> installed). By selecting <em>Edit menu</em>, you can add, edit, or delete links for a given menu. The links listing page provides a drag-and-drop interface for controlling the order of links, and creating a hierarchy within the menu.', array('!block_help' => \Drupal::url('help.page', array('name' => 'block')), '!menu' => \Drupal::url('menu_ui.overview_page'))) . '</dd>';
$output .= '<dt>' . t('Displaying menus') . '</dt>';
$output .= '<dd>' . t('If you have the Block module enabled, then each menu that you create is rendered in a block that you enable and position on the <a href="!blocks">Block layout page</a>. In some <a href="!themes">themes</a>, the main menu and possibly the secondary menu will be output automatically; you may be able to disable this behavior on the <a href="!themes">theme\'s settings page</a>.', array('!blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', '!themes' => \Drupal::url('system.themes_page'), '!theme_settings' => \Drupal::url('system.theme_settings'))) . '</dd>';
$output .= '</dl>';
......@@ -56,7 +56,7 @@ function menu_help($path, $arg) {
/**
* Implements hook_permission().
*/
function menu_permission() {
function menu_ui_permission() {
return array(
'administer menu' => array(
'title' => t('Administer menus and menu items'),
......@@ -67,27 +67,27 @@ function menu_permission() {
/**
* Implements hook_entity_type_build().
*/
function menu_entity_type_build(array &$entity_types) {
function menu_ui_entity_type_build(array &$entity_types) {
/** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
$entity_types['menu']
->setFormClass('add', 'Drupal\menu\MenuFormController')
->setFormClass('edit', 'Drupal\menu\MenuFormController')
->setFormClass('delete', 'Drupal\menu\Form\MenuDeleteForm')
->setListBuilderClass('Drupal\menu\MenuListBuilder')
->setLinkTemplate('add-form', 'menu.link_add')
->setLinkTemplate('delete-form', 'menu.delete_menu')
->setLinkTemplate('edit-form', 'menu.menu_edit');
->setFormClass('add', 'Drupal\menu_ui\MenuFormController')
->setFormClass('edit',