diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index 75cfe56..92549f3 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -156,21 +156,21 @@ function aggregator_default_menu_links() { $links['aggregator.admin_overview'] = array( 'link_title' => 'Feed aggregator', 'description' => "Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.", - 'route_name' => 'aggregator_admin_overview', + 'route_name' => 'aggregator.admin_overview', 'weight' => 10, ); $links['aggregator'] = array( 'link_title' => 'Feed aggregator', 'weight' => 5, - 'route_name' => 'aggregator_page_last', + 'route_name' => 'aggregator.page_last', ); $links['aggregator.sources'] = array( 'link_title' => 'Sources', - 'route_name' => 'aggregator_sources', + 'route_name' => 'aggregator.sources', ); $links['aggregator.categories'] = array( 'link_title' => 'Categories', - 'route_name' => 'aggregator_categories', + 'route_name' => 'aggregator.categories', ); return $links; diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 8d14b83..1e3e833 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -120,7 +120,7 @@ function block_default_menu_links() { 'link_title' => 'Blocks', 'parent' => 'admin.structure', 'description' => 'Configure what block content appears in your site\'s sidebars and other regions.', - 'route_name' => 'block_admin_display', + 'route_name' => 'block.admin_display', ); return $links; diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index e087840..90eb5a1 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -233,7 +233,7 @@ function comment_menu() { function comment_default_menu_links() { $links['admin.content.comment'] = array( 'link_title' => 'Comments', - 'link_path' => 'admin/content/comment', + 'route_name' => 'comment.admin', 'parent' => 'admin.content', 'description' => 'List and edit site comments and the comment approval queue.', ); diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index affc952..2a724b4 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -102,12 +102,12 @@ function contact_default_menu_links() { 'link_title' => 'Contact form categories', 'parent' => 'admin.structure', 'description' => 'Create a system contact form and set up categories for the form to use.', - 'route_name' => 'contact_category_list', + 'route_name' => 'contact.category_list', ); $links['contact'] = array( 'link_title' => 'Contact', - 'link_path' => 'contact', + 'route_name' => 'contact.site_page', 'menu_name' => 'footer', 'type' => MENU_SUGGESTED_ITEM, ); diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index 3f69a3f..3abe865 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -80,26 +80,26 @@ function dblog_default_menu_links() { 'link_title' => 'Recent log messages', 'parent' => 'admin.reports', 'description' => 'View events that have recently been logged.', - 'route_name' => 'dblog_overview', + 'route_name' => 'dblog.overview', 'weight' => -1, ); $links['admin.reports.page-not-found'] = array( 'link_title' => "Top 'page not found' errors", - 'link_path' => 'admin/reports/page-not-found', + 'route_name' => 'dblog.page_not_found', 'parent' => 'admin.reports', 'description' => "View 'page not found' errors (404s).", ); $links['admin.reports.access-denied'] = array( 'link_title' => "Top 'access denied' errors", - 'link_path' => 'admin/reports/access-denied', + 'route_name' => 'dblog.access_denied', 'description' => "View 'access denied' errors (403s).", 'parent' => 'admin.reports', ); - if (module_exists('search')) { + if (\Drupal::moduleHandler()->moduleExists('search')) { $links['admin.reports.search'] = array( 'link_title' => 'Top search phrases', - 'link_path' => 'admin/reports/search', + 'route_name' => 'dblog.search', 'description' => 'View most popular search phrases.', 'parent' => 'admin.reports', ); diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index da936c8..31da694 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -159,14 +159,14 @@ function filter_default_menu_links() { $links['filter.tips'] = array( 'link_title' => 'Compose tips', 'type' => MENU_SUGGESTED_ITEM, - 'route_name' => 'filter_tips_all', + 'route_name' => 'filter.tips_all', ); $links['admin.config.content.formats'] = array( 'link_title' => 'Text formats', 'parent' => 'admin.config.content', 'description' => 'Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.', - 'route_name' => 'filter_admin_overview', + 'route_name' => 'filter.admin_overview', ); return $links; diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index 32a0479..577c973 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -108,7 +108,7 @@ function menu_default_menu_links() { $links['admin.structure.menu'] = array( 'link_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.overview_page', 'parent' => 'admin.structure', ); return $links; diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 30b13e9..b173f16 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -996,7 +996,7 @@ function node_menu() { function node_default_menu_links() { $links['admin.content'] = array( 'link_title' => 'Content', - 'link_path' => 'admin/content', + 'route_name' => 'node.content_overview', 'parent' => 'admin', 'description' => 'Find and manage content.', ); @@ -1005,11 +1005,11 @@ function node_default_menu_links() { 'link_title' => 'Content types', 'parent' => 'admin.structure', 'description' => 'Manage content types, including default status, front page promotion, comment settings, etc.', - 'route_name' => 'node_overview_types', + 'route_name' => 'node.overview_types', ); $links['node.add'] = array( 'link_title' => 'Add content', - 'link_path' => 'node/add', + 'route_name' => 'node.add_page', ); return $links; } diff --git a/core/modules/search/search.module b/core/modules/search/search.module index a9320f8..99510d9 100644 --- a/core/modules/search/search.module +++ b/core/modules/search/search.module @@ -152,14 +152,14 @@ function search_preprocess_block(&$variables) { function search_default_menu_links() { $links['search'] = array( 'link_title' => 'Search', - 'link_path' => 'search', + 'route_name' => 'search.view', 'type' => MENU_SUGGESTED_ITEM, ); $links['admin.config.search.settings'] = array( 'link_title' => 'Search settings', 'parent' => 'admin.config.search', 'description' => 'Configure relevance settings for search and other indexing options.', - 'route_name' => 'search_settings', + 'route_name' => 'search.settings', 'weight' => -10, ); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index da8368a..043322c 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -818,14 +818,14 @@ function system_default_menu_links() { $items['admin'] = array( 'link_title' => 'Administration', - 'link_path' => 'admin', + 'route_name' => 'system.admin', 'weight' => 9, 'menu_name' => 'admin', ); // Menu items that are basically just menu blocks. $items['admin.structure'] = array( - 'link_path' => 'admin/structure', + 'route_name' => 'system.admin_structure', 'parent' => 'admin', 'description' => 'Administer blocks, content types, menus, etc.', 'link_title' => 'Structure', @@ -833,7 +833,7 @@ function system_default_menu_links() { ); // Appearance. $items['admin.appearance'] = array( - 'link_path' => 'admin/appearance', + 'route_name' => 'system.themes_page', 'link_title' => 'Appearance', 'parent' => 'admin', 'weight' => -6, @@ -855,7 +855,7 @@ function system_default_menu_links() { // Media settings. $items['admin.config.media'] = array( - 'link_path' => 'admin/config/media', + 'route_name' => 'system.admin_config_media', 'parent' => 'admin.config', 'link_title' => 'Media', 'weight' => -10, @@ -878,7 +878,7 @@ function system_default_menu_links() { $items['admin.config.services'] = array( 'link_title' => 'Web services', 'parent' => 'admin.config', - 'link_path' => 'admin/config/services', + 'route_name' => 'system.admin_config_services', 'weight' => 0, ); $items['admin.config.services.rss-publishing'] = array( @@ -890,7 +890,7 @@ function system_default_menu_links() { // Development settings. $items['admin.config.development'] = array( - 'link_path' => 'admin/config/development', + 'route_name' => 'system.admin_config_development', 'parent' => 'admin.config', 'link_title' => 'Development', 'description' => 'Development tools.', @@ -920,7 +920,7 @@ function system_default_menu_links() { // Regional and date settings. $items['admin.config.regional'] = array( - 'link_path' => 'admin/config/regional', + 'route_name' => 'system.admin_config_regional', 'link_title' => 'Regional and language', 'parent' => 'admin.config', 'description' => 'Regional settings, localization and translation.', @@ -944,7 +944,7 @@ function system_default_menu_links() { // Search settings. $items['admin.config.search'] = array( 'link_title' => 'Search and metadata', - 'link_path' => 'admin/config/search', + 'route_name' => 'system.admin_config_search', 'parent' => 'admin.config', 'description' => 'Local site search, metadata and SEO.', 'weight' => -10, @@ -975,21 +975,21 @@ function system_default_menu_links() { // Additional categories $items['admin.config.user-interface'] = array( 'link_title' => 'User interface', - 'link_path' => 'admin/config/user-interface', + 'route_name' => 'system.admin_config_ui', 'parent' => 'admin.config', 'description' => 'Tools that enhance the user interface.', 'weight' => -15, ); $items['admin.config.workflow'] = array( 'link_title' => 'Workflow', - 'link_path' => 'admin/config/workflow', + 'route_name' => 'system.admin_config_workflow', 'parent' => 'admin.config', 'description' => 'Content workflow, editorial workflow tools.', 'weight' => 5, ); $items['admin.config.content'] = array( 'link_title' => 'Content authoring', - 'link_path' => 'admin/config/content', + 'route_name' => 'system.admin_config_content', 'parent' => 'admin.config', 'description' => 'Settings related to formatting and authoring content.', 'weight' => -15, @@ -998,7 +998,7 @@ function system_default_menu_links() { // Reports. $items['admin.reports'] = array( 'link_title' => 'Reports', - 'link_path' => 'admin/reports', + 'route_name' => 'system.admin_reports', 'parent' => 'admin', 'description' => 'View reports, updates, and errors.', 'weight' => 5, diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index 7b6464f..9f5cb5d 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -289,7 +289,7 @@ function taxonomy_default_menu_links() { 'link_title' => 'Taxonomy', 'parent' => 'admin.structure', 'description' => 'Manage tagging, categorization, and classification of your content.', - 'route_name' => 'taxonomy_vocabulary_list', + 'route_name' => 'taxonomy.vocabulary_list', ); return $links; diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module index 70a1112..e4a8d13 100644 --- a/core/modules/tracker/tracker.module +++ b/core/modules/tracker/tracker.module @@ -36,7 +36,7 @@ function tracker_help($path, $arg) { function tracker_default_menu_links() { $links['tracker'] = array( 'link_title' => 'Recent content', - 'link_path' => 'tracker', + 'route_name' => 'tracker.page', ); return $links; diff --git a/core/modules/user/user.module b/core/modules/user/user.module index ef04a42..c9c6824 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -820,7 +820,7 @@ function user_default_menu_links() { $links['user'] = array( 'link_title' => 'My account', 'weight' => -10, - 'route_name' => 'user_page', + 'route_name' => 'user.page', 'menu_name' => 'account', ); @@ -834,7 +834,7 @@ function user_default_menu_links() { // User listing pages. $links['admin.people'] = array( 'link_title' => 'People', - 'link_path' => 'admin/people', + 'route_name' => 'user.admin_account', 'description' => 'Manage user accounts, roles, and permissions.', 'parent' => 'admin', 'weight' => -4, @@ -850,7 +850,7 @@ function user_default_menu_links() { // Administration pages. $links['admin.config.people'] = array( 'link_title' => 'People', - 'link_path' => 'admin/config/people', + 'route_name' => 'user.admin_index', 'parent' => 'admin.config', 'description' => 'Configure user accounts.', 'position' => 'left', @@ -882,15 +882,6 @@ function user_menu_link_presave(MenuLink $menu_link) { } /** - * Implements hook_translated_menu_link_alter(). - */ -function user_translated_menu_link_alter(&$link) { - if ($link['machine_name'] == 'user' && $GLOBALS['user']->isAnonymous()) { - $link['title'] = t('Log in'); - } -} - -/** * Implements hook_menu_breadcrumb_alter(). */ function user_menu_breadcrumb_alter(&$active_trail, $item) {