' . t('You can enable the newly-created block for this menu on the Block layout page.', array('!blocks' => \Drupal::url('block.admin_display'))) . '
'; } elseif ($route_name == 'menu_ui.overview_page' && \Drupal::moduleHandler()->moduleExists('block')) { @@ -74,10 +74,10 @@ function menu_ui_entity_type_build(array &$entity_types) { ->setFormClass('edit', 'Drupal\menu_ui\MenuForm') ->setFormClass('delete', 'Drupal\menu_ui\Form\MenuDeleteForm') ->setListBuilderClass('Drupal\menu_ui\MenuListBuilder') - ->setLinkTemplate('add-form', 'menu_ui.menu_add') - ->setLinkTemplate('delete-form', 'menu_ui.delete_menu') - ->setLinkTemplate('edit-form', 'menu_ui.menu_edit') - ->setLinkTemplate('add-link-form', 'menu_link_content.link_add'); + ->setLinkTemplate('add-form', 'entity.menu.add_form') + ->setLinkTemplate('delete-form', 'entity.menu.delete_form') + ->setLinkTemplate('edit-form', 'entity.menu.edit_form') + ->setLinkTemplate('add-link-form', 'entity.menu_link_content.add_form'); } @@ -567,7 +567,7 @@ function menu_ui_system_breadcrumb_alter(array &$breadcrumb, RouteMatchInterface if (($menu_link instanceof MenuLinkInterface)) { // Add a link to the menu admin screen. $menu = Menu::load($menu_link->getMenuName()); - $breadcrumb[] = Link::createFromRoute($menu->label(), 'menu_ui.menu_edit', array('menu' => $menu->id())); + $breadcrumb[] = Link::createFromRoute($menu->label(), 'entity.menu.edit_form', array('menu' => $menu->id())); } } } diff --git a/core/modules/menu_ui/menu_ui.routing.yml b/core/modules/menu_ui/menu_ui.routing.yml index b095c34..1b431e9 100644 --- a/core/modules/menu_ui/menu_ui.routing.yml +++ b/core/modules/menu_ui/menu_ui.routing.yml @@ -46,7 +46,7 @@ menu_ui.link_reset: _permission: 'administer menu' _custom_access: '\Drupal\menu_ui\Form\MenuLinkResetForm::linkIsResettable' -menu_ui.menu_add: +entity.menu.add_form: path: '/admin/structure/menu/add' defaults: _entity_form: 'menu.add' @@ -54,7 +54,7 @@ menu_ui.menu_add: requirements: _entity_create_access: 'menu' -menu_ui.menu_edit: +entity.menu.edit_form: path: '/admin/structure/menu/manage/{menu}' defaults: _entity_form: 'menu.edit' @@ -62,7 +62,7 @@ menu_ui.menu_edit: requirements: _entity_access: 'menu.update' -menu_ui.delete_menu: +entity.menu.delete_form: path: '/admin/structure/menu/manage/{menu}/delete' defaults: _entity_form: 'menu.delete' diff --git a/core/modules/menu_ui/src/Form/MenuDeleteForm.php b/core/modules/menu_ui/src/Form/MenuDeleteForm.php index 299df36..764a7c5 100644 --- a/core/modules/menu_ui/src/Form/MenuDeleteForm.php +++ b/core/modules/menu_ui/src/Form/MenuDeleteForm.php @@ -106,7 +106,7 @@ public function submit(array $form, FormStateInterface $form_state) { // parameter that is being removed. Also, consider moving this to // menu_ui.module as part of a generic response to entity deletion. // https://www.drupal.org/node/2310329 - $menu_links = $this->menuLinkManager->loadLinksByRoute('menu_ui.menu_edit', array('menu' => $this->entity->id()), TRUE); + $menu_links = $this->menuLinkManager->loadLinksByRoute('entity.menu.edit_form', array('menu' => $this->entity->id()), TRUE); foreach ($menu_links as $id => $link) { $this->menuLinkManager->removeDefinition($id); } diff --git a/core/modules/menu_ui/src/Form/MenuLinkEditForm.php b/core/modules/menu_ui/src/Form/MenuLinkEditForm.php index 784024a..fae404c 100644 --- a/core/modules/menu_ui/src/Form/MenuLinkEditForm.php +++ b/core/modules/menu_ui/src/Form/MenuLinkEditForm.php @@ -96,7 +96,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { drupal_set_message($this->t('The menu link has been saved.')); $form_state->setRedirect( - 'menu_ui.menu_edit', + 'entity.menu.edit_form', array('menu' => $link->getMenuName()) ); } diff --git a/core/modules/menu_ui/src/Form/MenuLinkResetForm.php b/core/modules/menu_ui/src/Form/MenuLinkResetForm.php index d0bd61e..74d0fa0 100644 --- a/core/modules/menu_ui/src/Form/MenuLinkResetForm.php +++ b/core/modules/menu_ui/src/Form/MenuLinkResetForm.php @@ -71,7 +71,7 @@ public function getQuestion() { * {@inheritdoc} */ public function getCancelUrl() { - return new Url('menu_ui.menu_edit', array( + return new Url('entity.menu.edit_form', array( 'menu' => $this->link->getMenuName(), )); } diff --git a/core/modules/menu_ui/src/MenuForm.php b/core/modules/menu_ui/src/MenuForm.php index 58cb663..15453a7 100644 --- a/core/modules/menu_ui/src/MenuForm.php +++ b/core/modules/menu_ui/src/MenuForm.php @@ -239,8 +239,8 @@ protected function buildOverviewForm(array &$form, FormStateInterface $form_stat $delta = max($count($tree), 50); $form = array_merge($form, $this->buildOverviewTreeForm($tree, $delta)); - $destination = $this->getUrlGenerator()->getPathFromRoute('menu_ui.menu_edit', array('menu' => $this->entity->id())); - $url = $destination = $this->url('menu_link_content.link_add', array('menu' => $this->entity->id()), array('query' => array('destination' => $destination))); + $destination = $this->getUrlGenerator()->getPathFromRoute('entity.menu.edit_form', array('menu' => $this->entity->id())); + $url = $destination = $this->url('entity.menu_link_content.add_form', array('menu' => $this->entity->id()), array('query' => array('destination' => $destination))); $form['#empty_text'] = $this->t('There are no menu links yet. Add link.', array('@url' => $url)); return $form;