diff --git a/core/modules/action/action.routing.yml b/core/modules/action/action.routing.yml index f8d7bf2c74ac4f0bf52418949424c231f32b2ed8..09e14332cddd8f161bd9b241b2a7d0d81315b2e7 100644 --- a/core/modules/action/action.routing.yml +++ b/core/modules/action/action.routing.yml @@ -1,6 +1,7 @@ action.admin: path: '/admin/config/system/actions' defaults: + _title: 'Actions' _entity_list: 'action' requirements: _permission: 'administer actions' diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index 726f2282a405b21643f2d0dcdaa291bab30e0e16..0f9f718b104939b3d5e0e2cfde353cf8a8e33355 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -119,13 +119,9 @@ function aggregator_menu() { 'route_name' => 'aggregator.categories', ); $items['aggregator/categories/%aggregator_category'] = array( - 'title callback' => '_aggregator_category_title', - 'title arguments' => array(2), 'route_name' => 'aggregator.category_view', ); $items['aggregator/sources/%aggregator_feed'] = array( - 'title callback' => 'entity_page_label', - 'title arguments' => array(2), 'route_name' => 'aggregator.feed_view', ); $items['admin/config/services/aggregator/edit/feed/%aggregator_feed'] = array( @@ -148,19 +144,6 @@ function aggregator_menu() { return $items; } -/** - * Title callback: Returns a title for aggregator category pages. - * - * @param $category - * An aggregator category. - * - * @return - * A string with the aggregator category title. - */ -function _aggregator_category_title($category) { - return $category->title; -} - /** * Implements hook_permission(). */ diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml index e05c4d9c5329931cad9156067f8a84b9412d068f..bfcf7b3a9d04abf177dc6090edd7fb9b7f956706 100644 --- a/core/modules/aggregator/aggregator.routing.yml +++ b/core/modules/aggregator/aggregator.routing.yml @@ -10,6 +10,7 @@ aggregator.admin_settings: path: '/admin/config/services/aggregator/settings' defaults: _form: '\Drupal\aggregator\Form\SettingsForm' + _title: 'Settings' requirements: _permission: 'administer news feeds' @@ -17,6 +18,7 @@ aggregator.feed_items_delete: path: '/admin/config/services/aggregator/remove/{aggregator_feed}' defaults: _entity_form: 'aggregator_feed.remove_items' + _title: 'Remove items' requirements: _permission: 'administer news feeds' @@ -24,6 +26,7 @@ aggregator.feed_delete: path: '/admin/config/services/aggregator/delete/feed/{aggregator_feed}' defaults: _entity_form: 'aggregator_feed.delete' + _title: 'Delete feed' requirements: _permission: 'administer news feeds' @@ -31,6 +34,7 @@ aggregator.feed_add: path: '/admin/config/services/aggregator/add/feed' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::feedAdd' + _title: 'Add feed' requirements: _permission: 'administer news feeds' @@ -38,6 +42,7 @@ aggregator.feed_configure: path: '/aggregator/sources/{aggregator_feed}/configure' defaults: _entity_form: 'aggregator_feed.default' + _title: 'Configure' requirements: _permission: 'administer news feeds' @@ -45,6 +50,7 @@ aggregator.feed_edit: path: '/admin/config/services/aggregator/edit/feed/{aggregator_feed}' defaults: _entity_form: 'aggregator_feed.default' + _title: 'Edit feed' requirements: _permission: 'administer news feeds' @@ -52,6 +58,7 @@ aggregator.feed_refresh: path: '/admin/config/services/aggregator/update/{aggregator_feed}' defaults: _controller: '\Drupal\aggregator\Controller\AggregatorController::feedRefresh' + _title: 'Update items' requirements: _permission: 'administer news feeds' @@ -59,6 +66,7 @@ aggregator.opml_add: path: '/admin/config/services/aggregator/add/opml' defaults: _form: '\Drupal\aggregator\Form\OpmlFeedAdd' + _title: 'Import OMPL' requirements: _permission: 'administer news feeds' @@ -66,6 +74,7 @@ aggregator.feed_view: path: '/aggregator/sources/{aggregator_feed}' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::viewFeed' + _title_callback: '\Drupal\aggregator\Controller\AggregatorController::feedTitle' requirements: _permission: 'access news feeds' @@ -73,6 +82,7 @@ aggregator.page_last: path: '/aggregator' defaults: _controller: '\Drupal\aggregator\Controller\AggregatorController::pageLast' + _title: 'Feed aggregator' requirements: _permission: 'access news feeds' @@ -80,6 +90,7 @@ aggregator.sources: path: '/aggregator/sources' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::sources' + _title: 'Sources' requirements: _permission: 'access news feeds' @@ -87,6 +98,7 @@ aggregator.categories: path: '/aggregator/categories' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::categories' + _title: 'Categories' requirements: _access_aggregator_categories: 'TRUE' @@ -94,6 +106,7 @@ aggregator.category_view: path: '/aggregator/categories/{cid}' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::viewCategory' + _title_callback: '\Drupal\aggregator\Controller\AggregatorController::categoryTitle' requirements: _permission: 'access news feeds' @@ -101,6 +114,7 @@ aggregator.category_edit: path: '/aggregator/categories/{cid}/configure' defaults: _form: '\Drupal\aggregator\Form\CategoryAdminForm' + _title: 'Configure' requirements: _permission: 'administer news feeds' @@ -115,6 +129,7 @@ aggregator.category_delete: path: '/admin/config/services/aggregator/delete/category/{cid}' defaults: _form: '\Drupal\aggregator\Form\CategoryDeleteForm' + _title: 'Delete category' requirements: _permission: 'administer news feeds' @@ -122,6 +137,7 @@ aggregator.category_add: path: '/admin/config/services/aggregator/add/category' defaults: _form: '\Drupal\aggregator\Form\CategoryAdminForm' + _title: 'Add category' requirements: _permission: 'administer news feeds' @@ -129,6 +145,7 @@ aggregator.categorize_category_form: path: '/aggregator/categories/{cid}/categorize' defaults: _form: '\Drupal\aggregator\Form\CategorizeCategoryForm' + _title: 'Categorize' requirements: _permission: 'administer news feeds' @@ -136,6 +153,7 @@ aggregator.categorize_feed_form: path: '/aggregator/sources/{aggregator_feed}/categorize' defaults: _form: '\Drupal\aggregator\Form\CategorizeFeedForm' + _title: 'Categorize' requirements: _permission: 'administer news feeds' diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php index 1b85a8981ab05ba8b60777b41f87f8e6c86fd3f9..0a98fd0373991031af78ce6caeab60aae8d0a709 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php @@ -7,6 +7,7 @@ namespace Drupal\aggregator\Controller; +use Drupal\Component\Utility\Xss; use Drupal\Core\Controller\ControllerBase; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\aggregator\CategoryStorageControllerInterface; @@ -92,7 +93,6 @@ public function viewFeed(FeedInterface $aggregator_feed) { $items = $entity_manager->getStorageController('aggregator_item')->loadByFeed($aggregator_feed->id()); // Print the feed items. $build = $this->buildPageList($items, $feed_source); - $build['#title'] = $aggregator_feed->label(); return $build; } @@ -106,10 +106,8 @@ public function viewFeed(FeedInterface $aggregator_feed) { * The render array with list of items for the feed. */ public function viewCategory($cid) { - $category = $this->categoryStorage->load($cid); $items = $this->entityManager()->getStorageController('aggregator_item')->loadByCategory($cid); $build = $this->buildPageList($items); - $build['#title'] = $category->title; return $build; } @@ -384,4 +382,31 @@ public function opmlPage($cid = NULL) { return $response; } + /** + * Route title callback. + * + * @param \Drupal\aggregator\FeedInterface $aggregator_feed + * The aggregator feed. + * + * @return string + * The feed label. + */ + public function feedTitle(FeedInterface $aggregator_feed) { + return Xss::filter($aggregator_feed->label()); + } + + /** + * Route title callback. + * + * @param int $cid + * The category ID. + * + * @return string + * The category label. + */ + public function categoryTitle($cid) { + $category = $this->categoryStorage->load($cid); + return Xss::filter($category->title); + } + } diff --git a/core/modules/ban/ban.routing.yml b/core/modules/ban/ban.routing.yml index dd8e5a0d0a231e4a877f78f0ed97500dca0a2098..2420dc000b16604a6a9a275b9215e34211ddfb0d 100644 --- a/core/modules/ban/ban.routing.yml +++ b/core/modules/ban/ban.routing.yml @@ -2,6 +2,7 @@ ban.admin_page: path: '/admin/config/people/ban/{default_ip}' defaults: _form: '\Drupal\ban\Form\BanAdmin' + _title: 'IP address bans' default_ip: '' requirements: _permission: 'ban IP addresses' @@ -10,5 +11,6 @@ ban.delete: path: '/admin/config/people/ban/delete/{ban_id}' defaults: _form: '\Drupal\ban\Form\BanDelete' + _title: 'Delete IP address' requirements: _permission: 'ban IP addresses' diff --git a/core/modules/block/block.routing.yml b/core/modules/block/block.routing.yml index 9c5a380824e0d7dfd25a5cdfbd0c6e13c5fecae1..9e0226d1afaf813610484451b856928a8a7683c9 100644 --- a/core/modules/block/block.routing.yml +++ b/core/modules/block/block.routing.yml @@ -25,6 +25,7 @@ block.admin_display: path: '/admin/structure/block' defaults: _content: '\Drupal\block\Controller\BlockListController::listing' + _title: 'Block layout' requirements: _permission: 'administer blocks' diff --git a/core/modules/book/book.routing.yml b/core/modules/book/book.routing.yml index 1ce1e829e10128967db3b2562c5167498504ff44..9d941cc9076c7b7490ef98fe4046c3b3b59659f7 100644 --- a/core/modules/book/book.routing.yml +++ b/core/modules/book/book.routing.yml @@ -2,6 +2,7 @@ book.render: path: '/book' defaults: _content: '\Drupal\book\Controller\BookController::bookRender' + _title: 'Books' requirements: _permission: 'access content' @@ -9,6 +10,7 @@ book.admin: path: '/admin/structure/book' defaults: _content: '\Drupal\book\Controller\BookController::adminOverview' + _title: 'Books' requirements: _permission: 'administer book outlines' @@ -16,6 +18,7 @@ book.settings: path: '/admin/structure/book/settings' defaults: _form: '\Drupal\book\Form\BookSettingsForm' + _title: 'Books' requirements: _permission: 'administer site configuration' @@ -31,6 +34,7 @@ book.outline: path: '/node/{node}/outline' defaults: _entity_form: 'node.book_outline' + _title: 'Outline' requirements: _permission: 'administer book outlines' _entity_access: 'node.view' diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml index 46089bf96db8cdea27f63c0916ae9066682697f7..fcb8bab7feebf0c011e34d470a36ebe9229a5d8f 100644 --- a/core/modules/comment/comment.routing.yml +++ b/core/modules/comment/comment.routing.yml @@ -69,6 +69,7 @@ comment.bundle_list: path: '/admin/structure/comments' defaults: _content: 'Drupal\comment\Controller\AdminController::overviewBundles' + _title: 'Comment forms' requirements: _permission: 'administer comments' diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml index f12d67e67eb66c10b9c0fab9a2a6034fa65343e7..3c2f8927d2e920ff7224ba895318986485f94cd4 100644 --- a/core/modules/contact/contact.routing.yml +++ b/core/modules/contact/contact.routing.yml @@ -10,6 +10,7 @@ contact.category_list: path: '/admin/structure/contact' defaults: _entity_list: 'contact_category' + _title: 'Contact form categories' requirements: _permission: 'administer contact forms' @@ -25,6 +26,7 @@ contact.category_edit: path: '/admin/structure/contact/manage/{contact_category}' defaults: _entity_form: contact_category.edit + _title: 'Edit contact category' requirements: _entity_access: contact_category.update diff --git a/core/modules/dblog/dblog.routing.yml b/core/modules/dblog/dblog.routing.yml index 7fe8cab6c7da80ec069d9993c51fb5d135fb81ea..3bc115b25c2dd2973ef1bae927073cc35d26fbac 100644 --- a/core/modules/dblog/dblog.routing.yml +++ b/core/modules/dblog/dblog.routing.yml @@ -2,6 +2,7 @@ dblog.overview: path: '/admin/reports/dblog' defaults: _content: '\Drupal\dblog\Controller\DbLogController::overview' + _title: 'Recent log messages' requirements: _permission: 'access site reports' @@ -9,6 +10,7 @@ dblog.event: path: '/admin/reports/event/{event_id}' defaults: _content: '\Drupal\dblog\Controller\DbLogController::eventDetails' + _title: 'Details' requirements: _permission: 'access site reports' diff --git a/core/modules/entity/entity.routing.yml b/core/modules/entity/entity.routing.yml index f390a6507032c155018e7be4af154411ceb2d8b9..747dc064f9a861a8a25b79d9180ca5d8782fc10c 100644 --- a/core/modules/entity/entity.routing.yml +++ b/core/modules/entity/entity.routing.yml @@ -2,6 +2,7 @@ entity.display_mode: path: '/admin/structure/display-modes' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' + _title: 'Display modes' requirements: _permission: 'administer display modes' @@ -9,6 +10,7 @@ entity.view_mode_list: path: '/admin/structure/display-modes/view' defaults: _entity_list: 'view_mode' + _title: 'View modes' requirements: _permission: 'administer display modes' @@ -24,6 +26,7 @@ entity.view_mode_add_type: path: '/admin/structure/display-modes/view/add/{entity_type}' defaults: _entity_form: 'view_mode.add' + _title: 'Add view mode' requirements: _permission: 'administer display modes' @@ -31,6 +34,7 @@ entity.view_mode_edit: path: '/admin/structure/display-modes/view/manage/{view_mode}' defaults: _entity_form: 'view_mode.edit' + _title: 'Edit view mode' requirements: _entity_access: 'view_mode.update' @@ -38,6 +42,7 @@ entity.view_mode_delete: path: '/admin/structure/display-modes/view/manage/{view_mode}/delete' defaults: _entity_form: 'view_mode.delete' + _title: 'Delete view mode' requirements: _entity_access: 'view_mode.delete' @@ -45,6 +50,7 @@ entity.form_mode_list: path: '/admin/structure/display-modes/form' defaults: _entity_list: 'form_mode' + _title: 'Form modes' requirements: _permission: 'administer display modes' @@ -60,6 +66,7 @@ entity.form_mode_add_type: path: '/admin/structure/display-modes/form/add/{entity_type}' defaults: _entity_form: 'form_mode.add' + _title: 'Add form mode' requirements: _permission: 'administer display modes' @@ -67,6 +74,7 @@ entity.form_mode_edit: path: '/admin/structure/display-modes/form/manage/{form_mode}' defaults: _entity_form: 'form_mode.edit' + _title: 'Edit form mode' requirements: _entity_access: 'form_mode.update' @@ -74,5 +82,6 @@ entity.form_mode_delete: path: '/admin/structure/display-modes/form/manage/{form_mode}/delete' defaults: _entity_form: 'form_mode.delete' + _title: 'Delete form mode' requirements: _entity_access: 'form_mode.delete' diff --git a/core/modules/field_ui/field_ui.routing.yml b/core/modules/field_ui/field_ui.routing.yml index 636d534fe20ba64a9d3c646f6447c927d284ee4a..b8407707d8c85272c6ec8a3d93eb1ec1e76460b9 100644 --- a/core/modules/field_ui/field_ui.routing.yml +++ b/core/modules/field_ui/field_ui.routing.yml @@ -2,5 +2,6 @@ field_ui.list: path: '/admin/reports/fields' defaults: _entity_list: 'field_entity' + _title: 'Field list' requirements: _permission: 'administer content types' diff --git a/core/modules/filter/filter.routing.yml b/core/modules/filter/filter.routing.yml index 9bc6245f3493ed916bf95a3c1af3e6b7cae49c76..6dd8138ad9c4812a8abe278a8b17c118a51a4277 100644 --- a/core/modules/filter/filter.routing.yml +++ b/core/modules/filter/filter.routing.yml @@ -2,6 +2,7 @@ filter.tips_all: path: '/filter/tips' defaults: _content: '\Drupal\filter\Controller\FilterController::filterTips' + _title: 'Compose tips' requirements: _access: 'TRUE' @@ -9,6 +10,7 @@ filter.tips: path: '/filter/tips/{filter_format}' defaults: _content: '\Drupal\filter\Controller\FilterController::filterTips' + _title: 'Compose tips' requirements: _entity_access: 'filter_format.view' @@ -40,6 +42,7 @@ filter.admin_disable: path: '/admin/config/content/formats/manage/{filter_format}/disable' defaults: _entity_form: 'filter_format.disable' + _title: 'Disable text format' requirements: _filter_disable_format_access: 'TRUE' _permission: 'administer filters' diff --git a/core/modules/forum/forum.routing.yml b/core/modules/forum/forum.routing.yml index 9a2ac5faf6858a30c7d467e6d93ad0ad48791e4b..3a0b6b932c85d42d879ca390f1fcf557cb99935b 100644 --- a/core/modules/forum/forum.routing.yml +++ b/core/modules/forum/forum.routing.yml @@ -2,6 +2,7 @@ forum.delete: path: '/admin/structure/forum/delete/forum/{taxonomy_term}' defaults: _form: '\Drupal\forum\Form\DeleteForm' + _title: 'Delete forum' requirements: _permission: 'administer forums' @@ -9,6 +10,7 @@ forum.settings: path: '/admin/structure/forum/settings' defaults: _form: '\Drupal\forum\ForumSettingsForm' + _title: 'Forums' requirements: _permission: 'administer forums' @@ -16,6 +18,7 @@ forum.index: path: '/forum' defaults: _content: '\Drupal\forum\Controller\ForumController::forumIndex' + _title: 'Forums' requirements: _permission: 'access content' @@ -30,6 +33,7 @@ forum.add_container: path: '/admin/structure/forum/add/container' defaults: _content: '\Drupal\forum\Controller\ForumController::addContainer' + _title: 'Add container' requirements: _permission: 'administer forums' @@ -37,6 +41,7 @@ forum.add_forum: path: '/admin/structure/forum/add/forum' defaults: _content: '\Drupal\forum\Controller\ForumController::addForum' + _title: 'Add forum' requirements: _permission: 'administer forums' @@ -44,6 +49,7 @@ forum.edit_container: path: '/admin/structure/forum/edit/container/{taxonomy_term}' defaults: _entity_form: 'taxonomy_term.container' + _title: 'Edit container' requirements: _permission: 'administer forums' @@ -51,6 +57,7 @@ forum.edit_forum: path: '/admin/structure/forum/edit/forum/{taxonomy_term}' defaults: _entity_form: 'taxonomy_term.forum' + _title: 'Edit forum' requirements: _permission: 'administer forums' @@ -58,5 +65,6 @@ forum.overview: path: '/admin/structure/forum' defaults: _form: '\Drupal\forum\Form\Overview' + _title: 'Forums' requirements: _permission: 'administer forums' diff --git a/core/modules/help/help.routing.yml b/core/modules/help/help.routing.yml index ee0991c3f3e42091fe691bc3a5b325470e2e1ee2..a393eb8c423d0148ace3abba33358894adfdacd4 100644 --- a/core/modules/help/help.routing.yml +++ b/core/modules/help/help.routing.yml @@ -2,6 +2,7 @@ help.main: path: '/admin/help' defaults: _content: '\Drupal\help\Controller\HelpController::helpMain' + _title: 'Help' requirements: _permission: 'access administration pages' @@ -9,5 +10,6 @@ help.page: path: '/admin/help/{name}' defaults: _content: '\Drupal\help\Controller\HelpController::helpPage' + _title: 'Help' requirements: _permission: 'access administration pages' diff --git a/core/modules/image/image.routing.yml b/core/modules/image/image.routing.yml index ae5e88f03f204975d6cb7f5361669dc04702e826..cf358af5b809a2fdbb6574e76e21d472047e5a80 100644 --- a/core/modules/image/image.routing.yml +++ b/core/modules/image/image.routing.yml @@ -2,6 +2,7 @@ image.style_add: path: '/admin/config/media/image-styles/add' defaults: _entity_form: image_style.add + _title: 'Add image style' requirements: _permission: 'administer image styles' @@ -9,6 +10,7 @@ image.style_edit: path: '/admin/config/media/image-styles/manage/{image_style}' defaults: _entity_form: image_style.edit + _title: 'Edit style' requirements: _permission: 'administer image styles' @@ -32,6 +34,7 @@ image.effect_delete: path: '/admin/config/media/image-styles/manage/{image_style}/effects/{image_effect}/delete' defaults: _form: '\Drupal\image\Form\ImageEffectDeleteForm' + _title: 'Delete image effect' requirements: _permission: 'administer image styles' @@ -39,6 +42,7 @@ image.style_list: path: '/admin/config/media/image-styles' defaults: _entity_list: 'image_style' + _title: 'Image styles' requirements: _permission: 'administer image styles' @@ -53,6 +57,7 @@ image.effect_add_form: path: '/admin/config/media/image-styles/manage/{image_style}/add/{image_effect}' defaults: _form: '\Drupal\image\Form\ImageEffectAddForm' + _title: 'Add image effect' requirements: _permission: 'administer image styles' @@ -60,5 +65,6 @@ image.effect_edit_form: path: '/admin/config/media/image-styles/manage/{image_style}/effects/{image_effect}' defaults: _form: '\Drupal\image\Form\ImageEffectEditForm' + _title: 'Edit image effect' requirements: _permission: 'administer image styles' diff --git a/core/modules/language/language.routing.yml b/core/modules/language/language.routing.yml index 3b76d565abd3bdb1e9bfcd9a60e7afe28f26710e..4308ae0a841cf080fd29e3b38f938cf148b20dc4 100644 --- a/core/modules/language/language.routing.yml +++ b/core/modules/language/language.routing.yml @@ -23,6 +23,7 @@ language.add: path: '/admin/config/regional/language/add' defaults: _entity_form: 'language_entity.add' + _title: 'Add language' requirements: _entity_create_access: 'language_entity' @@ -38,6 +39,7 @@ language.admin_overview: path: '/admin/config/regional/language' defaults: _entity_list: 'language_entity' + _title: 'Languages' requirements: _permission: 'administer languages' @@ -45,6 +47,7 @@ language.delete: path: '/admin/config/regional/language/delete/{language_entity}' defaults: _entity_form: 'language_entity.delete' + _title: 'Delete language' requirements: _entity_access: 'language_entity.delete' diff --git a/core/modules/locale/locale.routing.yml b/core/modules/locale/locale.routing.yml index cc60aecc744b20bbaf8abd773e96cd45358c314d..190ddf77db08daf9a74045c0b2f661bf22be50f2 100644 --- a/core/modules/locale/locale.routing.yml +++ b/core/modules/locale/locale.routing.yml @@ -2,6 +2,7 @@ locale.settings: path: '/admin/config/regional/translate/settings' defaults: _form: 'Drupal\locale\Form\LocaleSettingsForm' + _title: 'Settings' requirements: _permission: 'translate interface' @@ -16,6 +17,7 @@ locale.translate_page: path: '/admin/config/regional/translate' defaults: _content: 'Drupal\locale\Controller\LocaleController::translatePage' + _title: 'User interface translation' requirements: _permission: 'translate interface' diff --git a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php b/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php index 1ffac57cb8c8098bbdc73d63db0af2775f5d2ed3..bcf65dc48ff440fa41a9d2751bcd61c1f8e75f0d 100644 --- a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php +++ b/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php @@ -7,6 +7,7 @@ namespace Drupal\menu\Controller; +use Drupal\Component\Utility\Xss; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\menu_link\MenuLinkStorageControllerInterface; @@ -96,4 +97,17 @@ public function addLink(MenuInterface $menu) { return $this->entityManager->getForm($menu_link); } + /** + * Route title callback. + * + * @param \Drupal\system\MenuInterface $menu + * The menu entity. + * + * @return string + * The menu label. + */ + public function menuTitle(MenuInterface $menu) { + return Xss::filter($menu->label()); + } + } diff --git a/core/modules/menu/menu.routing.yml b/core/modules/menu/menu.routing.yml index 25c1f537536104d2f7ea9d165db02b4deebf8b8e..f3f6e4bfe106030db107edb9f6d3493fef819480 100644 --- a/core/modules/menu/menu.routing.yml +++ b/core/modules/menu/menu.routing.yml @@ -2,6 +2,7 @@ menu.settings: path: '/admin/structure/menu/settings' defaults: _form: 'Drupal\menu\MenuSettingsForm' + _title: 'Menus' requirements: _permission: 'administer menu' @@ -32,6 +33,7 @@ menu.link_edit: path: '/admin/structure/menu/item/{menu_link}/edit' defaults: _entity_form: 'menu_link' + _title: 'Edit menu link' requirements: _entity_access: 'menu_link.update' @@ -39,6 +41,7 @@ menu.link_reset: path: '/admin/structure/menu/item/{menu_link}/reset' defaults: _entity_form: 'menu_link.reset' + _title: 'Reset menu link' requirements: _entity_access: 'menu_link.reset' @@ -46,6 +49,7 @@ menu.link_delete: path: '/admin/structure/menu/item/{menu_link}/delete' defaults: _entity_form: 'menu_link.delete' + _title: 'Delete menu link' requirements: _entity_access: 'menu_link.delete' @@ -53,6 +57,7 @@ menu.menu_add: path: '/admin/structure/menu/add' defaults: _entity_form: 'menu.add' + _title: 'Add menu' requirements: _entity_create_access: 'menu' @@ -60,6 +65,7 @@ menu.menu_edit: path: '/admin/structure/menu/manage/{menu}' defaults: _entity_form: 'menu.edit' + _title_callback: '\Drupal\menu\Controller\MenuController::menuTitle' requirements: _entity_access: 'menu.update' diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc index 0a010f93387f82bee59464410545ad0fe13f2c2f..deca292c079d4c0ec86b387bcfd45dcb529b5f71 100644 --- a/core/modules/node/node.pages.inc +++ b/core/modules/node/node.pages.inc @@ -182,7 +182,7 @@ function theme_node_preview($variables) { * @deprecated Use \Drupal\node\Controller\NodeController::revisionOverview() */ function node_revision_overview($node) { - drupal_set_title(t('Revisions for %title', array('%title' => $node->label())), PASS_THROUGH); + $build['#title'] = t('Revisions for %title', array('%title' => $node->label())); $header = array(t('Revision'), t('Operations')); diff --git a/core/modules/node/node.routing.yml b/core/modules/node/node.routing.yml index 1cd8ec2b2d117ee3f68052262b1f7987251f96f0..b16080c5d3370a828bdada99ddd60cb812480d38 100644 --- a/core/modules/node/node.routing.yml +++ b/core/modules/node/node.routing.yml @@ -74,6 +74,7 @@ node.revision_revert_confirm: path: '/node/{node}/revisions/{node_revision}/revert' defaults: _form: '\Drupal\node\Form\NodeRevisionRevertForm' + _title: 'Revert to earlier revision' requirements: _access_node_revision: 'update' @@ -81,6 +82,7 @@ node.revision_delete_confirm: path: '/node/{node}/revisions/{node_revision}/delete' defaults: _form: '\Drupal\node\Form\NodeRevisionDeleteForm' + _title: 'Delete earlier revision' requirements: _access_node_revision: 'delete' @@ -97,6 +99,7 @@ node.type_add: path: '/admin/structure/types/add' defaults: _entity_form: 'node_type.add' + _title: 'Add content type' requirements: _permission: 'administer content types' diff --git a/core/modules/path/path.routing.yml b/core/modules/path/path.routing.yml index a6712e2c63ec04e1c31b8813aab926aadb69ba47..15607ca75217afc50503ff5bd1a6394d0a049a48 100644 --- a/core/modules/path/path.routing.yml +++ b/core/modules/path/path.routing.yml @@ -2,6 +2,7 @@ path.delete: path: '/admin/config/search/path/delete/{pid}' defaults: _form: '\Drupal\path\Form\DeleteForm' + _title: 'Delete alias' requirements: _permission: 'administer url aliases' diff --git a/core/modules/picture/picture.routing.yml b/core/modules/picture/picture.routing.yml index 4452c3fbd0678f108a6030b5a3f8f518169713de..11c2dcfd28d6b224376e61692a69357868b4aff7 100644 --- a/core/modules/picture/picture.routing.yml +++ b/core/modules/picture/picture.routing.yml @@ -2,6 +2,7 @@ picture.mapping_page: path: '/admin/config/media/picturemapping' defaults: _entity_list: 'picture_mapping' + _title: 'Picture mappings' requirements: _permission: 'administer pictures' @@ -9,6 +10,7 @@ picture.mapping_page_add: path: '/admin/config/media/picturemapping/add' defaults: _entity_form: 'picture_mapping.add' + _title: 'Add picture mapping' requirements: _permission: 'administer pictures' @@ -16,6 +18,7 @@ picture.mapping_page_edit: path: '/admin/config/media/picturemapping/{picture_mapping}' defaults: _entity_form: 'picture_mapping.edit' + _title: 'Edit picture mapping' requirements: _permission: 'administer pictures' @@ -23,6 +26,7 @@ picture.mapping_page_duplicate: path: '/admin/config/media/picturemapping/{picture_mapping}/duplicate' defaults: _entity_form: 'picture_mapping.duplicate' + _title: 'Duplicate picture mapping' requirements: _permission: 'administer pictures' diff --git a/core/modules/search/search.routing.yml b/core/modules/search/search.routing.yml index 21e481e61261f8b030aa39e2bb1f3a83d400de4f..9502d77924f597949bc7f64978f85fa1c631512d 100644 --- a/core/modules/search/search.routing.yml +++ b/core/modules/search/search.routing.yml @@ -2,6 +2,7 @@ search.settings: path: '/admin/config/search/settings' defaults: _form: '\Drupal\search\Form\SearchSettingsForm' + _title: 'Search settings' requirements: _permission: 'administer search' @@ -9,6 +10,7 @@ search.reindex_confirm: path: '/admin/config/search/settings/reindex' defaults: _form: '\Drupal\search\Form\ReindexConfirm' + _title: 'Clear index' requirements: _permission: 'administer search' diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc index 95fc18dff4eb9f5a1249a07a44b7ba07240591cb..db98d3289494f9e6b62618646ac7bbed0efdc7b5 100644 --- a/core/modules/shortcut/shortcut.admin.inc +++ b/core/modules/shortcut/shortcut.admin.inc @@ -199,7 +199,7 @@ function shortcut_set_switch_submit($form, &$form_state) { * @deprecated Use \Drupal\shortcut\Form\ShortcutForm::add() */ function shortcut_link_add($form, &$form_state, $shortcut_set) { - drupal_set_title(t('Add new shortcut')); + $form['#title'] = t('Add new shortcut'); $form['shortcut_set'] = array( '#type' => 'value', '#value' => $shortcut_set, @@ -228,7 +228,7 @@ function shortcut_link_add($form, &$form_state, $shortcut_set) { * @deprecated Use \Drupal\shortcut\Form\ShortcutForm::edit() */ function shortcut_link_edit($form, &$form_state, $shortcut_link) { - drupal_set_title(t('Editing @shortcut', array('@shortcut' => $shortcut_link['link_title']))); + $form['#title'] = t('Editing @shortcut', array('@shortcut' => $shortcut_link['link_title'])); $form['original_shortcut_link'] = array( '#type' => 'value', '#value' => $shortcut_link, diff --git a/core/modules/shortcut/shortcut.routing.yml b/core/modules/shortcut/shortcut.routing.yml index 34dbac181dab1a4326f84dd0886e9322727d6e86..abbe1e6eda1b4e58cf3dca3c600cae1bb7a98109 100644 --- a/core/modules/shortcut/shortcut.routing.yml +++ b/core/modules/shortcut/shortcut.routing.yml @@ -2,6 +2,7 @@ shortcut.link_delete: path: '/admin/config/user-interface/shortcut/link/{menu_link}/delete' defaults: _form: 'Drupal\shortcut\Form\LinkDelete' + _title: 'Delete shortcut' requirements: _access_shortcut_link: 'TRUE' @@ -17,6 +18,7 @@ shortcut.set_admin: path: '/admin/config/user-interface/shortcut' defaults: _entity_list: 'shortcut_set' + _title: 'Shortcuts' requirements: _permission: 'administer shortcuts' @@ -24,6 +26,7 @@ shortcut.set_add: path: '/admin/config/user-interface/shortcut/add-set' defaults: _entity_form: 'shortcut_set.add' + _title: 'Add shortcut set' requirements: _entity_create_access: 'shortcut_set' @@ -31,6 +34,7 @@ shortcut.set_edit: path: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/edit' defaults: _entity_form: 'shortcut_set.edit' + _title: 'Edit shortcut set' requirements: _entity_access: 'shortcut_set.update' @@ -46,6 +50,7 @@ shortcut.set_customize: path: '/admin/config/user-interface/shortcut/manage/{shortcut_set}' defaults: _entity_form: 'shortcut_set.customize' + _title: 'List links' requirements: _entity_access: 'shortcut_set.update' diff --git a/core/modules/simpletest/simpletest.routing.yml b/core/modules/simpletest/simpletest.routing.yml index 6eb57eaefa7fc8df829d48c50af4be93e0ea8545..ae67d46bb8e4229d929a7fd18615b67874363fab 100644 --- a/core/modules/simpletest/simpletest.routing.yml +++ b/core/modules/simpletest/simpletest.routing.yml @@ -2,6 +2,7 @@ simpletest.settings: path: '/admin/config/development/testing/settings' defaults: _form: 'Drupal\simpletest\Form\SimpletestSettingsForm' + _title: 'Settings' requirements: _permission: 'administer unit tests' @@ -9,6 +10,7 @@ simpletest.test_form: path: '/admin/config/development/testing' defaults: _form: '\Drupal\simpletest\Form\SimpletestTestForm' + _title: 'Testing' requirements: _permission: 'administer unit tests' @@ -16,5 +18,6 @@ simpletest.result_form: path: '/admin/config/development/testing/results/{test_id}' defaults: _form: 'Drupal\simpletest\Form\SimpletestResultsForm' + _title: 'Test result' requirements: _permission: 'administer unit tests' diff --git a/core/modules/statistics/statistics.routing.yml b/core/modules/statistics/statistics.routing.yml index 45a60f374dfd3c53d00c803a80e459b67915977b..d5ea04c3f2cb4ee4dae95b99d3b1c459796aae65 100644 --- a/core/modules/statistics/statistics.routing.yml +++ b/core/modules/statistics/statistics.routing.yml @@ -2,5 +2,6 @@ statistics.settings: path: '/admin/config/system/statistics' defaults: _form: 'Drupal\statistics\StatisticsSettingsForm' + _title: 'Statistics' requirements: _permission: 'administer statistics' 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 4c03fa0f8f86a32d18ee1819e47e378b447f8f98..a28733c7817f85d379c6c411818bce78a31b1626 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php @@ -322,8 +322,7 @@ function testBreadCrumbs() { )); $this->drupalLogin($this->web_user); - // Verify correct breadcrumb and page title on another user's account pages - // (without menu link). + // Verify correct breadcrumb and page title on another user's account pages. $trail = $home; $this->assertBreadcrumb('user/' . $this->admin_user->id(), $trail, $this->admin_user->getUsername()); $trail += array( @@ -331,8 +330,7 @@ function testBreadCrumbs() { ); $this->assertBreadcrumb('user/' . $this->admin_user->id() . '/edit', $trail, $this->admin_user->getUsername()); - // Verify correct breadcrumb and page title when viewing own user account - // pages (without menu link). + // Verify correct breadcrumb and page title when viewing own user account. $trail = $home; $this->assertBreadcrumb('user/' . $this->web_user->id(), $trail, $this->web_user->getUsername()); $trail += array( @@ -343,38 +341,6 @@ function testBreadCrumbs() { ); $this->assertBreadcrumb('user/' . $this->web_user->id() . '/edit', $trail, $this->web_user->getUsername(), $tree); - // Add a Tools menu links for 'user' and $this->admin_user. - // Although it may be faster to manage these links via low-level API - // functions, there's a lot that can go wrong in doing so. - $this->drupalLogin($this->admin_user); - $edit = array( - 'link_title' => 'User', - 'link_path' => 'user', - ); - $this->drupalPostForm("admin/structure/menu/manage/$menu/add", $edit, t('Save')); - $menu_links_user = entity_load_multiple_by_properties('menu_link', array('link_title' => $edit['link_title'], 'link_path' => $edit['link_path'])); - $link_user = reset($menu_links_user); - - $edit = array( - 'link_title' => $this->admin_user->getUsername() . ' link', - 'link_path' => 'user/' . $this->admin_user->id(), - ); - $this->drupalPostForm("admin/structure/menu/manage/$menu/add", $edit, t('Save')); - $menu_links_admin_user = entity_load_multiple_by_properties('menu_link', array('link_title' => $edit['link_title'], 'link_path' => $edit['link_path'])); - $link_admin_user = reset($menu_links_admin_user); - - // Verify expected breadcrumbs for the two separate links. - $this->drupalLogout(); - $trail = $home; - $tree = array( - $link_user['link_path'] => $link_user['link_title'], - ); - $this->assertBreadcrumb('user', $trail, $link_user['link_title'], $tree); - $tree = array( - $link_admin_user['link_path'] => $link_admin_user['link_title'], - ); - // $this->assertBreadcrumb('user/' . $this->admin_user->id(), $trail, $link_admin_user['link_title'], $tree); - // Create an only slightly privileged user being able to access site reports // but not administration pages. $this->web_user = $this->drupalCreateUser(array( diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 8ca02734e6688805f31ecb16ec915d6f33d8082b..b81ad1f42932e2201ff19c90989d1cbc7dd5d770 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -2773,7 +2773,7 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL, $options = array('path' => $path); } - drupal_set_title($question, PASS_THROUGH); + $form['#title'] = $question; $form['#attributes']['class'][] = 'confirmation'; $form['description'] = array('#markup' => $description); diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index 77a741943c8e54583a8663956d4c5aa7902e021b..5bf659df148b5178057599ea1192b71cbb445a88 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -127,6 +127,7 @@ system.site_information_settings: path: '/admin/config/system/site-information' defaults: _form: 'Drupal\system\Form\SiteInformationForm' + _title: 'Site information' requirements: _permission: 'administer site configuration' @@ -134,6 +135,7 @@ system.cron_settings: path: '/admin/config/system/cron' defaults: _form: 'Drupal\system\Form\CronForm' + _title: 'Cron' requirements: _permission: 'administer site configuration' @@ -141,6 +143,7 @@ system.logging_settings: path: '/admin/config/development/logging' defaults: _form: 'Drupal\system\Form\LoggingForm' + _title: 'Logging and errors' requirements: _permission: 'administer site configuration' @@ -148,6 +151,7 @@ system.performance_settings: path: '/admin/config/development/performance' defaults: _form: 'Drupal\system\Form\PerformanceForm' + _title: 'Performance' requirements: _permission: 'administer site configuration' @@ -155,6 +159,7 @@ system.file_system_settings: path: '/admin/config/media/file-system' defaults: _form: 'Drupal\system\Form\FileSystemForm' + _title: 'File system' requirements: _permission: 'administer site configuration' @@ -162,6 +167,7 @@ system.rss_feeds_settings: path: '/admin/config/services/rss-publishing' defaults: _form: 'Drupal\system\Form\RssFeedsForm' + _title: 'RSS publishing' requirements: _permission: 'administer site configuration' @@ -169,6 +175,7 @@ system.regional_settings: path: '/admin/config/regional/settings' defaults: _form: 'Drupal\system\Form\RegionalForm' + _title: 'Regional settings' requirements: _permission: 'administer site configuration' @@ -176,6 +183,7 @@ system.image_toolkit_settings: path: '/admin/config/media/image-toolkit' defaults: _form: 'Drupal\system\Form\ImageToolkitForm' + _title: 'Image toolkit' requirements: _permission: 'administer administration pages' @@ -183,6 +191,7 @@ system.site_maintenance_mode: path: '/admin/config/development/maintenance' defaults: _form: 'Drupal\system\Form\SiteMaintenanceModeForm' + _title: 'Maintenance mode' requirements: _permission: 'administer site configuration' @@ -197,6 +206,7 @@ system.date_format_list: path: '/admin/config/regional/date-time' defaults: _entity_list: 'date_format' + _title: 'Date and time formats' requirements: _permission: 'administer site configuration' @@ -204,6 +214,7 @@ system.date_format_add: path: '/admin/config/regional/date-time/formats/add' defaults: _entity_form: 'date_format.add' + _title: 'Add date format' requirements: _permission: 'administer site configuration' @@ -211,6 +222,7 @@ system.date_format_edit: path: '/admin/config/regional/date-time/formats/manage/{date_format}' defaults: _entity_form: 'date_format.edit' + _title: 'Edit date format' requirements: _entity_access: 'date_format.update' @@ -235,6 +247,7 @@ system.modules_list_confirm: path: '/admin/modules/list/confirm' defaults: _form: 'Drupal\system\Form\ModulesListConfirmForm' + _title: 'Some required modules must be enabled' requirements: _permission: 'administer modules' @@ -256,6 +269,7 @@ system.status: path: '/admin/reports/status' defaults: _controller: 'Drupal\system\Controller\SystemInfoController::status' + _title: 'Status report' requirements: _permission: 'administer site configuration' @@ -309,6 +323,7 @@ system.theme_settings: path: '/admin/appearance/settings' defaults: _form: '\Drupal\system\Form\ThemeSettingsForm' + _title: 'Settings' requirements: _permission: 'administer themes' @@ -335,6 +350,7 @@ system.modules_uninstall_confirm: path: '/admin/modules/uninstall/confirm' defaults: _form: 'Drupal\system\Form\ModulesUninstallConfirmForm' + _title: 'Confirm uninstall' requirements: _permission: 'administer modules' diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php index eb57cc56ef63e8ac2ee22239e83ca6da7b04a8f0..e79c37ce59fb01ac81426dcd55ba52944cd1698f 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php @@ -7,6 +7,7 @@ namespace Drupal\taxonomy\Controller; +use Drupal\Component\Utility\Xss; use Drupal\Core\Controller\ControllerBase; use Drupal\taxonomy\TermInterface; use Drupal\taxonomy\VocabularyInterface; @@ -42,6 +43,19 @@ public function termPage(TermInterface $taxonomy_term) { return taxonomy_term_page($taxonomy_term); } + /** + * Route title callback. + * + * @param \Drupal\taxonomy\TermInterface $taxonomy_term + * The taxonomy term. + * + * @return string + * The term label. + */ + public function termTitle(TermInterface $taxonomy_term) { + return Xss::filter($taxonomy_term->label()); + } + /** * @todo Remove taxonomy_term_feed(). */ diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc index 96f84aaa9a8429ba390912723eef27c95843197d..c327191cbecc66d993080c7535785b86a4a6afe2 100644 --- a/core/modules/taxonomy/taxonomy.pages.inc +++ b/core/modules/taxonomy/taxonomy.pages.inc @@ -16,9 +16,6 @@ * @deprecated Use \Drupal\taxonomy\Controller\TaxonomyController::termPage() */ function taxonomy_term_page(Term $term) { - // Assign the term name as the page title. - drupal_set_title($term->label()); - $build['#attached']['drupal_add_feed'][] = array('taxonomy/term/' . $term->id() . '/feed', 'RSS - ' . $term->label()); foreach ($term->uriRelationships() as $rel) { diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml index 9ca17aff3ca3a98230894b12860e30e22794cf96..804086001a0e0bfa4d8b078105d4b7054bbe8efa 100644 --- a/core/modules/taxonomy/taxonomy.routing.yml +++ b/core/modules/taxonomy/taxonomy.routing.yml @@ -10,6 +10,7 @@ taxonomy.term_add: path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/add' defaults: _content: '\Drupal\taxonomy\Controller\TaxonomyController::addForm' + _title: 'Add term' requirements: _entity_create_access: 'taxonomy_term:{taxonomy_vocabulary}' @@ -17,6 +18,7 @@ taxonomy.term_edit: path: '/taxonomy/term/{taxonomy_term}/edit' defaults: _entity_form: 'taxonomy_term.default' + _title: 'Edit term' requirements: _entity_access: 'taxonomy_term.update' @@ -24,6 +26,7 @@ taxonomy.term_delete: path: '/taxonomy/term/{taxonomy_term}/delete' defaults: _entity_form: 'taxonomy_term.delete' + _title: 'Delete term' requirements: _entity_access: 'taxonomy_term.delete' @@ -31,6 +34,7 @@ taxonomy.vocabulary_add: path: '/admin/structure/taxonomy/add' defaults: _entity_form: 'taxonomy_vocabulary' + _title: 'Add vocabulary' requirements: _entity_create_access: 'taxonomy_vocabulary' @@ -38,6 +42,7 @@ taxonomy.vocabulary_edit: path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/edit' defaults: _entity_form: 'taxonomy_vocabulary.default' + _title: 'Edit vocabulary' requirements: _entity_access: 'taxonomy_vocabulary.update' @@ -45,6 +50,7 @@ taxonomy.vocabulary_delete: path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/delete' defaults: _entity_form: 'taxonomy_vocabulary.delete' + _title: 'Delete vocabulary' requirements: _entity_access: 'taxonomy_vocabulary.delete' @@ -80,6 +86,8 @@ taxonomy.term_page: path: '/taxonomy/term/{taxonomy_term}' defaults: _content: '\Drupal\taxonomy\Controller\TaxonomyController::termPage' + _title: 'Taxonomy term' + _title_callback: '\Drupal\taxonomy\Controller\TaxonomyController::termTitle' requirements: _entity_access: 'taxonomy_term.view' @@ -87,5 +95,7 @@ taxonomy.term_feed: path: '/taxonomy/term/{taxonomy_term}/feed' defaults: _content: '\Drupal\taxonomy\Controller\TaxonomyController::termFeed' + _title: 'Taxonomy term' + _title_callback: '\Drupal\taxonomy\Controller\TaxonomyController::termTitle' requirements: _entity_access: 'taxonomy_term.view' diff --git a/core/modules/update/update.routing.yml b/core/modules/update/update.routing.yml index fcfbdd146e3b879cd8f07342b0c214954c7f675e..2ed1b68ce599adf6c909d1b4047fd38d88882ee2 100644 --- a/core/modules/update/update.routing.yml +++ b/core/modules/update/update.routing.yml @@ -2,6 +2,7 @@ update.settings: path: '/admin/reports/updates/settings' defaults: _form: '\Drupal\update\UpdateSettingsForm' + _title: 'Settings' requirements: _permission: 'administer site configuration' @@ -9,6 +10,7 @@ update.status: path: '/admin/reports/updates' defaults: _content: '\Drupal\update\Controller\UpdateController::updateStatus' + _title: 'Available updates' requirements: _permission: 'administer site configuration' @@ -24,6 +26,7 @@ update.report_install: path: '/admin/reports/updates/install' defaults: _content: '\Drupal\update\Form\UpdateForm::reportInstall' + _title: 'Install' options: _access_mode: 'ALL' requirements: @@ -45,6 +48,7 @@ update.module_install: path: '/admin/modules/install' defaults: _content: '\Drupal\update\Form\UpdateForm::moduleInstall' + _title: 'Install new module' options: _access_mode: 'ALL' requirements: @@ -66,6 +70,7 @@ update.theme_install: path: '/admin/theme/install' defaults: _content: '\Drupal\update\Form\UpdateForm::themeInstall' + _title: 'Install new theme' options: _access_mode: 'ALL' requirements: diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml index 0a693e3afe676702fad0b44ef6f6a03153d2a6bf..bbc2053a7da2be561ad2531b3daa039a5dd06ef9 100644 --- a/core/modules/user/user.routing.yml +++ b/core/modules/user/user.routing.yml @@ -31,6 +31,7 @@ user.admin_index: path: '/admin/config/people' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' + _title: 'People' requirements: _permission: 'access administration pages' @@ -38,6 +39,7 @@ user.account_settings: path: '/admin/config/people/accounts' defaults: _form: '\Drupal\user\AccountSettingsForm' + _title: 'Account settings' requirements: _permission: 'administer account settings' @@ -45,6 +47,7 @@ user.admin_account: path: '/admin/people' defaults: _entity_list: 'user' + _title: 'People' requirements: _permission: 'administer users' @@ -52,6 +55,7 @@ user.admin_create: path: '/admin/people/create' defaults: _entity_form: 'user.register' + _title: 'Add user' requirements: _permission: 'administer users' @@ -59,6 +63,7 @@ user.admin_permissions: path: '/admin/people/permissions' defaults: _form: '\Drupal\user\Form\UserPermissionsForm' + _title: 'Permissions' requirements: _permission: 'administer permissions' @@ -66,6 +71,7 @@ user.admin_permission: path: '/admin/people/permissions/{role_id}' defaults: _form: '\Drupal\user\Form\UserPermissionsRoleSpecificForm' + _title: 'Edit role' requirements: _permission: 'administer permissions' @@ -81,6 +87,7 @@ user.role_list: path: '/admin/people/roles' defaults: _entity_list: 'user_role' + _title: 'Roles' requirements: _permission: 'administer permissions' @@ -88,6 +95,7 @@ user.role_add: path: '/admin/people/roles/add' defaults: _entity_form: user_role.default + _title: 'Add role' requirements: _permission: 'administer permissions' @@ -102,6 +110,7 @@ user.role_delete: path: '/admin/people/roles/manage/{user_role}/delete' defaults: _entity_form: user_role.delete + _title: 'Edit role' requirements: _entity_access: user_role.delete @@ -117,6 +126,7 @@ user.page: path: '/user' defaults: _content: '\Drupal\user\Controller\UserController::userPage' + _title: 'Log in' requirements: _access: 'TRUE' @@ -140,6 +150,7 @@ user.edit: path: '/user/{user}/edit' defaults: _entity_form: 'user.default' + _title_callback: 'Drupal\user\Controller\UserController::userTitle' requirements: _entity_access: 'user.update' diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php index 88cc77f8c0608f3723b2ab41320460102cb1ad25..df736b57589e01811bf92972b3473ef6c08a2c4c 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php @@ -250,7 +250,7 @@ public function edit(ViewUI $view, $display_id = NULL) { if (isset($data['table']['base']['title'])) { $name .= ' (' . $data['table']['base']['title'] . ')'; } - drupal_set_title($name); + $build['#title'] = $name; $build['edit'] = $this->entityManager->getForm($view, 'edit', array('display_id' => $display_id)); $build['preview'] = $this->entityManager->getForm($view, 'preview', array('display_id' => $display_id)); diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php index 8ed17457ee217b307876d4b3840ae8974ff5770b..2c3d19c92010291fc9b180b91d45176db008db04 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php @@ -43,15 +43,6 @@ public static function create(ContainerInterface $container) { ); } - /** - * {@inheritdoc} - */ - public function init(array &$form_state) { - parent::init($form_state); - - drupal_set_title($this->t('Add new view')); - } - /** * {@inheritdoc} */ diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php index 68e24245a7051225b1386b39526287a42e1de7be..4071738cc82e52a2d881e650247c74632eb0cc8c 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php @@ -12,15 +12,6 @@ */ class ViewCloneFormController extends ViewFormControllerBase { - /** - * {@inheritdoc} - */ - public function init(array &$form_state) { - parent::init($form_state); - - drupal_set_title($this->t('Clone of @label', array('@label' => $this->entity->label()))); - } - /** * {@inheritdoc} */ @@ -34,6 +25,8 @@ protected function prepareEntity() { public function form(array $form, array &$form_state) { parent::form($form, $form_state); + $form['#title'] = $this->t('Clone of @label', array('@label' => $this->entity->label())); + $form['label'] = array( '#type' => 'textfield', '#title' => $this->t('View name'), diff --git a/core/modules/views_ui/views_ui.routing.yml b/core/modules/views_ui/views_ui.routing.yml index 3efc9ea760d1b617e60b7c4455e4b96b818985e9..a064b24d8cc6b363eefc1bbd557fb08a8e952b9f 100644 --- a/core/modules/views_ui/views_ui.routing.yml +++ b/core/modules/views_ui/views_ui.routing.yml @@ -2,6 +2,7 @@ views_ui.list: path: '/admin/structure/views' defaults: _entity_list: 'view' + _title: 'Views' requirements: _permission: 'administer views' @@ -9,6 +10,7 @@ views_ui.add: path: '/admin/structure/views/add' defaults: _entity_form: 'view.add' + _title: 'Add new view' requirements: _permission: 'administer views' @@ -16,6 +18,7 @@ views_ui.settings_basic: path: '/admin/structure/views/settings' defaults: _form: '\Drupal\views_ui\Form\BasicSettingsForm' + _title: 'Settings' requirements: _permission: 'administer views' @@ -23,6 +26,7 @@ views_ui.settings_advanced: path: '/admin/structure/views/settings/advanced' defaults: _form: '\Drupal\views_ui\Form\AdvancedSettingsForm' + _title: 'Advanced' requirements: _permission: 'administer views' @@ -30,6 +34,7 @@ views_ui.reports_fields: path: '/admin/reports/fields/views-fields' defaults: _content: '\Drupal\views_ui\Controller\ViewsUIController::reportFields' + _title: 'Used in views' requirements: _permission: 'administer views' @@ -37,6 +42,7 @@ views_ui.reports_plugins: path: '/admin/reports/views-plugins' defaults: _content: '\Drupal\views_ui\Controller\ViewsUIController::reportPlugins' + _title: 'Views plugins' requirements: _permission: 'administer views' @@ -52,6 +58,7 @@ views_ui.clone: path: '/admin/structure/views/view/{view}/clone' defaults: _entity_form: 'view.clone' + _title: 'Clone view' requirements: _permission: 'administer views' @@ -59,6 +66,7 @@ views_ui.delete: path: '/admin/structure/views/view/{view}/delete' defaults: _entity_form: 'view.delete' + _title: 'Delete view' requirements: _permission: 'administer views'