diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 086f025..d2927dc 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -1679,14 +1679,7 @@ function drupal_get_messages($type = NULL, $clear_queue = TRUE) { * The current page's title. */ function drupal_get_title() { - $title = drupal_set_title(); - - // During a bootstrap, menu.inc is not included and thus we cannot provide a title. - if (!isset($title) && function_exists('menu_get_active_title')) { - $title = String::checkPlain(menu_get_active_title()); - } - - return $title; + return drupal_set_title() ?: ''; } /** diff --git a/core/includes/menu.inc b/core/includes/menu.inc index 305b8f7..e49ef75 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -654,7 +654,7 @@ function _menu_item_localize(&$item, $map, $link_translate = FALSE) { // itself; can't localize. // If we are translating a router item (tabs, page, breadcrumb), then we // can always use the information from the router item. - if (!$link_translate || ($item['title'] == $item['link_title'])) { + if (!$link_translate || !isset($item['link_title']) || ($item['title'] == $item['link_title'])) { // t() is a special case. Since it is used very close to all the time, // we handle it directly instead of using indirect, slower methods. if ($title_callback == 't') { @@ -758,7 +758,10 @@ function _menu_translate(&$router_item, $map, $to_arg = FALSE) { $router_item['access'] = FALSE; return FALSE; } - + // Avoid notices until we remove this function. + // @see https://drupal.org/node/2107533 + $tab_root_map = array(); + $tab_parent_map = array(); // Generate the link path for the page request or local tasks. $link_map = explode('/', $router_item['path']); if (isset($router_item['tab_root'])) { @@ -853,95 +856,45 @@ function menu_tail_load($arg, &$map, $index) { } /** - * Provides menu link access control, translation, and argument handling. + * Provides menu link unserializing, access control, and argument handling. * * This function is similar to _menu_translate(), but it also does * link-specific preparation (such as always calling to_arg() functions). * - * @param $item - * A menu link. - * @param $translate - * (optional) Whether to try to translate a link containing dynamic path - * argument placeholders (%) based on the menu router item of the current - * path. Defaults to FALSE. Internally used for breadcrumbs. - * - * @return - * Returns the map of path arguments with objects loaded as defined in the - * $item['load_functions']. - * $item['access'] becomes TRUE if the item is accessible, FALSE otherwise. - * $item['href'] is generated from link_path, possibly by to_arg functions. - * $item['title'] is generated from link_title, and may be localized. - * $item['options'] is unserialized; it is also changed within the call here - * to $item['localized_options'] by _menu_item_localize(). + * @param array $item + * The passed in and changed menu item with the following elements: + * - href: The actual path to the link, is generated from link_path + * - access: Becomes TRUE if the item is accessible, FALSE otherwise. + * - title: The title of the link, is generated from link_title. + * - route_name: The route name of the menu link. + * - route_parameters: The unserialized route parameters. + * - options: Is unserialized and copied to $item['localized_options']. */ -function _menu_link_translate(&$item, $translate = FALSE) { +function _menu_link_translate(&$item) { if (!is_array($item['options'])) { - $item['options'] = unserialize($item['options']); + $item['options'] = (array) unserialize($item['options']); } - if ($item['external']) { + $item['localized_options'] = $item['options']; + $item['title'] = $item['link_title']; + if ($item['external'] || empty($item['route_name'])) { $item['access'] = 1; - $map = array(); $item['href'] = $item['link_path']; - $item['title'] = $item['link_title']; - $item['localized_options'] = $item['options']; + $item['route_parameters'] = array(); + // Set to NULL so that drupal_pre_render_link() is certain to skip it. + $item['route_name'] = NULL; } else { - // Complete the path of the menu link with elements from the current path, - // if it contains dynamic placeholders (%). - $map = explode('/', $item['link_path']); - if (strpos($item['link_path'], '%') !== FALSE) { - // Invoke registered to_arg callbacks. - if (!empty($item['to_arg_functions'])) { - _menu_link_map_translate($map, $item['to_arg_functions']); - } - // Or try to derive the path argument map from the current router item, - // if this $item's path is within the router item's path. This means - // that if we are on the current path 'foo/%/bar/%/baz', then - // menu_get_item() will have translated the menu router item for the - // current path, and we can take over the argument map for a link like - // 'foo/%/bar'. This inheritance is only valid for breadcrumb links. - // @see _menu_tree_check_access() - elseif ($translate && ($current_router_item = menu_get_item())) { - // If $translate is TRUE, then this link is in the active trail. - // Only translate paths within the current path. - if (strpos($current_router_item['path'], $item['link_path']) === 0) { - $count = count($map); - $map = array_slice($current_router_item['original_map'], 0, $count); - $item['original_map'] = $map; - if (isset($current_router_item['map'])) { - $item['map'] = array_slice($current_router_item['map'], 0, $count); - } - // Reset access to check it (for the first time). - unset($item['access']); - } - } - } - $item['href'] = implode('/', $map); - - // Skip links containing untranslated arguments. - if (strpos($item['href'], '%') !== FALSE) { - $item['access'] = FALSE; - return FALSE; + $item['href'] = NULL; + if (!is_array($item['route_parameters'])) { + $item['route_parameters'] = (array) unserialize($item['route_parameters']); } // menu_tree_check_access() may set this ahead of time for links to nodes. if (!isset($item['access'])) { - if ($route = $item->getRoute()) { - $item['access'] = menu_item_route_access($route, $item['href'], $map); - } - elseif (!empty($item['load_functions']) && !_menu_load_objects($item, $map)) { - // An error occurred loading an object. - $item['access'] = FALSE; - return FALSE; - } - // Apply the access check defined in hook_menu() if there is not route - // defined. - else { - _menu_check_access($item, $map); - } + $item['access'] = \Drupal::getContainer()->get('access_manager')->checkNamedRoute($item['route_name'], $item['route_parameters'], \Drupal::currentUser()); } // For performance, don't localize a link the user can't access. if ($item['access']) { - _menu_item_localize($item, $map, TRUE); + _menu_item_localize($item, array(), TRUE); } } @@ -951,8 +904,6 @@ function _menu_link_translate(&$item, $translate = FALSE) { if (!empty($item['options']['alter'])) { drupal_alter('translated_menu_link', $item, $map); } - - return $map; } /** @@ -972,9 +923,11 @@ function _menu_link_translate(&$item, $translate = FALSE) { * @throws \Symfony\Component\Routing\Exception\ResourceNotFoundException * If the system path in $href does not match the $route. */ -function menu_item_route_access(Route $route, $href, &$map) { - $request = RequestHelper::duplicate(\Drupal::request(), '/' . $href); - $request->attributes->set('_system_path', $href); +function menu_item_route_access(Route $route, $href, &$map, Request $request = NULL) { + if (!isset($request)) { + $request = RequestHelper::duplicate(\Drupal::request(), '/' . $href); + $request->attributes->set('_system_path', $href); + } // Attempt to match this path to provide a fully built request to the // access checker. try { @@ -1132,19 +1085,14 @@ function menu_tree_output($tree) { $class[] = 'active-trail'; $data['link']['localized_options']['attributes']['class'][] = 'active-trail'; } - // Normally, l() compares the href of every link with the current path and - // sets the active class accordingly. But local tasks do not appear in menu - // trees, so if the current path is a local task, and this link is its - // tab root, then we have to set the class manually. - if ($data['link']['href'] == $router_item['tab_root_href'] && $data['link']['href'] != current_path()) { - $data['link']['localized_options']['attributes']['class'][] = 'active'; - } // Allow menu-specific theme overrides. $element['#theme'] = 'menu_link__' . strtr($data['link']['menu_name'], '-', '_'); $element['#attributes']['class'] = $class; $element['#title'] = $data['link']['title']; - $element['#href'] = $data['link']['href']; + // @todo Use route name and parameters to generate the link path, unless + // it is external. + $element['#href'] = $data['link']['link_path']; $element['#localized_options'] = !empty($data['link']['localized_options']) ? $data['link']['localized_options'] : array(); $element['#below'] = $data['below'] ? menu_tree_output($data['below']) : $data['below']; $element['#original_link'] = $data['link']; @@ -1877,7 +1825,7 @@ function menu_navigation_links($menu_name, $level = 0) { if (!$item['link']['hidden']) { $class = ''; $l = $item['link']['localized_options']; - $l['href'] = $item['link']['href']; + $l['href'] = $item['link']['link_path']; $l['title'] = $item['link']['title']; if ($item['link']['in_active_trail']) { $class = ' active-trail'; @@ -2304,10 +2252,10 @@ function menu_set_active_trail($new_trail = NULL) { // Try to retrieve a menu link corresponding to the current path. If more // than one exists, the link from the most preferred menu is returned. $preferred_link = menu_link_get_preferred(); - $current_item = menu_get_item(); // There is a link for the current path. if ($preferred_link) { + _menu_link_translate($preferred_link); // Pass TRUE for $only_active_trail to make menu_tree_page_data() build // a stripped down menu tree containing the active trail only, in case // the given menu has not been built in this request yet. @@ -2316,7 +2264,6 @@ function menu_set_active_trail($new_trail = NULL) { } // There is no link for the current path. else { - $preferred_link = $current_item; $curr = FALSE; } @@ -2334,7 +2281,7 @@ function menu_set_active_trail($new_trail = NULL) { // @see _menu_tree_check_access() // @see _menu_link_translate() if (strpos($link['href'], '%') !== FALSE) { - _menu_link_translate($link, TRUE); + _menu_link_translate($link); } if ($link['access']) { $trail[] = $link; @@ -2389,20 +2336,11 @@ function menu_link_get_preferred($path = NULL, $selected_menu = NULL) { // which are ordered by priority (translated hrefs are preferred over // untranslated paths). Afterwards, the most relevant path is picked from // the menus, ordered by menu preference. - $item = menu_get_item($path); $path_candidates = array(); // 1. The current item href. - $path_candidates[$item['href']] = $item['href']; - // 2. The tab root href of the current item (if any). - if ($item['tab_parent'] && ($tab_root = menu_get_item($item['tab_root_href']))) { - $path_candidates[$tab_root['href']] = $tab_root['href']; - } - // 3. The current item path (with wildcards). - $path_candidates[$item['path']] = $item['path']; - // 4. The tab root path of the current item (if any). - if (!empty($tab_root)) { - $path_candidates[$tab_root['path']] = $tab_root['path']; - } + // @todo simplify this code and convert to using route names. + // @see https://drupal.org/node/2154949 + $path_candidates[$path] = $path; // Retrieve a list of menu names, ordered by preference. $menu_names = menu_get_active_menu_names(); @@ -2469,19 +2407,6 @@ function menu_get_active_trail() { } /** - * Gets the title of the current page, as determined by the active trail. - */ -function menu_get_active_title() { - $active_trail = menu_get_active_trail(); - - foreach (array_reverse($active_trail) as $item) { - if (!(bool) ($item['type'] & MENU_IS_LOCAL_TASK)) { - return $item['title']; - } - } -} - -/** * Clears the cached cached data for a single named menu. */ function menu_cache_clear($menu_name = 'tools') { @@ -2538,7 +2463,7 @@ function menu_router_rebuild() { try { list($menu) = menu_router_build(TRUE); - _menu_navigation_links_rebuild($menu); + menu_default_links_rebuild($menu); // Clear the menu, page and block caches. menu_cache_clear_all(); _menu_clear_page_cache(); @@ -2648,105 +2573,141 @@ function menu_get_router() { } /** - * Builds menu links for the items in the menu router. - * - * @todo This function should be removed/refactored. + * Recursive helper to save menu links. + */ +function _menu_link_save_recursive($controller, $machine_name, &$children, &$links) { + $menu_link = $links[$machine_name]; + if ($menu_link->isNew() || !$menu_link->customized) { + if (!isset($menu_link->plid) && !empty($menu_link->parent) && !empty($links[$menu_link->parent])) { + $parent = $links[$menu_link->parent]; + + if (empty($menu_link->menu_name) || $parent->menu_name == $menu_link->menu_name) { + $menu_link->plid = $parent->id(); + $menu_link->menu_name = $parent->menu_name; + } + } + $controller->save($menu_link); + } + if (!empty($children[$machine_name])) { + foreach ($children[$machine_name] as $next_name) { + _menu_link_save_recursive($controller, $next_name, $children, $links); + } + } + // Remove processed link names so we can find stragglers. + unset($children[$machine_name]); +} + +/** + * Find all links returned from hook_default_menu_links(). */ -function _menu_navigation_links_rebuild($menu) { - if (!\Drupal::moduleHandler()->moduleExists('menu_link')) { +function menu_get_default_links() { + $module_handler = \Drupal::moduleHandler(); + $all_links = $module_handler->invokeAll('default_menu_links'); + $module_handler->alter('default_menu_links', $all_links); + return $all_links; +} + +/** + * Builds menu links for the items returned from hook_default_meanu_links(). + */ +function menu_default_links_rebuild() { + $module_handler = \Drupal::moduleHandler(); + if (!$module_handler->moduleExists('menu_link')) { // The Menu link module may not be available during install, so rebuild // when possible. return; } $menu_link_controller = \Drupal::entityManager() ->getStorageController('menu_link'); - - // Add normal and suggested items as links. - $router_items = array(); - foreach ($menu as $path => $router_item) { - if ($router_item['_visible']) { - $router_items[$path] = $router_item; - $sort[$path] = $router_item['_number_parts']; - } - } - if ($router_items) { - // Keep an array of processed menu links, to allow - // Drupal\menu_link\MenuLinkStorageController::save() to check this for - // parents instead of querying the database. - $parent_candidates = array(); - // Make sure no child comes before its parent. - array_multisort($sort, SORT_NUMERIC, $router_items); - - foreach ($router_items as $key => $router_item) { + $links = array(); + $children = array(); + $top_links = array(); + $all_links = menu_get_default_links(); + if ($all_links) { + foreach ($all_links as $machine_name => $link) { + // Note, we set module as 'system', so that we can distinguish all the + // menu links generated automatically from hook_default_menu_links(). + $link['machine_name'] = $machine_name; + $link['module'] = 'system'; + $link += array( + 'type' => MENU_NORMAL_ITEM, + 'hidden' => 0, + 'options' => empty($link['description']) ? array() : array('attributes' => array('title' => $link['description'])), + ); + // Suggested items are disabled by default. + if ($link['type'] == MENU_SUGGESTED_ITEM) { + $link['hidden'] = 1; + } // For performance reasons, do a straight query now and convert to a menu // link entity later. // @todo revisit before release. $existing_item = db_select('menu_links') ->fields('menu_links') - ->condition('link_path', $router_item['path']) + ->condition('machine_name', $machine_name) ->condition('module', 'system') - ->execute()->fetchAll(); + ->execute()->fetchObject(); if ($existing_item) { - $existing_item = reset($existing_item); $existing_item->options = unserialize($existing_item->options); $existing_item->route_parameters = unserialize($existing_item->route_parameters); - - $router_item['mlid'] = $existing_item->mlid; - $router_item['uuid'] = $existing_item->uuid; - // A change in hook_menu may move the link to a different menu - if (empty($router_item['menu_name']) || ($router_item['menu_name'] == $existing_item->menu_name)) { - $router_item['menu_name'] = $existing_item->menu_name; - $router_item['plid'] = $existing_item->plid; - } - else { - // It moved to a new menu. - // Let Drupal\menu_link\MenuLinkStorageController::save() try to find - // a new parent based on the path. - unset($router_item['plid']); - } - $router_item['has_children'] = $existing_item->has_children; - $router_item['updated'] = $existing_item->updated; + $link['mlid'] = $existing_item->mlid; + $link['plid'] = $existing_item->plid; + $link['uuid'] = $existing_item->uuid; + $link['customized'] = $existing_item->customized; + $link['updated'] = $existing_item->updated; + $menu_link = $menu_link_controller->create($link); // Convert the existing item to a typed object. $existing_item = $menu_link_controller->create(get_object_vars($existing_item)); + + if (!$existing_item->customized) { + // A change in hook_default_menu_links may move the link to a + // different menu. + if (!empty($link['menu_name']) && ($link['menu_name'] != $existing_item->menu_name)) { + $menu_link->plid = NULL; + $menu_link->menu_name = $link['menu_name']; + } + + $menu_link->original = $existing_item; + } } else { - $existing_item = NULL; + if (empty($link['route_name']) && empty($link['link_path'])) { + $link['route_name'] = ''; + $link['link_title'] = 'THIS IS A BUG'; + } + $menu_link = $menu_link_controller->create($link); } - - if ($existing_item && $existing_item->customized) { - $parent_candidates[$existing_item->mlid] = $existing_item; + if (!empty($link['parent'])) { + $children[$link['parent']][$machine_name] = $machine_name; + $menu_link->parent = $link['parent']; + if (empty($link['menu_name'])) { + // Unset the default menu name so it's populated from the parent. + unset($menu_link->menu_name); + } } else { - $menu_link = MenuLink::buildFromRouterItem($router_item); - $menu_link->original = $existing_item; - $menu_link->parentCandidates = $parent_candidates; - $menu_link_controller->save($menu_link); - $parent_candidates[$menu_link->id()] = $menu_link; - unset($router_items[$key]); + // A top level link - we need them to root our tree. + $top_links[$machine_name] = $machine_name; + $menu_link->plid = 0; } + $links[$machine_name] = $menu_link; } } - - $paths = array_keys($menu); - // Updated and customized items whose router paths are gone need new ones. - $menu_links = $menu_link_controller->loadUpdatedCustomized($paths); - foreach ($menu_links as $menu_link) { - $router_path = _menu_find_router_path($menu_link->link_path); - if (!empty($router_path) && ($router_path != $menu_link->router_path || $menu_link->updated)) { - // If the router path and the link path matches, it's surely a working - // item, so we clear the updated flag. - $updated = $menu_link->updated && $router_path != $menu_link->link_path; - - $menu_link->router_path = $router_path; - $menu_link->updated = (int) $updated; - $menu_link_controller->save($menu_link); + foreach ($top_links as $machine_name) { + _menu_link_save_recursive($menu_link_controller, $machine_name, $children, $links); + } + // Handle any children we didn't find starting from top-level links. + foreach ($children as $missing_parent => $orphan_links) { + foreach ($orphan_links as $machine_name) { + // Force it to the top level. + $links[$machine_name]->plid = 0; + _menu_link_save_recursive($menu_link_controller, $machine_name, $children, $links); } } // Find any item whose router path does not exist any more. $query = \Drupal::entityQuery('menu_link') - ->condition('router_path', $paths, 'NOT IN') + ->condition('machine_name', array_keys($all_links), 'NOT IN') ->condition('external', 0) ->condition('updated', 0) ->condition('customized', 0) @@ -2983,7 +2944,7 @@ function _menu_router_build($callbacks, $save = FALSE) { // previous iteration assigned one already), try to find the menu name // of the parent item in the currently stored menu links. if (!isset($parent['menu_name'])) { - $menu_name = db_query("SELECT menu_name FROM {menu_links} WHERE router_path = :router_path AND module = 'system'", array(':router_path' => $parent_path))->fetchField(); + $menu_name = db_query("SELECT menu_name FROM {menu_links} WHERE link_path = :link_path AND module = 'system'", array(':link_path' => $parent_path))->fetchField(); if ($menu_name) { $parent['menu_name'] = $menu_name; } diff --git a/core/includes/path.inc b/core/includes/path.inc index 9c41abd..58bd0a1 100644 --- a/core/includes/path.inc +++ b/core/includes/path.inc @@ -5,6 +5,7 @@ * Functions to handle paths in Drupal. */ +use Drupal\Core\Routing\RequestHelper; use Symfony\Component\HttpFoundation\Request; /** @@ -195,9 +196,24 @@ function drupal_valid_path($path, $dynamic_allowed = FALSE) { global $menu_admin; // We indicate that a menu administrator is running the menu access check. $menu_admin = TRUE; + /** @var $route_provider \Drupal\Core\Routing\RouteProviderInterface */ + $route_provider = \Drupal::service('router.route_provider'); + + if ($dynamic_allowed && preg_match('/\/\%/', $path)) { + $router_path = '/' . str_replace('%', '{}', $path); + } + else { + $router_path = $path; + } + if ($path == '' || url_is_external($path)) { $item = array('access' => TRUE); } + elseif (($collection = $route_provider->getRoutesByPattern('/' . $router_path)) && $collection->count() > 0) { + $routes = $collection->all(); + $route = reset($routes); + $route_name = key($routes); + } elseif ($dynamic_allowed && preg_match('/\/\%/', $path)) { // Path is dynamic (ie 'user/%'), so check directly against menu_router table. if ($item = db_query("SELECT * FROM {menu_router} where path = :path", array(':path' => $path))->fetchAssoc()) { @@ -206,16 +222,22 @@ function drupal_valid_path($path, $dynamic_allowed = FALSE) { $item['external'] = FALSE; $item['options'] = ''; _menu_link_translate($item); + $route_name = $item['route_name']; } } else { $item = menu_get_item($path); + $route_name = $item['route_name']; } // Check the new routing system. - if (!empty($item['route_name'])) { + if (!empty($route_name)) { $map = array(); - $route = \Drupal::service('router.route_provider')->getRouteByName($item['route_name']); - $item['access'] = menu_item_route_access($route, $path, $map); + $route = \Drupal::service('router.route_provider')->getRouteByName($route_name); + $request = RequestHelper::duplicate(\Drupal::request(), '/' . $path); + $request->attributes->set('_system_path', $path); + $request->attributes->set('_menu_admin', TRUE); + + $item['access'] = menu_item_route_access($route, $path, $map, $request); } $menu_admin = FALSE; return $item && $item['access']; diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 9545be7..e1aa541 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -2109,6 +2109,13 @@ function template_preprocess_html(&$variables) { 'name' => String::checkPlain($site_config->get('name')), ); } + // @todo Remove once views is not bypassing the view subscriber anymore. + elseif (drupal_is_front_page()) { + $head_title = array( + 'title' => t('Home'), + 'name' => String::checkPlain($site_config->get('name')), + ); + } else { $head_title = array('name' => String::checkPlain($site_config->get('name'))); if ($site_config->get('slogan')) { diff --git a/core/modules/action/action.module b/core/modules/action/action.module index 5ecfb63..f7310d1 100644 --- a/core/modules/action/action.module +++ b/core/modules/action/action.module @@ -57,6 +57,20 @@ function action_menu() { } /** + * Implements hook_default_menu_links(). + */ +function action_default_menu_links() { + $links['admin.config.system.actions'] = array( + 'link_title' => 'Actions', + 'description' => 'Manage the actions defined for your site.', + 'route_name' => 'action.admin', + 'parent' => 'admin.config.system', + ); + + return $links; +} + +/** * Implements hook_entity_info(). */ function action_entity_info(&$entity_info) { diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index bf17629..e46f365 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -128,6 +128,30 @@ function aggregator_menu() { } /** + * Implements hook_default_menu_links(). + */ +function aggregator_default_menu_links() { + $links = array(); + $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', + 'weight' => 10, + ); + $links['aggregator'] = array( + 'link_title' => 'Feed aggregator', + 'weight' => 5, + 'route_name' => 'aggregator.page_last', + ); + $links['aggregator.sources'] = array( + 'link_title' => 'Sources', + 'route_name' => 'aggregator.sources', + ); + + return $links; +} + +/** * Implements hook_permission(). */ function aggregator_permission() { diff --git a/core/modules/ban/ban.module b/core/modules/ban/ban.module index 0dce1d9..5e0e30b 100644 --- a/core/modules/ban/ban.module +++ b/core/modules/ban/ban.module @@ -53,3 +53,18 @@ function ban_menu() { ); return $items; } + +/** + * Implements hook_default_menu_links(). + */ +function ban_default_menu_links() { + $links['admin.config.people.ban'] = array( + 'link_title' => 'IP address bans', + 'description' => 'Manage banned IP addresses.', + 'route_name' => 'ban.admin_page', + 'weight' => 10, + 'parent' => 'admin.config.people', + ); + + return $links; +} diff --git a/core/modules/block/block.module b/core/modules/block/block.module index dd3aa6f..db07a89 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -117,6 +117,20 @@ function block_menu() { } /** + * Implements hook_default_menu_links(). + */ +function block_default_menu_links() { + $links['admin.structure.block'] = array( + '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', + ); + + return $links; +} + +/** * Implements hook_page_build(). * * Renders blocks into their regions. diff --git a/core/modules/book/book.module b/core/modules/book/book.module index ec8cf4c..567074b 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -180,6 +180,26 @@ function book_menu() { } /** + * Implements hook_default_menu_links(). + */ +function book_default_menu_links() { + $links['admin.structure.book'] = array( + 'link_title' => 'Books', + 'description' => "Manage your site's book outlines.", + 'parent' => 'admin.structure', + 'route_name' => 'book.admin', + ); + $links['book'] = array( + 'link_title' => 'Books', + 'route_name' => 'book.render', + // @TODO what to do about MENU_SUGGESTED_ITEM, maybe specify no menu_name? + 'type' => MENU_SUGGESTED_ITEM, + ); + + return $links; +} + +/** * Implements hook_admin_paths(). */ function book_admin_paths() { @@ -648,7 +668,7 @@ function template_preprocess_book_navigation(&$variables) { $build = array(); if ($prev = book_prev($book_link)) { - $prev_href = url($prev['href']); + $prev_href = url($prev['link_path']); $build['#attached']['drupal_add_html_head_link'][][] = array( 'rel' => 'prev', 'href' => $prev_href, @@ -668,7 +688,7 @@ function template_preprocess_book_navigation(&$variables) { } if ($next = book_next($book_link)) { - $next_href = url($next['href']); + $next_href = url($next['link_path']); $build['#attached']['drupal_add_html_head_link'][][] = array( 'rel' => 'next', 'href' => $next_href, diff --git a/core/modules/book/lib/Drupal/book/BookManager.php b/core/modules/book/lib/Drupal/book/BookManager.php index 9b415a8..01ae283 100644 --- a/core/modules/book/lib/Drupal/book/BookManager.php +++ b/core/modules/book/lib/Drupal/book/BookManager.php @@ -131,7 +131,7 @@ public function getLinkDefaults($nid) { 'menu_name' => '', 'nid' => $nid, 'bid' => 0, - 'router_path' => 'node/%', + 'link_path' => 'node/%', 'plid' => 0, 'mlid' => 0, 'has_children' => 0, @@ -211,7 +211,7 @@ public function addFormElements(array $form, array &$form_state, NodeInterface $ ), '#tree' => TRUE, ); - foreach (array('menu_name', 'mlid', 'nid', 'router_path', 'has_children', 'options', 'module', 'original_bid', 'parent_depth_limit') as $key) { + foreach (array('menu_name', 'mlid', 'nid', 'link_path', 'has_children', 'options', 'module', 'original_bid', 'parent_depth_limit') as $key) { $form['book'][$key] = array( '#type' => 'value', '#value' => $node->book[$key], @@ -660,7 +660,7 @@ public function bookTreeOutput(array $tree) { $element['#theme'] = 'menu_link__' . strtr($data['link']['menu_name'], '-', '_'); $element['#attributes']['class'] = $class; $element['#title'] = $data['link']['title']; - $element['#href'] = $data['link']['href']; + $element['#href'] = $data['link']['link_path']; $element['#localized_options'] = !empty($data['link']['localized_options']) ? $data['link']['localized_options'] : array(); $element['#below'] = $data['below'] ? $this->bookTreeOutput($data['below']) : $data['below']; $element['#original_link'] = $data['link']; diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 1491817..cd8f973 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -203,6 +203,20 @@ function comment_menu() { } /** + * Implements hook_default_menu_links(). + */ +function comment_default_menu_links() { + $links['admin.content.comment'] = array( + 'link_title' => 'Comments', + 'route_name' => 'comment.admin', + 'parent' => 'admin.content', + 'description' => 'List and edit site comments and the comment approval queue.', + ); + + return $links; +} + +/** * Implements hook_menu_alter(). */ function comment_menu_alter(&$items) { diff --git a/core/modules/config/config.module b/core/modules/config/config.module index 76deec4..aee4c8d 100644 --- a/core/modules/config/config.module +++ b/core/modules/config/config.module @@ -69,3 +69,17 @@ function config_menu() { return $items; } + +/** + * Implements hook_default_menu_links(). + */ +function config_default_menu_links() { + $links['admin.config.development.configuration'] = array( + 'link_title' => 'Configuration management', + 'description' => 'Import, export, or synchronize your site configuration.', + 'route_name' => 'config.sync', + 'parent' => 'admin.config.development', + ); + + return $links; +} diff --git a/core/modules/config/tests/config_test/config_test.routing.yml b/core/modules/config/tests/config_test/config_test.routing.yml index 7b973ab..cc81bc3 100644 --- a/core/modules/config/tests/config_test/config_test.routing.yml +++ b/core/modules/config/tests/config_test/config_test.routing.yml @@ -2,6 +2,7 @@ config_test.list_page: path: '/admin/structure/config_test' defaults: _entity_list: 'config_test' + _title: 'Test configuration' requirements: _access: 'TRUE' diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module index 0fc1170..efb4110 100644 --- a/core/modules/config_translation/config_translation.module +++ b/core/modules/config_translation/config_translation.module @@ -46,6 +46,21 @@ function config_translation_menu() { } /** + * Implements hook_default_menu_links(). + */ +function config_translation_default_menu_links() { + $links['admin.config.regional.config-translation'] = array( + 'link_title' => 'Configuration translation', + 'parent' => 'admin.config.regional', + 'description' => 'Translate the configuration.', + 'route_name' => 'config_translation.mapper_list', + 'weight' => 30, + ); + + return $links; +} + +/** * Implements hook_permission(). */ function config_translation_permission() { diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index 9b06fd9..e566f22 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -80,6 +80,26 @@ function contact_menu() { } /** + * Implements hook_default_menu_links(). + */ +function contact_default_menu_links() { + $links['admin.structure.contact'] = array( + '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', + ); + + $links['contact'] = array( + 'link_title' => 'Contact', + 'route_name' => 'contact.site_page', + 'menu_name' => 'footer', + 'type' => MENU_SUGGESTED_ITEM, + ); + return $links; +} + +/** * Implements hook_entity_bundle_info(). */ function contact_entity_bundle_info() { diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 0d476cb..5dbfed4 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -262,6 +262,15 @@ function content_translation_menu_alter(array &$items) { } /** + * Implements hook_default_menu_links_alter(). + */ +function content_translation_default_menu_links_alter(array &$links) { + // Clarify where translation settings are located. + $items['admin.config.regional.language.content_settings_page']['link_title'] = 'Content language and translation'; + $items['admin.config.regional.language.content_settings_page']['description'] = 'Configure language and translation support for content.'; +} + +/** * Implements hook_local_tasks_alter(). */ function content_translation_local_tasks_alter(&$local_tasks) { diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index 0f269b0..3abe865 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -73,6 +73,42 @@ function dblog_menu() { } /** + * Implements hook_default_menu_links(). + */ +function dblog_default_menu_links() { + $links['admin.reports.dblog'] = array( + 'link_title' => 'Recent log messages', + 'parent' => 'admin.reports', + 'description' => 'View events that have recently been logged.', + 'route_name' => 'dblog.overview', + 'weight' => -1, + ); + $links['admin.reports.page-not-found'] = array( + 'link_title' => "Top 'page not found' errors", + '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", + 'route_name' => 'dblog.access_denied', + 'description' => "View 'access denied' errors (403s).", + 'parent' => 'admin.reports', + ); + + if (\Drupal::moduleHandler()->moduleExists('search')) { + $links['admin.reports.search'] = array( + 'link_title' => 'Top search phrases', + 'route_name' => 'dblog.search', + 'description' => 'View most popular search phrases.', + 'parent' => 'admin.reports', + ); + } + + return $links; +} + +/** * Implements hook_page_build(). */ function dblog_page_build(&$page) { diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module index affe711..eb52c09 100644 --- a/core/modules/editor/editor.module +++ b/core/modules/editor/editor.module @@ -47,6 +47,14 @@ function editor_menu_alter(&$items) { } /** + * Implements hook_default_menu_links_alter(). + */ +function editor_default_menu_links_alter(array &$links) { + $links['admin.config.content.formats']['link_title'] = 'Text formats and editors'; + $links['admin.config.content.formats']['description'] = 'Configure how user-contributed content is filtered and formatted, as well as the text editor user interface (WYSIWYGs or toolbars).'; +} + +/** * Implements hook_element_info(). * * Extends the functionality of text_format elements (provided by Filter diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module index e838be5..d1289c4 100644 --- a/core/modules/entity/entity.module +++ b/core/modules/entity/entity.module @@ -96,6 +96,36 @@ function entity_menu() { } /** + * Implements hook_default_menu_links(). + */ +function entity_default_menu_links() { + $links['admin.structure.display_modes'] = array( + 'link_title' => 'Display modes', + 'description' => 'Configure what displays are available for your content and forms.', + 'route_name' => 'entity.display_mode', + 'parent' => 'admin.structure', + ); + + // View modes. + $links['admin.structure.display_modes.view'] = array( + 'link_title' => 'View modes', + 'description' => 'Manage custom view modes.', + 'route_name' => 'entity.view_mode_list', + 'parent' => 'admin.structure.display_modes', + ); + + // Form modes. + $links['admin.structure.display_modes.form'] = array( + 'link_title' => 'Form modes', + 'description' => 'Manage custom form modes.', + 'route_name' => 'entity.form_mode_list', + 'parent' => 'admin.structure.display_modes', + ); + + return $links; +} + +/** * Implements hook_entity_bundle_rename(). */ function entity_entity_bundle_rename($entity_type, $bundle_old, $bundle_new) { diff --git a/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php b/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php index eb0e641..523ef0f 100644 --- a/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php +++ b/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php @@ -54,7 +54,7 @@ public function viewModeTypeSelection() { if ($entity_info['fieldable'] && isset($entity_info['controllers']['view_builder'])) { $entity_types[$entity_type] = array( 'title' => $entity_info['label'], - 'href' => 'admin/structure/display-modes/view/add/' . $entity_type, + 'link_path' => 'admin/structure/display-modes/view/add/' . $entity_type, 'localized_options' => array(), ); } @@ -77,7 +77,7 @@ public function formModeTypeSelection() { if ($entity_info['fieldable'] && isset($entity_info['controllers']['form'])) { $entity_types[$entity_type] = array( 'title' => $entity_info['label'], - 'href' => 'admin/structure/display-modes/form/add/' . $entity_type, + 'link_path' => 'admin/structure/display-modes/form/add/' . $entity_type, 'localized_options' => array(), ); } diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index 2033cf6..a6085b4 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -66,6 +66,20 @@ function field_ui_menu() { } /** + * Implements hook_default_menu_links(). + */ +function field_ui_default_menu_links() { + $links['admin.reports.fields'] = array( + 'link_title' => 'Field list', + 'description' => 'Overview of fields on all entity types.', + 'route_name' => 'field_ui.list', + 'parent' => 'admin.reports', + ); + + return $links; +} + +/** * Implements hook_permission(). */ function field_ui_permission() { diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 4962044..0b37395 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -149,6 +149,26 @@ function filter_menu() { } /** + * Implements hook_default_menu_links(). + */ +function filter_default_menu_links() { + $links['filter.tips'] = array( + 'link_title' => 'Compose tips', + 'type' => MENU_SUGGESTED_ITEM, + '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', + ); + + return $links; +} + +/** * Implements hook_permission(). */ function filter_permission() { diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 95ebe76..19f437e 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -135,6 +135,24 @@ function forum_menu() { } /** + * Implements hook_default_menu_links(). + */ +function forum_default_menu_links() { + $items['forum'] = array( + 'link_title' => 'Forums', + 'route_name' => 'forum.index', + 'menu_name' => 'tools', + ); + $items['admin.structure.forum'] = array( + 'link_title' => 'Forums', + 'parent' => 'admin.structure', + 'description' => 'Control forum hierarchy settings.', + 'route_name' => 'forum.overview', + ); + return $items; +} + +/** * Implements hook_menu_local_tasks(). */ function forum_menu_local_tasks(&$data, $route_name) { diff --git a/core/modules/forum/forum.routing.yml b/core/modules/forum/forum.routing.yml index 3a0b6b9..aa21336 100644 --- a/core/modules/forum/forum.routing.yml +++ b/core/modules/forum/forum.routing.yml @@ -26,6 +26,7 @@ forum.page: path: '/forum/{taxonomy_term}' defaults: _content: '\Drupal\forum\Controller\ForumController::forumPage' + _title_callback: '\Drupal\taxonomy\Controller\TaxonomyController::termTitle' requirements: _permission: 'access content' diff --git a/core/modules/help/help.module b/core/modules/help/help.module index 9ccef10..4388d94 100644 --- a/core/modules/help/help.module +++ b/core/modules/help/help.module @@ -25,6 +25,21 @@ function help_menu() { } /** + * Implements hook_default_menu_links(). + */ +function help_default_menu_links() { + $links['admin.help'] = array( + 'link_title' => 'Help', + 'description' => 'Reference for usage, configuration, and modules.', + 'route_name' => 'help.main', + 'weight' => 9, + 'parent' => 'admin', + ); + + return $links; +} + +/** * Implements hook_help(). */ function help_help($path, $arg) { diff --git a/core/modules/image/image.module b/core/modules/image/image.module index d74c1ea..402da43 100644 --- a/core/modules/image/image.module +++ b/core/modules/image/image.module @@ -120,6 +120,20 @@ function image_menu() { } /** + * Implements hook_default_menu_links(). + */ +function image_default_menu_links() { + $links['admin.config.media.image-styles'] = array( + 'link_title' => 'Image styles', + 'description' => 'Configure styles that can be used for resizing or adjusting images on display.', + 'parent' => 'admin.config.media', + 'route_name' => 'image.style_list', + ); + + return $links; +} + +/** * Implements hook_theme(). */ function image_theme() { diff --git a/core/modules/language/language.module b/core/modules/language/language.module index b0dd216..bd673a8 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -86,6 +86,30 @@ function language_menu() { } /** + * Implements hook_default_menu_links(). + */ +function language_default_menu_links() { + // Base language management and configuration. + $links['admin.config.regional.language.admin_overview'] = array( + 'link_title' => 'Languages', + 'description' => 'Configure languages for content and the user interface.', + 'route_name' => 'language.admin_overview', + 'parent' => 'admin.config.regional', + 'weight' => 0, + ); + // Content language settings. + $links['admin.config.regional.language.content_settings_page'] = array( + 'link_title' => 'Content language', + 'description' => 'Configure language support for content.', + 'route_name' => 'language.content_settings_page', + 'parent' => 'admin.config.regional', + 'weight' => 0, + ); + + return $links; +} + +/** * Editing or deleting locked languages should not be possible. * * @deprecated Use \Drupal\language\LanguageAccessController instead. diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index e9b539c..d3950ad 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -187,6 +187,29 @@ function locale_menu() { } /** + * Implements hook_default_menu_links(). + */ +function locale_default_menu_links() { + // Translation functionality. + $links['admin.config.regional.translate'] = array( + 'link_title' => 'User interface translation', + 'description' => 'Translate the built-in user interface.', + 'route_name' => 'locale.translate_page', + 'parent' => 'admin.config.regional', + 'weight' => 15, + ); + + $links['admin.reports.translations'] = array( + 'link_title' => 'Available translation updates', + 'route_name' => 'locale.translate_status', + 'description' => 'Get a status report about available interface translations for your installed modules and themes.', + 'parent' => 'admin.reports', + ); + + return $links; +} + +/** * Implements hook_permission(). */ function locale_permission() { diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php index 35d074d..57e45c1 100644 --- a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php +++ b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php @@ -105,8 +105,8 @@ public function submit(array $form, array &$form_state) { } // Reset all the menu links defined by the system via hook_menu(). - // @todo Convert this to an EFQ once we figure out 'ORDER BY m.number_parts'. - $result = $this->connection->query("SELECT mlid FROM {menu_links} ml INNER JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.menu_name = :menu AND ml.module = 'system' ORDER BY m.number_parts ASC", array(':menu' => $this->entity->id()), array('fetch' => \PDO::FETCH_ASSOC))->fetchCol(); + // @todo Convert this to an EFQ. + $result = $this->connection->query("SELECT mlid FROM {menu_links} WHERE menu_name = :menu AND module = 'system' ORDER BY depth ASC", array(':menu' => $this->entity->id()), array('fetch' => \PDO::FETCH_ASSOC))->fetchCol(); $menu_links = $this->storageController->loadMultiple($result); foreach ($menu_links as $link) { $link->reset(); diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php index f4f9e53..aad0c4b 100644 --- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php +++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php @@ -700,7 +700,7 @@ private function getStandardMenuLink() { // the front page. $query = \Drupal::entityQuery('menu_link') ->condition('module', 'system') - ->condition('router_path', 'user/logout'); + ->condition('link_path', 'user/logout'); $result = $query->execute(); if (!empty($result)) { $mlid = reset($result); diff --git a/core/modules/menu/menu.install b/core/modules/menu/menu.install index b7dc67d..8c0c9fc 100644 --- a/core/modules/menu/menu.install +++ b/core/modules/menu/menu.install @@ -14,12 +14,13 @@ function menu_install() { // Add a link for each custom menu. \Drupal::service('router.builder')->rebuild(); menu_router_rebuild(); + menu_default_links_rebuild(); $system_link = entity_load_multiple_by_properties('menu_link', array('link_path' => 'admin/structure/menu', 'module' => 'system')); $system_link = reset($system_link); $base_link = entity_create('menu_link', array( 'menu_name' => $system_link->menu_name, - 'router_path' => 'admin/structure/menu/manage/%', + 'link_path' => 'admin/structure/menu/manage/%', 'module' => 'menu', )); diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index 7fce53c..31226b3 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -93,6 +93,19 @@ function menu_menu() { } /** + * Implements hook_default_menu_links(). + */ +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', + 'parent' => 'admin.structure', + ); + return $links; +} + +/** * Implements hook_entity_info(). */ function menu_entity_info(&$entity_info) { diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php index 64340e0..28da49e 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php @@ -68,6 +68,13 @@ class MenuLink extends Entity implements \ArrayAccess, MenuLinkInterface { public $mlid; /** + * An optional machine name if defined via hook_default_menu_links(). + * + * @var string + */ + public $machine_name; + + /** * The menu link UUID. * * @var string @@ -256,7 +263,7 @@ class MenuLink extends Entity implements \ArrayAccess, MenuLinkInterface { * * @var array */ - public $route_parameters; + public $route_parameters = array(); /** * The route object associated with this menu link, if any. @@ -364,13 +371,15 @@ public function setRouteObject(Route $route) { */ public function reset() { // To reset the link to its original values, we need to retrieve its - // definition from hook_menu(). Otherwise, for example, the link's menu - // would not be reset, because properties like the original 'menu_name' are - // not stored anywhere else. Since resetting a link happens rarely and this - // is a one-time operation, retrieving the full menu router does no harm. - $menu = menu_get_router(); - $router_item = $menu[$this->router_path]; - $new_link = self::buildFromRouterItem($router_item); + // definition from hook_default_menu_links(). Otherwise, for example, the + // link's menu would not be reset, because properties like the original + // 'menu_name' are not stored anywhere else. Since resetting a link happens + // rarely and this is a one-time operation, retrieving the full menu router + // does little harm. + // @todo Decide whether we want to keep the reset functionality. + $all_links = menu_get_default_links(); + $original = $all_links[$this->machine_name]; + $new_link = self::buildFromRouterItem($original); // Merge existing menu link's ID and 'has_children' property. foreach (array('mlid', 'has_children') as $key) { $new_link->{$key} = $this->{$key}; @@ -381,24 +390,23 @@ public function reset() { /** * {@inheritdoc} + * + * This function should only be called for link data from + * hook_default_menu_links(). */ public static function buildFromRouterItem(array $item) { // Suggested items are disabled by default. + $item += array( + 'type' => MENU_NORMAL_ITEM, + 'hidden' => 0, + 'options' => empty($item['description']) ? array() : array('attributes' => array('title' => $item['description'])), + ); if ($item['type'] == MENU_SUGGESTED_ITEM) { $item['hidden'] = 1; } - // Hide all items that are not visible in the tree. - elseif (!($item['type'] & MENU_VISIBLE_IN_TREE)) { - $item['hidden'] = -1; - } // Note, we set this as 'system', so that we can be sure to distinguish all // the menu links generated automatically from entries in {menu_router}. $item['module'] = 'system'; - $item += array( - 'link_title' => $item['title'], - 'link_path' => $item['path'], - 'options' => empty($item['description']) ? array() : array('attributes' => array('title' => $item['description'])), - ); return \Drupal::entityManager() ->getStorageController('menu_link')->create($item); } @@ -490,8 +498,7 @@ public function preSave(EntityStorageControllerInterface $storage_controller) { $this->external = (url_is_external($this->link_path) || $this->link_path == '') ? 1 : 0; // Try to find a parent link. If found, assign it and derive its menu. - $parent_candidates = !empty($this->parentCandidates) ? $this->parentCandidates : array(); - $parent = $this->findParent($storage_controller, $parent_candidates); + $parent = $this->findParent($storage_controller); if ($parent) { $this->plid = $parent->id(); $this->menu_name = $parent->menu_name; @@ -530,17 +537,7 @@ public function preSave(EntityStorageControllerInterface $storage_controller) { if (isset($this->original) && ($this->plid != $this->original->plid || $this->menu_name != $this->original->menu_name)) { $storage_controller->moveChildren($this); } - // Find the router_path. - if (empty($this->router_path) || empty($this->original) || (isset($this->original) && $this->original->link_path != $this->link_path)) { - if ($this->external) { - $this->router_path = ''; - } - else { - // Find the router path which will serve this path. - $this->parts = explode('/', $this->link_path, MENU_MAX_PARTS); - $this->router_path = _menu_find_router_path($this->link_path); - } - } + // Find the route_name. if (!isset($this->route_name)) { if ($result = \Drupal::service('router.matcher.final_matcher')->findRouteNameParameters($this->link_path)) { @@ -551,6 +548,9 @@ public function preSave(EntityStorageControllerInterface $storage_controller) { $this->route_parameters = array(); } } + elseif (empty($this->link_path)) { + $this->link_path = \Drupal::urlGenerator()->getPathFromRoute($this->route_name, $this->route_parameters); + } } /** @@ -582,9 +582,6 @@ public static function postLoad(EntityStorageControllerInterface $storage_contro $menu_link->options = unserialize($menu_link->options); $menu_link->route_parameters = unserialize($menu_link->route_parameters); - // Use the weight property from the menu link. - $menu_link->router_item['weight'] = $menu_link->weight; - // By default use the menu_name as type. $menu_link->bundle = $menu_link->menu_name; @@ -610,7 +607,7 @@ public static function postLoad(EntityStorageControllerInterface $storage_contro /** * {@inheritdoc} */ - public function setParents(EntityInterface $parent) { + protected function setParents(MenuLinkInterface $parent) { $i = 1; while ($i < $this->depth) { $p = 'p' . $i++; @@ -628,7 +625,7 @@ public function setParents(EntityInterface $parent) { /** * {@inheritdoc} */ - public function findParent(EntityStorageControllerInterface $storage_controller, array $parent_candidates = array()) { + protected function findParent(EntityStorageControllerInterface $storage_controller) { $parent = FALSE; // This item is explicitely top-level, skip the rest of the parenting. @@ -651,26 +648,29 @@ public function findParent(EntityStorageControllerInterface $storage_controller, } foreach ($candidates as $mlid) { - if (isset($parent_candidates[$mlid])) { - $parent = $parent_candidates[$mlid]; - } - else { - $parent = $storage_controller->load($mlid); - } + $parent = $storage_controller->load($mlid); if ($parent) { - return $parent; + break; } } - - // If everything else failed, try to derive the parent from the path - // hierarchy. This only makes sense for links derived from menu router - // items (ie. from hook_menu()). - if ($this->module == 'system') { - $parent = $storage_controller->getParentFromHierarchy($this); - } - return $parent; } - + /** + * Builds and returns the renderable array for this menu link. + * + * @return array + * A renderable array representing the content of the link. + */ + public function build() { + $build = array( + '#type' => 'link', + '#title' => $this->title, + '#href' => $this->href, + '#route_name' => $this->route_name ? $this->route_name : NULL, + '#route_parameters' => $this->route_parameters, + '#options' => !empty($this->localized_options) ? $this->localized_options : array(), + ); + return $build; + } } diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php index d81b1f7..9ecb321 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php @@ -2,15 +2,13 @@ /** * @file - * Contains \Drupal\menu_link\Entity\MenuLinkInterface. + * Contains \Drupal\menu_link\MenuLinkInterface. */ namespace Drupal\menu_link; -use Symfony\Component\Routing\Route; -use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Entity\EntityStorageControllerInterface; +use Symfony\Component\Routing\Route; /** * Provides an interface defining a menu link entity. @@ -39,49 +37,9 @@ public function setRouteObject(Route $route); /** * Resets a system-defined menu link. * - * @return \Drupal\Core\Entity\EntityInterface - * A menu link entity. - */ - public function reset(); - - /** - * Builds a menu link entity from a router item. - * - * @param array $item - * A menu router item. - * * @return \Drupal\menu_link\MenuLinkInterface * A menu link entity. */ - public static function buildFromRouterItem(array $item); - - /** - * Sets the p1 through p9 properties for a menu link entity being saved. - * - * @param \Drupal\Core\Entity\EntityInterface $parent - * A menu link entity. - */ - public function setParents(EntityInterface $parent); + public function reset(); - /** - * Finds a possible parent for a given menu link entity. - * - * Because the parent of a given link might not exist anymore in the database, - * we apply a set of heuristics to determine a proper parent: - * - * - use the passed parent link if specified and existing. - * - else, use the first existing link down the previous link hierarchy - * - else, for system menu links (derived from hook_menu()), reparent - * based on the path hierarchy. - * - * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller - * Storage controller object. - * @param array $parent_candidates - * An array of menu link entities keyed by mlid. - * - * @return \Drupal\Core\Entity\EntityInterface|false - * A menu link entity structure of the possible parent or FALSE if no valid - * parent has been found. - */ - public function findParent(EntityStorageControllerInterface $storage_controller, array $parent_candidates = array()); } diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php index 9744718..f59b6e7 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php @@ -25,18 +25,18 @@ class MenuLinkStorageController extends DatabaseStorageController implements MenuLinkStorageControllerInterface { /** - * Indicates whether the delete operation should re-parent children items. + * Contains all {menu_router} fields without weight. * - * @var bool + * @var array */ - protected $preventReparenting = FALSE; + protected static $routerItemFields; /** - * Holds an array of router item schema fields. + * Indicates whether the delete operation should re-parent children items. * - * @var array + * @var bool */ - protected static $routerItemFields = array(); + protected $preventReparenting = FALSE; /** * The route provider service. @@ -100,7 +100,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ protected function buildQuery($ids, $revision_id = FALSE) { $query = parent::buildQuery($ids, $revision_id); // Specify additional fields from the {menu_router} table. - $query->leftJoin('menu_router', 'm', 'base.router_path = m.path'); + $query->leftJoin('menu_router', 'm', 'base.link_path = m.path'); $query->fields('m', static::$routerItemFields); return $query; } @@ -188,32 +188,6 @@ public function getPreventReparenting() { /** * {@inheritdoc} */ - public function loadUpdatedCustomized(array $router_paths) { - $query = parent::buildQuery(NULL); - $query - ->condition(db_or() - ->condition('updated', 1) - ->condition(db_and() - ->condition('router_path', $router_paths, 'NOT IN') - ->condition('external', 0) - ->condition('customized', 1) - ) - ); - $query_result = $query->execute(); - - if (!empty($this->entityInfo['class'])) { - // We provide the necessary arguments for PDO to create objects of the - // specified entity class. - // @see \Drupal\Core\Entity\EntityInterface::__construct() - $query_result->setFetchMode(\PDO::FETCH_CLASS, $this->entityInfo['class'], array(array(), $this->entityType)); - } - - return $query_result->fetchAllAssoc($this->idKey); - } - - /** - * {@inheritdoc} - */ public function loadModuleAdminTasks() { $query = $this->buildQuery(NULL); $query diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php index 3fb408f..6fad76d 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php @@ -34,20 +34,6 @@ public function setPreventReparenting($value = FALSE); public function getPreventReparenting(); /** - * Loads updated and customized menu links for specific router paths. - * - * Note that this is a low-level method and it doesn't return fully populated - * menu link entities. (e.g. no fields are attached) - * - * @param array $router_paths - * An array of router paths. - * - * @return array - * An array of menu link objects indexed by their ids. - */ - public function loadUpdatedCustomized(array $router_paths); - - /** * Loads system menu link as needed by system_get_module_admin_tasks(). * * @return array diff --git a/core/modules/menu_link/menu_link.api.php b/core/modules/menu_link/menu_link.api.php index 197aee8..2541eb5 100644 --- a/core/modules/menu_link/menu_link.api.php +++ b/core/modules/menu_link/menu_link.api.php @@ -14,11 +14,10 @@ * Alter a menu link after it has been translated and before it is rendered. * * This hook is invoked from _menu_link_translate() after a menu link has been - * translated; i.e., after dynamic path argument placeholders (%) have been - * replaced with actual values, the user access to the link's target page has - * been checked, and the link has been localized. It is only invoked if - * $menu_link['options']['alter'] has been set to a non-empty value (e.g. TRUE). - * This flag should be set using hook_menu_link_presave(). + * translated; i.e., after the user access to the link's target page has + * been checked. It is only invoked if $menu_link['options']['alter'] has been + * set to a non-empty value (e.g. TRUE). This flag should be set using + * hook_menu_link_presave(). * * Implementations of this hook are able to alter any property of the menu link. * For example, this hook may be used to add a page-specific query string to all @@ -29,8 +28,6 @@ * * @param \Drupal\menu_link\Entity\MenuLink $menu_link * A menu link entity. - * @param array $map - * Associative array containing the menu $map (path parts and/or objects). * * @see hook_menu_link_alter() */ diff --git a/core/modules/menu_link/menu_link.install b/core/modules/menu_link/menu_link.install index 976653f..c789d34 100644 --- a/core/modules/menu_link/menu_link.install +++ b/core/modules/menu_link/menu_link.install @@ -31,6 +31,12 @@ function menu_link_schema() { 'length' => 128, 'not null' => FALSE, ), + 'machine_name' => array( + 'description' => 'Unique machine name: Optional human-readable ID for this link.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => FALSE, + ), 'plid' => array( 'description' => 'The parent link ID (plid) is the mlid of the link above in the hierarchy, or zero if the link is at the top level in its menu.', 'type' => 'int', @@ -45,13 +51,6 @@ function menu_link_schema() { 'not null' => TRUE, 'default' => '', ), - 'router_path' => array( - 'description' => 'For links corresponding to a Drupal path (external = 0), this connects the link to a {menu_router}.path for joins.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - ), 'langcode' => array( 'description' => 'The {language}.langcode of this link.', 'type' => 'varchar', @@ -60,7 +59,7 @@ function menu_link_schema() { 'default' => '', ), 'link_title' => array( - 'description' => 'The text displayed for the link, which may be modified by a title callback stored in {menu_router}.', + 'description' => 'The text displayed for the link.', 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, @@ -214,7 +213,6 @@ function menu_link_schema() { 'path_menu' => array(array('link_path', 128), 'menu_name'), 'menu_plid_expand_child' => array('menu_name', 'plid', 'expanded', 'has_children'), 'menu_parents' => array('menu_name', 'p1', 'p2', 'p3', 'p4', 'p5', 'p6', 'p7', 'p8', 'p9'), - 'router_path' => array(array('router_path', 128)), ), 'primary key' => array('mlid'), ); diff --git a/core/modules/node/node.module b/core/modules/node/node.module index a850c8a..693d9cb 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -1021,6 +1021,30 @@ function node_menu() { } /** + * Implements hook_default_menu_links(). + */ +function node_default_menu_links() { + $links['admin.content'] = array( + 'link_title' => 'Content', + 'route_name' => 'node.content_overview', + 'parent' => 'admin', + 'description' => 'Find and manage content.', + ); + + $links['admin.structure.types'] = array( + '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', + ); + $links['node.add'] = array( + 'link_title' => 'Add content', + 'route_name' => 'node.add_page', + ); + return $links; +} + +/** * Implements hook_menu_local_tasks(). */ function node_menu_local_tasks(&$data, $route_name) { diff --git a/core/modules/path/path.module b/core/modules/path/path.module index 8e96610..052ddf0 100644 --- a/core/modules/path/path.module +++ b/core/modules/path/path.module @@ -76,6 +76,21 @@ function path_menu() { } /** + * Implements hook_default_menu_links(). + */ +function path_default_menu_links() { + $links['admin.config.search.path'] = array( + 'link_title' => 'URL aliases', + 'description' => "Change your site's URL paths by aliasing them.", + 'route_name' => 'path.admin_overview', + 'parent' => 'admin.config.search', + 'weight' => -5, + ); + + return $links; +} + +/** * Implements hook_form_BASE_FORM_ID_alter() for node_form(). * * @see path_form_element_validate() diff --git a/core/modules/picture/picture.module b/core/modules/picture/picture.module index 72f52a5..3c63742 100644 --- a/core/modules/picture/picture.module +++ b/core/modules/picture/picture.module @@ -72,6 +72,21 @@ function picture_menu() { } /** + * Implements hook_default_menu_links(). + */ +function picture_default_menu_links() { + $links['admin.config.media.picturemapping'] = array( + 'link_title' => 'Picture Mappings', + 'description' => 'Manage picture mappings', + 'weight' => 10, + 'route_name' => 'picture.mapping_page', + 'parent' => 'admin.config.media', + ); + + return $links; +} + +/** * Implements hook_library_info(). */ function picture_library_info() { diff --git a/core/modules/search/search.module b/core/modules/search/search.module index ca160bf..7075d41 100644 --- a/core/modules/search/search.module +++ b/core/modules/search/search.module @@ -171,6 +171,26 @@ function search_menu() { } /** + * Implements hook_default_menu_links(). + */ +function search_default_menu_links() { + $links['search'] = array( + 'link_title' => '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', + 'weight' => -10, + ); + + return $links; +} + +/** * Returns information about the default search plugin. * * @return array diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index 8c7c869..dc6bd6f 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -87,6 +87,20 @@ function shortcut_menu() { } /** + * Implements hook_default_menu_links(). + */ +function shortcut_default_menu_links() { + $links['admin.config.user-interface.shortcut'] = array( + 'link_title' => 'Shortcuts', + 'description' => 'Add and modify shortcut sets.', + 'route_name' => 'shortcut.set_admin', + 'parent' => 'admin.config.user-interface', + ); + + return $links; +} + +/** * Implements hook_admin_paths(). */ function shortcut_admin_paths() { diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index bd50676..64ca620 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -47,6 +47,21 @@ function simpletest_menu() { } /** + * Implements hook_default_menu_links(). + */ +function simpletest_default_menu_links() { + $links['admin.config.development.testing'] = array( + 'link_title' => 'Testing', + 'description' => 'Run tests against Drupal core and your modules. These tests help assure that your site code is working as designed.', + 'route_name' => 'simpletest.test_form', + 'parent' => 'admin.config.development', + 'weight' => -5, + ); + + return $links; +} + +/** * Implements hook_permission(). */ function simpletest_permission() { diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module index a5fad17..523ee70 100644 --- a/core/modules/statistics/statistics.module +++ b/core/modules/statistics/statistics.module @@ -86,13 +86,26 @@ function statistics_menu() { 'title' => 'Statistics', 'description' => 'Control details about what and how your site logs content statistics.', 'route_name' => 'statistics.settings', - 'access arguments' => array('administer statistics'), 'weight' => -15, ); return $items; } /** + * Implements hook_default_menu_links(). + */ +function statistics_default_menu_links() { + $links['admin.config.system.statistics'] = array( + 'link_title' => 'Statistics', + 'description' => 'Control details about what and how your site logs content statistics.', + 'route_name' => 'statistics.settings', + 'parent' => 'admin.config.system', + 'weight' => -15, + ); + return $links; +} + +/** * Implements hook_cron(). */ function statistics_cron() { diff --git a/core/modules/system/lib/Drupal/system/SystemManager.php b/core/modules/system/lib/Drupal/system/SystemManager.php index 07e8c0a..1fa6246 100644 --- a/core/modules/system/lib/Drupal/system/SystemManager.php +++ b/core/modules/system/lib/Drupal/system/SystemManager.php @@ -194,7 +194,7 @@ public function getAdminBlock($item) { } if (!isset($item['mlid'])) { - $menu_links = $this->menuLinkStorage->loadByProperties(array('router_path' => $item['path'], 'module' => 'system')); + $menu_links = $this->menuLinkStorage->loadByProperties(array('link_path' => $item['path'], 'module' => 'system')); $menu_link = reset($menu_links); $item['mlid'] = $menu_link->id(); $item['menu_name'] = $menu_link->menu_name; diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php index 9ab9103..6d7699a 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php @@ -338,10 +338,7 @@ function testBreadCrumbs() { $trail += array( 'user/' . $this->web_user->id() => $this->web_user->getUsername(), ); - $tree = array( - 'user' => t('My account'), - ); - $this->assertBreadcrumb('user/' . $this->web_user->id() . '/edit', $trail, $this->web_user->getUsername(), $tree); + $this->assertBreadcrumb('user/' . $this->web_user->id() . '/edit', $trail, $this->web_user->getUsername()); // Create an only slightly privileged user being able to access site reports // but not administration pages. diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php index bcf7c96..bb3b310 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php @@ -183,7 +183,7 @@ function testMenuLinkReparenting($module = 'menu_test') { } /** - * Test automatic reparenting of menu links derived from menu routers. + * Tests automatic reparenting of menu links derived from hook_default_menu_links. */ function testMenuLinkRouterReparenting() { // Run all the standard parenting tests on menu links derived from @@ -224,8 +224,7 @@ function testMenuLinkRouterReparenting() { $this->assertMenuLinkParents($links, $expected_hierarchy); // Now delete 'child-2' directly from the database, simulating a database - // crash. 'child-1-2' will get reparented under 'child-1' based on its - // path. + // crash. 'child-1-2' will get reparented to the top. // Don't do that at home. db_delete('menu_links') ->condition('mlid', $links['child-2']['mlid']) @@ -233,7 +232,7 @@ function testMenuLinkRouterReparenting() { $expected_hierarchy = array( 'child-1' => FALSE, 'child-1-1' => 'child-1', - 'child-1-2' => 'child-1', + 'child-1-2' => FALSE, ); $this->assertMenuLinkParents($links, $expected_hierarchy); } diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php index ccc327d..3c12903 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php @@ -62,10 +62,8 @@ function setUp() { */ public function testMenuIntegration() { $this->doTestTitleMenuCallback(); - $this->doTestMenuSetItem(); $this->doTestMenuOptionalPlaceholders(); $this->doTestMenuOnRoute(); - $this->doTestMenuHidden(); $this->doTestMenuGetItemNoAncestors(); $this->doTestMenuName(); $this->doTestMenuItemTitlesCases(); @@ -178,7 +176,7 @@ protected function doTestMenuName() { $admin_user = $this->drupalCreateUser(array('administer site configuration')); $this->drupalLogin($admin_user); - $menu_links = entity_load_multiple_by_properties('menu_link', array('router_path' => 'menu_name_test')); + $menu_links = entity_load_multiple_by_properties('menu_link', array('link_path' => 'menu_name_test')); $menu_link = reset($menu_links); $this->assertEqual($menu_link->menu_name, 'original', 'Menu name is "original".'); @@ -188,7 +186,7 @@ protected function doTestMenuName() { \Drupal::service('router.builder')->rebuild(); menu_router_rebuild(); - $menu_links = entity_load_multiple_by_properties('menu_link', array('router_path' => 'menu_name_test')); + $menu_links = entity_load_multiple_by_properties('menu_link', array('link_path' => 'menu_name_test')); $menu_link = reset($menu_links); $this->assertEqual($menu_link->menu_name, 'changed', 'Menu name was successfully changed after rebuild.'); } @@ -209,87 +207,6 @@ protected function doTestMenuHierarchy() { } /** - * Tests menu link depth and parents of local tasks and menu callbacks. - */ - protected function doTestMenuHidden() { - // Verify links for one dynamic argument. - $query = \Drupal::entityQuery('menu_link') - ->condition('router_path', 'menu-test/hidden/menu', 'STARTS_WITH') - ->sort('router_path'); - $result = $query->execute(); - $menu_links = menu_link_load_multiple($result); - - $links = array(); - foreach ($menu_links as $menu_link) { - $links[$menu_link->router_path] = $menu_link; - } - - $parent = $links['menu-test/hidden/menu']; - $depth = $parent['depth'] + 1; - $plid = $parent['mlid']; - - $link = $links['menu-test/hidden/menu/list']; - $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); - - $link = $links['menu-test/hidden/menu/settings']; - $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); - - $link = $links['menu-test/hidden/menu/manage/%']; - $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); - - $parent = $links['menu-test/hidden/menu/manage/%']; - $depth = $parent['depth'] + 1; - $plid = $parent['mlid']; - - $link = $links['menu-test/hidden/menu/manage/%/list']; - $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); - - $link = $links['menu-test/hidden/menu/manage/%/edit']; - $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); - - $link = $links['menu-test/hidden/menu/manage/%/delete']; - $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); - - // Verify links for two dynamic arguments. - $query = \Drupal::entityQuery('menu_link') - ->condition('router_path', 'menu-test/hidden/block', 'STARTS_WITH') - ->sort('router_path'); - $result = $query->execute(); - $menu_links = menu_link_load_multiple($result); - - $links = array(); - foreach ($menu_links as $menu_link) { - $links[$menu_link->router_path] = $menu_link; - } - - $parent = $links['menu-test/hidden/block']; - $depth = $parent['depth'] + 1; - $plid = $parent['mlid']; - - $link = $links['menu-test/hidden/block/list']; - $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); - - $link = $links['menu-test/hidden/block/manage/%/%']; - $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); - - $parent = $links['menu-test/hidden/block/manage/%/%']; - $depth = $parent['depth'] + 1; - $plid = $parent['mlid']; - - $link = $links['menu-test/hidden/block/manage/%/%/delete']; - $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); - } - - /** * Test menu_get_item() with empty ancestors. */ protected function doTestMenuGetItemNoAncestors() { @@ -298,23 +215,6 @@ protected function doTestMenuGetItemNoAncestors() { } /** - * Test menu_set_item(). - */ - protected function doTestMenuSetItem() { - $item = menu_get_item('test-page'); - - $this->assertEqual($item['path'], 'test-page', "Path from menu_get_item('test-page') is equal to 'test-page'", 'menu'); - - // Modify the path for the item then save it. - $item['path'] = 'test-page-test'; - $item['href'] = 'test-page-test'; - - menu_set_item('test-page', $item); - $compare_item = menu_get_item('test-page'); - $this->assertEqual($compare_item, $item, 'Modified menu item is equal to newly retrieved menu item.', 'menu'); - } - - /** * Test menu maintenance hooks. */ protected function doTestMenuItemHooks() { @@ -364,9 +264,8 @@ protected function doTestMenuItemTitlesCases() { // Build array with string overrides. $test_data = array( 1 => array('Example title - Case 1' => 'Alternative example title - Case 1'), - 2 => array('Example @sub1 - Case @op2' => 'Alternative example @sub1 - Case @op2'), + 2 => array('Example title' => 'Alternative example title'), 3 => array('Example title' => 'Alternative example title'), - 4 => array('Example title' => 'Alternative example title'), ); foreach ($test_data as $case_no => $override) { @@ -423,7 +322,6 @@ protected function doTestMenuOnRoute() { $this->assertLinkByHref('menu-title-test/case1'); $this->assertLinkByHref('menu-title-test/case2'); $this->assertLinkByHref('menu-title-test/case3'); - $this->assertLinkByHref('menu-title-test/case4'); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php deleted file mode 100644 index 409f3aa..0000000 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php +++ /dev/null @@ -1,136 +0,0 @@ - 'Active trail', - 'description' => 'Tests active menu trails and alteration functionality.', - 'group' => 'Menu', - ); - } - - function setUp() { - parent::setUp(); - - $this->admin_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'administer blocks')); - $this->drupalLogin($this->admin_user); - - // This test puts menu links in the Tools and Administration menus and then - // tests for their presence on the page. - $this->drupalPlaceBlock('system_menu_block:tools'); - $this->drupalPlaceBlock('system_menu_block:admin'); - } - - /** - * Tests that the active trail works correctly on custom 403 and 404 pages. - */ - function testCustom403And404Pages() { - // Set the custom 403 and 404 pages we will use. - \Drupal::config('system.site') - ->set('page.403', 'menu-test/custom-403-page') - ->set('page.404', 'menu-test/custom-404-page') - ->save(); - - // Define the paths we'll visit to trigger 403 and 404 responses during - // this test, and the expected active trail for each case. - $paths = array( - 403 => 'admin/config', - 404 => $this->randomName(), - ); - // For the 403 page, the initial trail during the Drupal bootstrap should - // include the page that the user is trying to visit, while the final trail - // should reflect the custom 403 page that the user was redirected to. - $expected_trail[403]['initial'] = array( - '' => 'Home', - 'admin/config' => 'Configuration', - ); - $expected_trail[403]['final'] = array( - '' => 'Home', - 'menu-test' => 'Menu test root', - 'menu-test/custom-403-page' => 'Custom 403 page', - ); - // For the 404 page, the initial trail during the Drupal bootstrap should - // only contain the link back to "Home" (since the page the user is trying - // to visit doesn't have any menu items associated with it), while the - // final trail should reflect the custom 404 page that the user was - // redirected to. - $expected_trail[404]['initial'] = array( - '' => 'Home', - ); - $expected_trail[404]['final'] = array( - '' => 'Home', - 'menu-test' => 'Menu test root', - 'menu-test/custom-404-page' => 'Custom 404 page', - ); - - // Visit each path as an anonymous user so that we will actually get a 403 - // on admin/config. - $this->drupalLogout(); - foreach (array(403, 404) as $status_code) { - // Before visiting the page, trigger the code in the menu_test module - // that will record the active trail (so we can check it in this test). - \Drupal::state()->set('menu_test.record_active_trail', TRUE); - $this->drupalGet($paths[$status_code]); - $this->assertResponse($status_code); - - // Check that the initial trail (during the Drupal bootstrap) matches - // what we expect. - $initial_trail = \Drupal::state()->get('menu_test.active_trail_initial') ?: array(); - $this->assertEqual(count($initial_trail), count($expected_trail[$status_code]['initial']), format_string('The initial active trail for a @status_code page contains the expected number of items (expected: @expected, found: @found).', array( - '@status_code' => $status_code, - '@expected' => count($expected_trail[$status_code]['initial']), - '@found' => count($initial_trail), - ))); - foreach (array_keys($expected_trail[$status_code]['initial']) as $index => $path) { - $this->assertEqual($initial_trail[$index]['href'], $path, format_string('Element number @number of the initial active trail for a @status_code page contains the correct path (expected: @expected, found: @found)', array( - '@number' => $index + 1, - '@status_code' => $status_code, - '@expected' => $path, - '@found' => $initial_trail[$index]['href'], - ))); - } - - // Check that the final trail (after the user has been redirected to the - // custom 403/404 page) matches what we expect. - $final_trail = \Drupal::state()->get('menu_test.active_trail_final') ?: array(); - $this->assertEqual(count($final_trail), count($expected_trail[$status_code]['final']), format_string('The final active trail for a @status_code page contains the expected number of items (expected: @expected, found: @found).', array( - '@status_code' => $status_code, - '@expected' => count($expected_trail[$status_code]['final']), - '@found' => count($final_trail), - ))); - foreach (array_keys($expected_trail[$status_code]['final']) as $index => $path) { - $this->assertEqual($final_trail[$index]['href'], $path, format_string('Element number @number of the final active trail for a @status_code page contains the correct path (expected: @expected, found: @found)', array( - '@number' => $index + 1, - '@status_code' => $status_code, - '@expected' => $path, - '@found' => $final_trail[$index]['href'], - ))); - } - - // Check that the breadcrumb displayed on the final custom 403/404 page - // matches what we expect. (The last item of the active trail represents - // the current page, which is not supposed to appear in the breadcrumb, - // so we need to remove it from the array before checking.) - array_pop($expected_trail[$status_code]['final']); - $this->assertBreadcrumb(NULL, $expected_trail[$status_code]['final']); - } - } -} diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php index 78a00aa..d692718 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php @@ -43,21 +43,21 @@ function testMenuTreeData() { // @todo Prettify this tree buildup code, it's very hard to read. $this->tree_data = array( '1'=> array( - 'link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 1, 'hidden' => 0, 'has_children' => 1, 'title' => 'Item 1', 'in_active_trail' => 1, 'access' => 1, 'href' => 'a', 'localized_options' => array('attributes' => array('title' =>'')))), + 'link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 1, 'hidden' => 0, 'has_children' => 1, 'title' => 'Item 1', 'in_active_trail' => 1, 'access' => 1, 'link_path' => 'a', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array( - '2' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 2, 'hidden' => 0, 'has_children' => 1, 'title' => 'Item 2', 'in_active_trail' => 1, 'access' => 1, 'href' => 'a/b', 'localized_options' => array('attributes' => array('title' =>'')))), + '2' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 2, 'hidden' => 0, 'has_children' => 1, 'title' => 'Item 2', 'in_active_trail' => 1, 'access' => 1, 'link_path' => 'a/b', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array( - '3' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 3, 'hidden' => 0, 'has_children' => 0, 'title' => 'Item 3', 'in_active_trail' => 0, 'access' => 1, 'href' => 'a/b/c', 'localized_options' => array('attributes' => array('title' =>'')))), + '3' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 3, 'hidden' => 0, 'has_children' => 0, 'title' => 'Item 3', 'in_active_trail' => 0, 'access' => 1, 'link_path' => 'a/b/c', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array() ), - '4' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 4, 'hidden' => 0, 'has_children' => 0, 'title' => 'Item 4', 'in_active_trail' => 0, 'access' => 1, 'href' => 'a/b/d', 'localized_options' => array('attributes' => array('title' =>'')))), + '4' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 4, 'hidden' => 0, 'has_children' => 0, 'title' => 'Item 4', 'in_active_trail' => 0, 'access' => 1, 'link_path' => 'a/b/d', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array() ) ) ) ) ), - '5' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 5, 'hidden' => 1, 'has_children' => 0, 'title' => 'Item 5', 'in_active_trail' => 0, 'access' => 1, 'href' => 'e', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array()), - '6' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 6, 'hidden' => 0, 'has_children' => 0, 'title' => 'Item 6', 'in_active_trail' => 0, 'access' => 0, 'href' => 'f', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array()), - '7' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 7, 'hidden' => 0, 'has_children' => 0, 'title' => 'Item 7', 'in_active_trail' => 0, 'access' => 1, 'href' => 'g', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array()) + '5' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 5, 'hidden' => 1, 'has_children' => 0, 'title' => 'Item 5', 'in_active_trail' => 0, 'access' => 1, 'link_path' => 'e', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array()), + '6' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 6, 'hidden' => 0, 'has_children' => 0, 'title' => 'Item 6', 'in_active_trail' => 0, 'access' => 0, 'link_path' => 'f', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array()), + '7' => array('link' => $storage_controller->create(array('menu_name' => 'main-menu', 'mlid' => 7, 'hidden' => 0, 'has_children' => 0, 'title' => 'Item 7', 'in_active_trail' => 0, 'access' => 1, 'link_path' => 'g', 'localized_options' => array('attributes' => array('title' =>'')))), 'below' => array()) ); $output = menu_tree_output($this->tree_data); diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 3af30c8..b126730 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -344,7 +344,7 @@ function theme_admin_block_content($variables) { } $output .= '
'; foreach ($content as $item) { - $output .= '
' . l($item['title'], $item['href'], $item['localized_options']) . '
'; + $output .= '
' . l($item['title'], $item['link_path'], $item['localized_options']) . '
'; if (!$compact && isset($item['description'])) { $output .= '
' . filter_xss_admin($item['description']) . '
'; } @@ -777,3 +777,4 @@ function theme_system_themes_page($variables) { return $output; } + diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index cabea75..a9d42f5 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -491,6 +491,71 @@ function hook_menu_get_item_alter(&$router_item, $path, $original_map) { /** * Define links for menus. * + * @return array + * An array of default menu links. Each link has a key that is the machine + * name, which must be unique. The corresponding array value is an + * associative array that may contain the following key-value pairs: + * - link_title: (required) The untranslated title of the menu item. + * with path component substitution as described above. + * - description: The untranslated description of the link. + * - route_name: (required) The route name to be used to build the path. + * - route_parameters: (required) The route parameters to build the path. + * - link_path: (optional) If you have an external link use link_path instead + * of providing a route_name. + * - parent": (optional) The machine name of a link to define hierarchy. + * - weight: An integer that determines the relative position of items in + * the menu; higher-weighted items sink. Defaults to 0. Menu items with the + * same weight are ordered alphabetically. + * - menu_name: (optional) Set this to a custom menu if you don't want your + * item to be placed in the default Tools menu. + * - expanded: (optional) If set to TRUE, and if a menu link is provided for + * this menu item (as a result of other properties), then the menu link is + * always expanded, equivalent to its 'always expanded' checkbox being set + * in the UI. + * - type: (optional) A bitmask of flags describing properties of the menu item. + * Many shortcut bitmasks are provided as constants in menu.inc: + * - MENU_NORMAL_ITEM: Normal menu items show up in the menu tree and can be + * moved/hidden by the administrator. + * - MENU_SUGGESTED_ITEM: Modules may "suggest" menu items that the + * administrator may enable. + * If the "type" element is omitted, MENU_NORMAL_ITEM is assumed. + * - options: An array of options to be passed to l() when generating a link + * from this menu item. + * + * @see hook_default_menu_links_alter + */ +function hook_default_menu_links() { + $links['user'] = array( + 'link_title' => 'My account', + 'weight' => -10, + 'route_name' => 'user.page', + 'menu_name' => 'account', + ); + + $links['user.logout'] = array( + 'link_title' => 'Log out', + 'route_name' => 'user.logout', + 'weight' => 10, + 'menu_name' => 'account', + ); + + return $links; +} + +/** + * Alter links for menus. + * + * @see hook_default_menu_links + */ +function hook_default_menu_links_alter(&$links) { + // Change the weight and title of the user.logout link. + $links['user.logout']['weight'] = -10; + $links['user.logout']['link_title'] = t('Logout'); +} + +/** + * Define links for menus. + * * @section sec_menu_link Creating Menu Items * Menu item example of type MENU_NORMAL_ITEM: * @code diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 14153a0..9a08cb5 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -2279,6 +2279,23 @@ function system_update_8060() { } /** + * Add machine_name column to the menu_links table and remove router_path field. + */ +function system_update_8061() { + $spec = array( + 'description' => 'Machine name: Optional human-readable ID for this link.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => FALSE, + ); + + db_add_field('menu_links', 'machine_name', $spec); + // Do away with the field that joins to the old {menu_router}. + db_drop_index('menu_links', 'router_path'); + db_drop_field('menu_links', 'router_path'); +} + +/** * @} End of "defgroup updates-7.x-to-8.x". * The next series of updates should start at 9000. */ diff --git a/core/modules/system/system.module b/core/modules/system/system.module index f4bf194..a326346 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -9,10 +9,12 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Language\Language; use Drupal\Core\Utility\ModuleInfo; +use Drupal\menu_link\MenuLinkInterface; use Drupal\user\UserInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpFoundation\Request; use Guzzle\Http\Exception\BadResponseException; use Guzzle\Http\Exception\RequestException; @@ -806,6 +808,208 @@ function system_menu() { } /** + * Implements hook_default_menu_links(). + */ +function system_default_menu_links() { + + $items['admin'] = array( + 'link_title' => 'Administration', + 'route_name' => 'system.admin', + 'weight' => 9, + 'menu_name' => 'admin', + ); + + // Menu items that are basically just menu blocks. + $items['admin.structure'] = array( + 'route_name' => 'system.admin_structure', + 'parent' => 'admin', + 'description' => 'Administer blocks, content types, menus, etc.', + 'link_title' => 'Structure', + 'weight' => -8, + ); + // Appearance. + $items['admin.appearance'] = array( + 'route_name' => 'system.themes_page', + 'link_title' => 'Appearance', + 'parent' => 'admin', + 'weight' => -6, + ); + // Modules. + $items['admin.modules'] = array( + 'link_title' => 'Extend', + 'parent' => 'admin', + 'route_name' => 'system.modules_list', + 'weight' => -2, + ); + // Configuration. + $items['admin.config'] = array( + 'link_title' => 'Configuration', + 'parent' => 'admin', + 'description' => 'Administer settings.', + 'route_name' => 'system.admin_config', + ); + + // Media settings. + $items['admin.config.media'] = array( + 'route_name' => 'system.admin_config_media', + 'parent' => 'admin.config', + 'link_title' => 'Media', + 'weight' => -10, + ); + $items['admin.config.media.file-system'] = array( + 'link_title' => 'File system', + 'description' => 'Tell Drupal where to store uploaded files and how they are accessed.', + 'parent' => 'admin.config.media', + 'route_name' => 'system.file_system_settings', + ); + $items['admin.config.media.image-toolkit'] = array( + 'link_title' => 'Image toolkit', + 'parent' => 'admin.config.media', + 'route_name' => 'system.image_toolkit_settings', + 'description' => 'Choose which image toolkit to use if you have installed optional toolkits.', + 'weight' => 20, + ); + + // Service settings. + $items['admin.config.services'] = array( + 'link_title' => 'Web services', + 'parent' => 'admin.config', + 'route_name' => 'system.admin_config_services', + 'weight' => 0, + ); + $items['admin.config.services.rss-publishing'] = array( + 'link_title' => 'RSS publishing', + 'parent' => 'admin.config.services', + 'description' => 'Configure the site description, the number of items per feed and whether feeds should be titles/teasers/full-text.', + 'route_name' => 'system.rss_feeds_settings', + ); + + // Development settings. + $items['admin.config.development'] = array( + 'route_name' => 'system.admin_config_development', + 'parent' => 'admin.config', + 'link_title' => 'Development', + 'description' => 'Development tools.', + 'weight' => -10, + ); + $items['admin.config.development.maintenance'] = array( + 'link_title' => 'Maintenance mode', + 'parent' => 'admin.config.development', + 'description' => 'Take the site offline for maintenance or bring it back online.', + 'route_name' => 'system.site_maintenance_mode', + 'weight' => -10, + ); + $items['admin.config.development.performance'] = array( + 'link_title' => 'Performance', + 'parent' => 'admin.config.development', + 'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.', + 'route_name' => 'system.performance_settings', + 'weight' => -20, + ); + $items['admin.config.development.logging'] = array( + 'link_title' => 'Logging and errors', + 'parent' => 'admin.config.development', + 'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.", + 'route_name' => 'system.logging_settings', + 'weight' => -15, + ); + + // Regional and date settings. + $items['admin.config.regional'] = array( + 'route_name' => 'system.admin_config_regional', + 'link_title' => 'Regional and language', + 'parent' => 'admin.config', + 'description' => 'Regional settings, localization and translation.', + 'weight' => -5, + ); + $items['admin.config.regional.settings'] = array( + 'link_title' => 'Regional settings', + 'parent' => 'admin.config.regional', + 'description' => "Settings for the site's default time zone and country.", + 'route_name' => 'system.regional_settings', + 'weight' => -20, + ); + $items['admin.config.regional.date-time'] = array( + 'link_title' => 'Date and time formats', + 'parent' => 'admin.config.regional', + 'description' => 'Configure display format strings for date and time.', + 'route_name' => 'system.date_format_list', + 'weight' => -9, + ); + + // Search settings. + $items['admin.config.search'] = array( + 'link_title' => 'Search and metadata', + 'route_name' => 'system.admin_config_search', + 'parent' => 'admin.config', + 'description' => 'Local site search, metadata and SEO.', + 'weight' => -10, + ); + + // System settings. + $items['admin.config.system'] = array( + 'link_title' => 'System', + 'link_path' => 'admin/config/system', + 'parent' => 'admin.config', + 'description' => 'General system related configuration.', + 'weight' => -20, + ); + $items['admin.config.system.site-information'] = array( + 'link_title' => 'Site information', + 'parent' => 'admin.config.system', + 'description' => 'Change site name, e-mail address, slogan, default front page, and number of posts per page, error pages.', + 'route_name' => 'system.site_information_settings', + 'weight' => -20, + ); + $items['admin.config.system.cron'] = array( + 'link_title' => 'Cron', + 'parent' => 'admin.config.system', + 'description' => 'Manage automatic site maintenance tasks.', + 'route_name' => 'system.cron_settings', + 'weight' => 20, + ); + // Additional categories + $items['admin.config.user-interface'] = array( + 'link_title' => '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', + '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', + 'route_name' => 'system.admin_config_content', + 'parent' => 'admin.config', + 'description' => 'Settings related to formatting and authoring content.', + 'weight' => -15, + ); + + // Reports. + $items['admin.reports'] = array( + 'link_title' => 'Reports', + 'route_name' => 'system.admin_reports', + 'parent' => 'admin', + 'description' => 'View reports, updates, and errors.', + 'weight' => 5, + ); + $items['admin.reports.status'] = array( + 'link_title' => 'Status report', + 'parent' => 'admin.reports', + 'description' => "Get a status report about your site's operation and any detected problems.", + 'route_name' => 'system.status', + ); + + return $items; +} + +/** * Implements hook_theme_suggestions_HOOK(). */ function system_theme_suggestions_html(array $variables) { @@ -2577,17 +2781,17 @@ function system_get_module_admin_tasks($module, $info) { foreach ($menu_links as $link) { _menu_link_translate($link); if ($link['access']) { - $links[$link['router_path']] = $link; + $links[$link['machine_name']] = $link; } } } $admin_tasks = array(); $titles = array(); - if ($menu = module_invoke($module, 'menu')) { - foreach ($menu as $path => $item) { - if (isset($links[$path])) { - $task = $links[$path]; + if ($menu = module_invoke($module, 'default_menu_links')) { + foreach ($menu as $machine_name => $item) { + if (isset($links[$machine_name])) { + $task = $links[$machine_name]; // The link description, either derived from 'description' in // hook_menu() or customized via menu module is used as title attribute. if (!empty($task['localized_options']['attributes']['title'])) { @@ -2610,10 +2814,10 @@ function system_get_module_admin_tasks($module, $info) { } } else { - $titles[$path] = $task['title']; + $titles[$machine_name] = $task['title']; } - $admin_tasks[$path] = $task; + $admin_tasks[$machine_name] = $task; } } } diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index 25108ce..c2e43da 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -288,6 +288,7 @@ system.admin_index: path: '/admin/index' defaults: _content: 'Drupal\system\Controller\AdminController::index' + _title: 'Administration' requirements: _permission: 'access administration pages' @@ -341,6 +342,8 @@ system.theme_settings_theme: '': path: '/' + defaults: + _title: Home requirements: _access: 'TRUE' diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Controller/MenuTestController.php b/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Controller/MenuTestController.php index d315e6d..46b2c80 100644 --- a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Controller/MenuTestController.php +++ b/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Controller/MenuTestController.php @@ -19,6 +19,23 @@ public function menuTestCallback() { return menu_test_callback(); } + + /** + * A title callback method for test routes. + * + * @param array $_title_arguments + * Optional array from the route defaults. + * @param string $_title + * Optional _title string from the route defaults. + * + * @return string + * The route title. + */ + public function titleCallback(array $_title_arguments = array(), $_title = '') { + $_title_arguments += array('case_number' => '2', 'title' => $_title); + return t($_title_arguments['title']) . ' - Case ' . $_title_arguments['case_number']; + } + /** * @todo Remove menu_test_custom_403_404_callback(). */ diff --git a/core/modules/system/tests/modules/menu_test/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module index caf216b..f8d17fe 100644 --- a/core/modules/system/tests/modules/menu_test/menu_test.module +++ b/core/modules/system/tests/modules/menu_test/menu_test.module @@ -231,23 +231,14 @@ function menu_test_menu() { 'route_name' => 'menu_test.title_test_case1', ); $items['menu-title-test/case2'] = array( - 'title' => 'Example @sub1 - Case @op2', - // If '2' is not in quotes, the argument becomes arg(2). - 'title arguments' => array('@sub1' => 'title', '@op2' => '2'), - 'route_name' => 'menu_test.title_test_case2', - ); - $items['menu-title-test/case3'] = array( 'title' => 'Example title', 'title callback' => 'menu_test_title_callback', - 'route_name' => 'menu_test.title_test_case3', + 'route_name' => 'menu_test.title_test_case2', ); - $items['menu-title-test/case4'] = array( + $items['menu-title-test/case3'] = array( // Title gets completely ignored. Good thing, too. - 'title' => 'Bike sheds full of blue smurfs', - 'title callback' => 'menu_test_title_callback', - // If '4' is not in quotes, the argument becomes arg(4). - 'title arguments' => array('Example title', '4'), - 'route_name' => 'menu_test.title_test_case4', + 'title' => 'Bike sheds full of blue smurfs WRONG', + 'route_name' => 'menu_test.title_test_case3', ); // Parent page for controller-based local tasks. @@ -296,6 +287,134 @@ function menu_test_menu() { } /** + * Implements hook_default_menu_links(). + */ +function menu_test_default_menu_links() { + // The name of the menu changes during the course of the test. Using a $_GET. + $items['menu_test.menu_name_test'] = array( + 'link_title' => 'Test menu_name router item', + 'route_name' => 'menu_test.menu_name_test', + 'menu_name' => menu_test_menu_name(), + ); + // This item uses SystemController::systemAdminMenuBlockPage() to list child + // items. + $items['menu_test.menu_callback_description'] = array( + 'link_title' => 'Menu item title', + 'description' => 'Menu item description parent', + 'route_name' => 'menu_test.callback_description', + ); + // This item tests the description key. + $items['menu_test.menu_callback_description.description-plain'] = array( + 'link_title' => 'Menu item with a regular description', + 'description' => 'Menu item description text', + 'route_name' => 'menu_test.callback_description_plain', + 'parent' => 'menu_test.menu_callback_description', + ); + // This item tests using a description callback. + $items['menu_callback_description.description-callback'] = array( + 'link_title' => 'Menu item with a description set with a callback', + 'route_name' => 'menu_test.callback_description_callback', + 'parent' => 'menu_test.menu_callback_description', + ); + + $items['menu_test.menu_no_title_callback'] = array( + 'link_title' => 'A title with @placeholder', + 'route_name' => 'menu_test.menu_no_title_callback', + ); + + // Hierarchical tests. + $items['menu_test.hierarchy_parent'] = array( + 'link_title' => 'Parent menu router', + 'route_name' => 'menu_test.hierarchy_parent', + ); + $items['menu_test.hierarchy_parent.child'] = array( + 'link_title' => 'Child menu router', + 'route_name' => 'menu_test.hierarchy_parent_child', + 'parent' => 'menu_test.hierarchy_parent', + ); + $items['menu_test.hierarchy_parent.child2.child'] = array( + 'link_title' => 'Unattached subchild router', + 'route_name' => 'menu_test.hierarchy_parent_child2', + 'parent' => 'menu_test.hierarchy_parent.child', + ); + // Path containing "exotic" characters. + $exotic = " -._~!$'\"()*@[]?&+%#,;=:" . // "Special" ASCII characters. + "%23%25%26%2B%2F%3F" . // Characters that look like a percent-escaped string. + "éøïвβ中國書۞"; // Characters from various non-ASCII alphabets. + $items['menu_test.exotic_path'] = array( + 'link_title' => '"Exotic" path', + 'route_name' => 'menu_test.exotic_path', + 'route_parameters' => array('exotic' => $exotic), + ); + + // Hidden tests; base parents. + // Same structure as in Menu and Block modules. Since those structures can + // change, we need to simulate our own in here. + $items['menu_test'] = array( + 'link_title' => 'Menu test root', + 'route_name' => 'menu_test.menu_test', + ); + $items['menu_test.hidden'] = array( + 'link_title' => 'Hidden test root', + 'route_name' => 'menu_test.hidden', + 'parent' => 'menu_test', + ); + + // Hidden tests; one dynamic argument. + $items['menu_test.hidden.menu'] = array( + 'link_title' => 'Menus', + 'route_name' => 'menu_test.hidden_menu', + 'parent' => 'menu_test.hidden', + ); + + // Hidden tests; two dynamic arguments. + $items['menu_test.hidden.block'] = array( + 'link_title' => 'Blocks', + 'route_name' => 'menu_test.hidden_block', + 'parent' => 'menu_test.hidden', + ); + + // Menu trail tests. + // @see MenuTrailTestCase + $items['menu_test.menu-trail'] = array( + 'link_title' => 'Menu trail - Case 1', + 'route_name' => 'menu_test.menu_trail', + 'parent' => 'menu_test', + ); + $items['menu_test.admin.config.development.menu-trail'] = array( + 'link_title' => 'Menu trail - Case 2', + 'description' => 'Tests menu_tree_set_path()', + 'route_name' => 'menu_test.menu_trail_admin', + 'parent' => 'admin.config.development', + ); + $items['menu_test.custom-403-page'] = array( + 'link_title' => 'Custom 403 page', + 'route_name' => 'menu_test.custom_403', + 'parent' => 'menu_test', + ); + $items['menu_test.custom-404-page'] = array( + 'link_title' => 'Custom 404 page', + 'route_name' => 'menu_test.custom_404', + 'parent' => 'menu_test', + ); + // Test the access key. + $items['menu_test.menu-title-test.case1'] = array( + 'link_title' => 'Example title - Case 1', + 'route_name' => 'menu_test.title_test_case1', + ); + $items['menu_test.menu-title-test.case2'] = array( + 'link_title' => 'Example title', + 'route_name' => 'menu_test.title_test_case2', + ); + $items['menu_test.menu-title-test.case3'] = array( + // Title gets completely ignored. Good thing, too. + 'link_title' => 'Bike sheds full of blue smurfs', + 'route_name' => 'menu_test.title_test_case3', + ); + return $items; +} + +/** * Implements hook_menu_local_tasks(). * * If the menu_test.settings configuration 'tasks.add' has been set, adds diff --git a/core/modules/system/tests/modules/menu_test/menu_test.routing.yml b/core/modules/system/tests/modules/menu_test/menu_test.routing.yml index bc8a736..a76edda 100644 --- a/core/modules/system/tests/modules/menu_test/menu_test.routing.yml +++ b/core/modules/system/tests/modules/menu_test/menu_test.routing.yml @@ -519,6 +519,7 @@ menu_test.theme_callback_inheritance: menu_test.title_test_case1: path: '/menu-title-test/case1' defaults: + _title: 'Example title - Case 1' _content: '\Drupal\menu_test\Controller\MenuTestController::menuTestCallback' requirements: _access: 'TRUE' @@ -526,6 +527,8 @@ menu_test.title_test_case1: menu_test.title_test_case2: path: '/menu-title-test/case2' defaults: + _title: 'Example title' + _title_callback: '\Drupal\menu_test\Controller\MenuTestController::titleCallback' _content: '\Drupal\menu_test\Controller\MenuTestController::menuTestCallback' requirements: _access: 'TRUE' @@ -533,13 +536,11 @@ menu_test.title_test_case2: menu_test.title_test_case3: path: '/menu-title-test/case3' defaults: - _content: '\Drupal\menu_test\Controller\MenuTestController::menuTestCallback' - requirements: - _access: 'TRUE' - -menu_test.title_test_case4: - path: '/menu-title-test/case4' - defaults: + _title: 'Bike sheds full of blue smurfs' # this should be ignored + _title_callback: '\Drupal\menu_test\Controller\MenuTestController::titleCallback' + _title_arguments: + title: 'Example title' + case_number: '3' _content: '\Drupal\menu_test\Controller\MenuTestController::menuTestCallback' requirements: _access: 'TRUE' diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php index e79c37c..7685cd4 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php @@ -57,6 +57,19 @@ public function termTitle(TermInterface $taxonomy_term) { } /** + * Route title callback. + * + * @param \Drupal\taxonomy\VocabularyInterface $taxonomy_vocabulary + * The taxonomy term. + * + * @return string + * The term label. + */ + public function vocabularyTitle(VocabularyInterface $taxonomy_vocabulary) { + return Xss::filter($taxonomy_vocabulary->label()); + } + + /** * @todo Remove taxonomy_term_feed(). */ public function termFeed(TermInterface $taxonomy_term) { diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index 978ac62..25775a0 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -262,6 +262,20 @@ function taxonomy_menu() { } /** + * Implements hook_default_menu_links(). + */ +function taxonomy_default_menu_links() { + $links['admin.structure.taxonomy'] = array( + 'link_title' => 'Taxonomy', + 'parent' => 'admin.structure', + 'description' => 'Manage tagging, categorization, and classification of your content.', + 'route_name' => 'taxonomy.vocabulary_list', + ); + + return $links; +} + +/** * Implements hook_admin_paths(). */ function taxonomy_admin_paths() { diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml index 8040860..b5f3c2e 100644 --- a/core/modules/taxonomy/taxonomy.routing.yml +++ b/core/modules/taxonomy/taxonomy.routing.yml @@ -79,6 +79,7 @@ taxonomy.overview_terms: path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}' defaults: _form: 'Drupal\taxonomy\Form\OverviewTerms' + _title_callback: 'Drupal\taxonomy\Controller\TaxonomyController::vocabularyTitle' requirements: _entity_access: 'taxonomy_vocabulary.view' diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php b/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php index 8ccec8e..49dda12 100644 --- a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php +++ b/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php @@ -72,6 +72,7 @@ function setUp() { 'bypass node access', 'administer themes', 'administer nodes', + 'access content overview', 'administer blocks', 'administer menu', 'administer modules', diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index c8612df..e4b0258 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -551,7 +551,7 @@ function toolbar_get_rendered_subtrees() { $subtree = ''; } - $id = str_replace(array('/', '<', '>'), array('-', '', ''), $item['href']); + $id = str_replace(array('/', '<', '>'), array('-', '', ''), $item['link_path']); $subtrees[$id] = $subtree; } } diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module index b1be041..bca395d 100644 --- a/core/modules/tracker/tracker.module +++ b/core/modules/tracker/tracker.module @@ -32,6 +32,18 @@ function tracker_help($path, $arg) { } /** + * Implements hook_default_menu_links(). + */ +function tracker_default_menu_links() { + $links['tracker'] = array( + 'link_title' => 'Recent content', + 'route_name' => 'tracker.page', + ); + + return $links; +} + +/** * Implements hook_cron(). * * Updates tracking information for any items still to be tracked. The state diff --git a/core/modules/update/update.module b/core/modules/update/update.module index af8143b..7670655 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -178,6 +178,21 @@ function update_menu() { } /** + * Implements hook_default_menu_links(). + */ +function update_default_menu_links() { + $links['admin.reports.updates'] = array( + 'link_title' => 'Available updates', + 'description' => 'Get a status report about available updates for your installed modules and themes.', + 'route_name' => 'update.status', + 'parent' => 'admin.reports', + 'weight' => -50, + ); + + return $links; +} + +/** * Access callback: Resolves if the current user can access updater menu items. * * It both enforces the 'administer software updates' permission and the global diff --git a/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php b/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php index 547057b..ae11687 100644 --- a/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php +++ b/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php @@ -28,7 +28,7 @@ public function appliesTo() { * {@inheritdoc} */ public function access(Route $route, Request $request, AccountInterface $account) { - return $account->isAuthenticated() ? static::ALLOW : static::DENY; + return ($request->attributes->get('_menu_admin') || $account->isAuthenticated()) ? static::ALLOW : static::DENY; } } diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php index 24e7244..bbe5a71 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php @@ -129,11 +129,8 @@ function testAccountPageTitles() { // Check the page title for registered users is "My Account" in menus. $this->drupalLogin($this->drupalCreateUser()); // After login, the client is redirected to /user. - $link = $this->xpath('//a[contains(@class, :class)]', array( - ':class' => 'active-trail', - ) - ); - $this->assertEqual((string) $link[0], 'My account', "Page title of /user is 'My Account' in menus for registered users"); + $this->assertLink(t('My account'), 0, "Page title of /user is 'My Account' in menus for registered users"); + $this->assertLinkByHref(\Drupal::urlGenerator()->generate('user.page'), 0); } } diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 6744e9e..9f464f4 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -794,6 +794,62 @@ function user_menu() { } /** + * Implements hook_default_menu_links(). + */ +function user_default_menu_links() { + // Registration and login pages. + $links['user'] = array( + 'link_title' => 'My account', + 'weight' => -10, + 'route_name' => 'user.page', + 'menu_name' => 'account', + ); + + $links['user.logout'] = array( + 'link_title' => 'Log out', + 'route_name' => 'user.logout', + 'weight' => 10, + 'menu_name' => 'account', + ); + + // User listing pages. + $links['admin.people'] = array( + 'link_title' => 'People', + 'route_name' => 'user.admin_account', + 'description' => 'Manage user accounts, roles, and permissions.', + 'parent' => 'admin', + 'weight' => -4, + ); + // Permissions and role forms. + $links['admin.people.permissions'] = array( + 'link_title' => 'Permissions', + 'parent' => 'admin.people', + 'description' => 'Determine access to features by selecting permissions for roles.', + 'route_name' => 'user.admin_permissions', + ); + + // Administration pages. + $links['admin.config.people'] = array( + 'link_title' => 'People', + 'route_name' => 'user.admin_index', + 'parent' => 'admin.config', + 'description' => 'Configure user accounts.', + 'position' => 'left', + 'weight' => -20, + ); + + $links['admin.config.people.accounts'] = array( + 'link_title' => 'Account settings', + 'parent' => 'admin.config.people', + 'description' => 'Configure default behavior of users, including registration requirements, e-mails, and fields.', + 'weight' => -10, + 'route_name' => 'user.account_settings', + ); + + return $links; +} + +/** * Implements hook_menu_link_presave(). */ function user_menu_link_presave(MenuLink $menu_link) { @@ -801,15 +857,9 @@ function user_menu_link_presave(MenuLink $menu_link) { // for authenticated users. Authenticated users should see "My account", but // anonymous users should not see it at all. Therefore, invoke // user_menu_link_load() to conditionally hide the link. - if ($menu_link->link_path == 'user' && $menu_link->module == 'system') { + if ($menu_link->machine_name == 'user' && $menu_link->module == 'system') { $menu_link->options['alter'] = TRUE; } - - // Force the Logout link to appear on the top-level of 'account' menu by - // default (i.e., unless it has been customized). - if ($menu_link->link_path == 'user/logout' && $menu_link->module == 'system' && empty($menu_link->customized)) { - $menu_link->plid = 0; - } } /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php index 4faffc7..06a6e08 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php @@ -2459,6 +2459,21 @@ public function renderMoreLink() { } /** + * Creates menu links, if this display provides some. + * + * @param array $existing_links + * An array of already existing menu items provided by drupal. + * + * @return array + * The menu links registers for this display. + * + * @see hook_default_menu_links() + */ + public function executeHookDefaultMenuLinks(array &$existing_links) { + return array(); + } + + /** * If this display creates a page with a menu item, implement it here. * * @param array $callbacks diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php index 58a46d7..963f62e 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php @@ -260,6 +260,70 @@ public function alterRoutes(RouteCollection $collection) { } /** + * {@inheritdoc} + */ + public function executeHookDefaultMenuLinks(array &$existing_links) { + $links = array(); + + // Replace % with the link to our standard views argument loader + // views_arg_load -- which lives in views.module. + + $bits = explode('/', $this->getOption('path')); + $page_arguments = array($this->view->storage->id(), $this->display['id']); + $this->view->initHandlers(); + $view_arguments = $this->view->argument; + + // Replace % with %views_arg for menu autoloading and add to the + // page arguments so the argument actually comes through. + foreach ($bits as $pos => $bit) { + if ($bit == '%') { + // If a view requires any arguments we cannot create a static menu link. + return array(); + } + } + + $view_route_names = $this->state->get('views.view_route_names') ?: array(); + + $path = implode('/', $bits); + $menu_link_id = str_replace('/', '.', $path); + $links[$menu_link_id] = array(); + + if ($path) { + // Some views might override existing paths, so we have to set the route + // name based upon the altering. + $view_id_display = "{$this->view->storage->id()}.{$this->display['id']}"; + $links[$menu_link_id] = array( + 'route_name' => isset($view_route_names[$view_id_display]) ? $view_route_names[$view_id_display] : "view.$view_id_display", + // Identify URL embedded arguments and correlate them to a handler. + 'load arguments' => array($this->view->storage->id(), $this->display['id'], '%index'), + ); + + $menu = $this->getOption('menu'); + if (empty($menu)) { + $menu = array('type' => 'none'); + } + // Set the title and description if we have one. + if ($menu['type'] != 'none') { + $links[$menu_link_id]['link_title'] = $menu['title']; + $links[$menu_link_id]['description'] = $menu['description']; + } + + if (isset($menu['weight'])) { + $links[$menu_link_id]['weight'] = intval($menu['weight']); + } + + switch ($menu['type']) { + case 'normal': + // Insert item into the proper menu. + $links[$menu_link_id]['menu_name'] = $menu['name']; + break; + } + } + + return $links; + } + + /** * Overrides \Drupal\views\Plugin\views\display\DisplayPluginBase::executeHookMenu(). */ public function executeHookMenu($callbacks) { diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index f6a0129..0e86279 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -1514,6 +1514,30 @@ public function executeHookMenu($display_id = NULL, &$callbacks = array()) { } /** + * Called to get hook_default_menu_links() information from the view and the named display handler. + * + * @param string $display_id + * A display id. + * @param array $links + * A menu callback array passed from views_default_menu_links_alter(). + * + * @return array|bool + */ + public function executeHookDefaultMenuLinks($display_id = NULL, &$links = array()) { + // Prepare the view with the information we have. + + // This was probably already called, but it's good to be safe. + if (!$this->setDisplay($display_id)) { + return FALSE; + } + + // Execute the hook. + if (isset($this->display_handler)) { + return $this->display_handler->executeHookDefaultMenuLinks($links); + } + } + + /** * Determine if the given user has access to the view. Note that * this sets the display handler if it hasn't been. */ diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 4ac7613..0eba3b1 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -315,6 +315,22 @@ function views_menu_alter(&$callbacks) { } /** + * Implements hook_default_menu_links_alter(). + */ +function views_default_menu_links_alter(array &$links) { + // @todo What to do about all that crazy logic in views_menu_alter(). + $views = Views::getApplicableViews('uses_hook_menu'); + foreach ($views as $data) { + /** @var \Drupal\views\ViewExecutable $view */ + list($view, $display_id) = $data; + $result = $view->executeHookDefaultMenuLinks($display_id, $links); + foreach ($result as $link_id => $link) { + $links[$link_id] = $link; + } + } +} + +/** * Helper function for menu loading. This will automatically be * called in order to 'load' a views argument; primarily it * will be used to perform validation. diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module index c175caa..574a044 100644 --- a/core/modules/views_ui/views_ui.module +++ b/core/modules/views_ui/views_ui.module @@ -36,6 +36,31 @@ function views_ui_menu() { } /** + * Implements hook_default_menu_links(). + */ +function views_ui_default_menu_links() { + $links = array(); + + // Top-level Views module pages (not tied to a particular View). + $links['admin.structure.views'] = array( + 'link_title' => 'Views', + 'parent' => 'admin.structure', + 'description' => 'Manage customized lists of content.', + 'route_name' => 'views_ui.list', + ); + + // A page in the Reports section to show usage of plugins in all views. + $links['admin.reports.views-plugins'] = array( + 'link_title' => 'Views plugins', + 'parent' => 'admin.reports', + 'description' => 'Overview of plugins used in all views.', + 'route_name' => 'views_ui.reports_plugins', + ); + + return $links; +} + +/** * Implements hook_entity_info(). */ function views_ui_entity_info(&$entity_info) { diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme index 7defd49..dace91e 100644 --- a/core/themes/seven/seven.theme +++ b/core/themes/seven/seven.theme @@ -120,7 +120,7 @@ function seven_admin_block_content($variables) { if (isset($item['description']) && !system_admin_compact_mode()) { $content .= '
' . filter_xss_admin($item['description']) . '
'; } - $output .= l($content, $item['href'], $options); + $output .= l($content, $item['link_path'], $options); $output .= ''; } $output .= '';