diff -u b/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php --- b/core/lib/Drupal/Core/Extension/ThemeHandler.php +++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php @@ -269,8 +269,8 @@ 'page_top' => 'Page top', 'page_bottom' => 'Page bottom', 'breadcrumb' => 'Breadcrumb', - 'tabs' => 'Page tabs', - 'actions' => 'Page actions', + 'tabs' => 'Tabs', + 'actions' => 'Local actions', ), 'description' => '', 'features' => $this->defaultFeatures, diff -u b/core/lib/Drupal/Core/Menu/LocalActionManager.php b/core/lib/Drupal/Core/Menu/LocalActionManager.php --- b/core/lib/Drupal/Core/Menu/LocalActionManager.php +++ b/core/lib/Drupal/Core/Menu/LocalActionManager.php @@ -205,6 +205,7 @@ '#access' => $access->isAllowed(), '#weight' => $plugin->getWeight(), ); + // @todo Remove this after https://www.drupal.org/node/2487600 has landed. $this->renderer->addCacheableDependency($links, $access); } diff -u b/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/core/lib/Drupal/Core/Menu/LocalTaskManager.php --- b/core/lib/Drupal/Core/Menu/LocalTaskManager.php +++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php @@ -332,8 +332,10 @@ '#link' => $link, '#active' => $active, '#weight' => $child->getWeight(), - '#access' => $access, + '#access' => $access->isAllowed(), ); + // @todo Remove this after https://www.drupal.org/node/2487600 has + // landed. $this->renderer->addCacheableDependency($build, $access); } } diff -u b/core/modules/system/src/Plugin/Block/SystemLocalActionsBlock.php b/core/modules/system/src/Plugin/Block/SystemLocalActionsBlock.php --- b/core/modules/system/src/Plugin/Block/SystemLocalActionsBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemLocalActionsBlock.php @@ -39,7 +39,7 @@ protected $routeMatch; /** - * Creates a SystemPageActionsBlock instance. + * Creates a SystemLocalActionsBlock instance. * * @param array $configuration * A configuration array containing information about the plugin instance. @@ -103,7 +103,7 @@ // The "Local actions" block is never cacheable because hooks creating local // actions don't provide cacheability metadata. - // @todo Remove after local action hooks provide cacheability metadata. + // @todo Remove after https://www.drupal.org/node/2511508 has landed. $form['cache']['#disabled'] = TRUE; $form['cache']['#description'] = $this->t('This block is never cacheable.'); $form['cache']['max_age']['#value'] = 0; @@ -115,7 +115,7 @@ * {@inheritdoc} */ public function getCacheMaxAge() { - // @todo Remove after local action hooks provide cacheability metadata. + // @todo Remove after https://www.drupal.org/node/2511508 has landed. return 0; } diff -u b/core/modules/system/src/Plugin/Block/SystemTabsBlock.php b/core/modules/system/src/Plugin/Block/SystemTabsBlock.php --- b/core/modules/system/src/Plugin/Block/SystemTabsBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemTabsBlock.php @@ -83,7 +83,7 @@ // The "Page actions" block is never cacheable because of hooks creating // local tasks doesn't provide cacheability metadata. - // @todo Remove after local task hooks provide cacheability metadata. + // @todo Remove after https://www.drupal.org/node/2511508 has landed. $form['cache']['#disabled'] = TRUE; $form['cache']['#description'] = $this->t('This block is never cacheable.'); $form['cache']['max_age']['#value'] = 0; @@ -95,7 +95,7 @@ * {@inheritdoc} */ public function getCacheMaxAge() { - // @todo Remove after local task hooks provide cacheability metadata. + // @todo Remove after https://www.drupal.org/node/2511508 has landed. return 0; } @@ -116,7 +116,7 @@ $form['levels'] = array( '#type' => 'details', '#title' => $this->t('Shown tabs'), - '#description' => $this->t('Select local tasks being shown in the block'), + '#description' => $this->t('Select tabs being shown in the block'), // Open if not set to defaults. '#open' => $defaults['primary'] !== $config['primary'] || $defaults['secondary'] !== $config['secondary'], ); diff -u b/core/modules/system/src/Tests/Menu/LocalTasksTest.php b/core/modules/system/src/Tests/Menu/LocalTasksTest.php --- b/core/modules/system/src/Tests/Menu/LocalTasksTest.php +++ b/core/modules/system/src/Tests/Menu/LocalTasksTest.php @@ -171,7 +171,7 @@ } /** - * Tests that local task blocks are configurable to print a specific level. + * Tests that local task blocks are configurable to show a specific level. */ public function testLocalTaskBlock() { // Remove the default block and create a new one. @@ -192,7 +192,7 @@ ['menu_test.local_task_test_tasks_settings', []], ]); - // Verify that local tasks in the second doesn't appear. + // Verify that local tasks in the second level doesn't appear. $this->assertNoLocalTasks(1); $this->sut->delete(); diff -u b/core/themes/classy/templates/block/block--system-local-actions-block.html.twig b/core/themes/classy/templates/block/block--system-local-actions-block.html.twig --- b/core/themes/classy/templates/block/block--system-local-actions-block.html.twig +++ b/core/themes/classy/templates/block/block--system-local-actions-block.html.twig @@ -2,7 +2,7 @@ {# /** * @file - * Default theme implementation for page local actions. + * Default theme implementation for local actions. * * Available variables: * - action_links: Actions local to the page, such as "Add menu" on the menu diff -u b/core/themes/classy/templates/block/block--system-tabs-block.html.twig b/core/themes/classy/templates/block/block--system-tabs-block.html.twig --- b/core/themes/classy/templates/block/block--system-tabs-block.html.twig +++ b/core/themes/classy/templates/block/block--system-tabs-block.html.twig @@ -2,10 +2,10 @@ {# /** * @file - * Default theme implementation for page tabs. + * Default theme implementation for tabs. * * Available variables: - * - tabs: The Tabs linking to any sub-pages beneath the current page (e.g., the + * - tabs: The tabs linking to any sub-pages beneath the current page (e.g., the * view and edit tabs when displaying a node). * * @ingroup themeable