diff --git a/core/includes/menu.inc b/core/includes/menu.inc index c298e18..8f1ce73 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -135,7 +135,7 @@ * @section sec_links Defining menu links for the administrative menu * Routes for administrative tasks can be added to the main Drupal * administrative menu hierarchy. To do this, add lines like the following to a - * module_name.menu_links.yml file (in the top-level directory for your module): + * module_name.links.menu.yml file (in the top-level directory for your module): * @code * dblog.overview: * title: 'Recent log messages' @@ -148,7 +148,7 @@ * - The first line is the machine name for your menu link, which usually * matches the machine name of the route (given in the 'route_name' line). * - parent: The machine name of the menu link that is the parent in the - * administrative hierarchy. See system.menu_links.yml to find the main + * administrative hierarchy. See system.links.menu.yml to find the main * skeleton of the hierarchy. * - weight: Lower (negative) numbers come before higher (positive) numbers, * for menu items with the same parent. diff --git a/core/lib/Drupal/Core/Menu/MenuLinkManager.php b/core/lib/Drupal/Core/Menu/MenuLinkManager.php index ab1f5dd..6da9248 100644 --- a/core/lib/Drupal/Core/Menu/MenuLinkManager.php +++ b/core/lib/Drupal/Core/Menu/MenuLinkManager.php @@ -154,7 +154,7 @@ protected function processDefinition(array &$definition, $plugin_id) { */ protected function getDiscovery() { if (empty($this->discovery)) { - $yaml = new YamlDiscovery('menu_links', $this->moduleHandler->getModuleDirectories()); + $yaml = new YamlDiscovery('links.menu', $this->moduleHandler->getModuleDirectories()); $this->discovery = new ContainerDerivativeDiscoveryDecorator($yaml); } return $this->discovery; diff --git a/core/modules/action/action.menu_links.yml b/core/modules/action/action.links.menu.yml similarity index 100% rename from core/modules/action/action.menu_links.yml rename to core/modules/action/action.links.menu.yml diff --git a/core/modules/aggregator/aggregator.menu_links.yml b/core/modules/aggregator/aggregator.links.menu.yml similarity index 100% rename from core/modules/aggregator/aggregator.menu_links.yml rename to core/modules/aggregator/aggregator.links.menu.yml diff --git a/core/modules/ban/ban.menu_links.yml b/core/modules/ban/ban.links.menu.yml similarity index 100% rename from core/modules/ban/ban.menu_links.yml rename to core/modules/ban/ban.links.menu.yml diff --git a/core/modules/block/block.menu_links.yml b/core/modules/block/block.links.menu.yml similarity index 100% rename from core/modules/block/block.menu_links.yml rename to core/modules/block/block.links.menu.yml diff --git a/core/modules/book/book.menu_links.yml b/core/modules/book/book.links.menu.yml similarity index 100% rename from core/modules/book/book.menu_links.yml rename to core/modules/book/book.links.menu.yml diff --git a/core/modules/comment/comment.menu_links.yml b/core/modules/comment/comment.links.menu.yml similarity index 100% rename from core/modules/comment/comment.menu_links.yml rename to core/modules/comment/comment.links.menu.yml diff --git a/core/modules/config/config.menu_links.yml b/core/modules/config/config.links.menu.yml similarity index 100% rename from core/modules/config/config.menu_links.yml rename to core/modules/config/config.links.menu.yml diff --git a/core/modules/config_translation/config_translation.menu_links.yml b/core/modules/config_translation/config_translation.links.menu.yml similarity index 100% rename from core/modules/config_translation/config_translation.menu_links.yml rename to core/modules/config_translation/config_translation.links.menu.yml diff --git a/core/modules/contact/contact.menu_links.yml b/core/modules/contact/contact.links.menu.yml similarity index 100% rename from core/modules/contact/contact.menu_links.yml rename to core/modules/contact/contact.links.menu.yml diff --git a/core/modules/dblog/dblog.menu_links.yml b/core/modules/dblog/dblog.links.menu.yml similarity index 100% rename from core/modules/dblog/dblog.menu_links.yml rename to core/modules/dblog/dblog.links.menu.yml diff --git a/core/modules/entity/entity.menu_links.yml b/core/modules/entity/entity.links.menu.yml similarity index 100% rename from core/modules/entity/entity.menu_links.yml rename to core/modules/entity/entity.links.menu.yml diff --git a/core/modules/field_ui/field_ui.menu_links.yml b/core/modules/field_ui/field_ui.links.menu.yml similarity index 100% rename from core/modules/field_ui/field_ui.menu_links.yml rename to core/modules/field_ui/field_ui.links.menu.yml diff --git a/core/modules/filter/filter.menu_links.yml b/core/modules/filter/filter.links.menu.yml similarity index 100% rename from core/modules/filter/filter.menu_links.yml rename to core/modules/filter/filter.links.menu.yml diff --git a/core/modules/forum/forum.menu_links.yml b/core/modules/forum/forum.links.menu.yml similarity index 100% rename from core/modules/forum/forum.menu_links.yml rename to core/modules/forum/forum.links.menu.yml diff --git a/core/modules/help/help.menu_links.yml b/core/modules/help/help.links.menu.yml similarity index 100% rename from core/modules/help/help.menu_links.yml rename to core/modules/help/help.links.menu.yml diff --git a/core/modules/image/image.menu_links.yml b/core/modules/image/image.links.menu.yml similarity index 100% rename from core/modules/image/image.menu_links.yml rename to core/modules/image/image.links.menu.yml diff --git a/core/modules/language/language.menu_links.yml b/core/modules/language/language.links.menu.yml similarity index 100% rename from core/modules/language/language.menu_links.yml rename to core/modules/language/language.links.menu.yml diff --git a/core/modules/locale/locale.menu_links.yml b/core/modules/locale/locale.links.menu.yml similarity index 100% rename from core/modules/locale/locale.menu_links.yml rename to core/modules/locale/locale.links.menu.yml diff --git a/core/modules/menu_link/src/StaticMenuLinks.php b/core/modules/menu_link/src/StaticMenuLinks.php index 54cf026..d42c5ff 100644 --- a/core/modules/menu_link/src/StaticMenuLinks.php +++ b/core/modules/menu_link/src/StaticMenuLinks.php @@ -69,7 +69,7 @@ public function getLinks() { * An YAML discovery instance. */ protected function getDiscovery() { - return new YamlDiscovery('menu_links', $this->moduleHandler->getModuleDirectories()); + return new YamlDiscovery('links.menu', $this->moduleHandler->getModuleDirectories()); } } diff --git a/core/modules/menu_ui/menu_ui.menu_links.yml b/core/modules/menu_ui/menu_ui.links.menu.yml similarity index 100% rename from core/modules/menu_ui/menu_ui.menu_links.yml rename to core/modules/menu_ui/menu_ui.links.menu.yml diff --git a/core/modules/node/node.menu_links.yml b/core/modules/node/node.links.menu.yml similarity index 100% rename from core/modules/node/node.menu_links.yml rename to core/modules/node/node.links.menu.yml diff --git a/core/modules/path/path.menu_links.yml b/core/modules/path/path.links.menu.yml similarity index 100% rename from core/modules/path/path.menu_links.yml rename to core/modules/path/path.links.menu.yml diff --git a/core/modules/responsive_image/responsive_image.menu_links.yml b/core/modules/responsive_image/responsive_image.links.menu.yml similarity index 100% rename from core/modules/responsive_image/responsive_image.menu_links.yml rename to core/modules/responsive_image/responsive_image.links.menu.yml diff --git a/core/modules/search/search.menu_links.yml b/core/modules/search/search.links.menu.yml similarity index 100% rename from core/modules/search/search.menu_links.yml rename to core/modules/search/search.links.menu.yml diff --git a/core/modules/shortcut/shortcut.menu_links.yml b/core/modules/shortcut/shortcut.links.menu.yml similarity index 100% rename from core/modules/shortcut/shortcut.menu_links.yml rename to core/modules/shortcut/shortcut.links.menu.yml diff --git a/core/modules/simpletest/simpletest.menu_links.yml b/core/modules/simpletest/simpletest.links.menu.yml similarity index 100% rename from core/modules/simpletest/simpletest.menu_links.yml rename to core/modules/simpletest/simpletest.links.menu.yml diff --git a/core/modules/statistics/statistics.menu_links.yml b/core/modules/statistics/statistics.links.menu.yml similarity index 100% rename from core/modules/statistics/statistics.menu_links.yml rename to core/modules/statistics/statistics.links.menu.yml diff --git a/core/modules/system/system.menu_links.yml b/core/modules/system/system.links.menu.yml similarity index 100% rename from core/modules/system/system.menu_links.yml rename to core/modules/system/system.links.menu.yml diff --git a/core/modules/system/tests/modules/menu_test/menu_test.menu_links.yml b/core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml similarity index 100% rename from core/modules/system/tests/modules/menu_test/menu_test.menu_links.yml rename to core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml diff --git a/core/modules/taxonomy/taxonomy.menu_links.yml b/core/modules/taxonomy/taxonomy.links.menu.yml similarity index 100% rename from core/modules/taxonomy/taxonomy.menu_links.yml rename to core/modules/taxonomy/taxonomy.links.menu.yml diff --git a/core/modules/tracker/tracker.menu_links.yml b/core/modules/tracker/tracker.links.menu.yml similarity index 100% rename from core/modules/tracker/tracker.menu_links.yml rename to core/modules/tracker/tracker.links.menu.yml diff --git a/core/modules/update/update.menu_links.yml b/core/modules/update/update.links.menu.yml similarity index 100% rename from core/modules/update/update.menu_links.yml rename to core/modules/update/update.links.menu.yml diff --git a/core/modules/user/user.menu_links.yml b/core/modules/user/user.links.menu.yml similarity index 100% rename from core/modules/user/user.menu_links.yml rename to core/modules/user/user.links.menu.yml diff --git a/core/modules/views_ui/views_ui.menu_links.yml b/core/modules/views_ui/views_ui.links.menu.yml similarity index 100% rename from core/modules/views_ui/views_ui.menu_links.yml rename to core/modules/views_ui/views_ui.links.menu.yml