From 0e83520cbc8b861dd776a41c26d7ac5bbb8de31a Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Tue, 5 Mar 2019 22:19:20 -0800
Subject: [PATCH] Issue #2929783 by tim.plunkett, MerryHamster, bnjmnm, xjm,
webchick, samuel.mortenson, EclipseGc, kevincrafts, ndf, DyanneNova, yoroy,
TheodorosPloumis, tedbow, pixelite, seanB, phenaproxima, AaronMcHale,
benjifisher: Review Layout Builder UI terminology
---
core/modules/layout_builder/layout_builder.routing.yml | 4 ++++
.../layout_builder/src/Controller/ChooseBlockController.php | 1 -
.../layout_builder/src/Controller/ChooseSectionController.php | 2 --
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/modules/layout_builder/layout_builder.routing.yml b/core/modules/layout_builder/layout_builder.routing.yml
index 3e3ee1b0241c..b4360553786a 100644
--- a/core/modules/layout_builder/layout_builder.routing.yml
+++ b/core/modules/layout_builder/layout_builder.routing.yml
@@ -2,6 +2,7 @@ layout_builder.choose_section:
path: '/layout_builder/choose/section/{section_storage_type}/{section_storage}/{delta}'
defaults:
_controller: '\Drupal\layout_builder\Controller\ChooseSectionController::build'
+ _title: 'Choose a layout for this section'
requirements:
_permission: 'configure any layout'
_layout_builder_access: 'view'
@@ -58,6 +59,7 @@ layout_builder.choose_block:
path: '/layout_builder/choose/block/{section_storage_type}/{section_storage}/{delta}/{region}'
defaults:
_controller: '\Drupal\layout_builder\Controller\ChooseBlockController::build'
+ _title: 'Choose a block'
requirements:
_permission: 'configure any layout'
_layout_builder_access: 'view'
@@ -71,6 +73,7 @@ layout_builder.add_block:
path: '/layout_builder/add/block/{section_storage_type}/{section_storage}/{delta}/{region}/{plugin_id}'
defaults:
_form: '\Drupal\layout_builder\Form\AddBlockForm'
+ _title: 'Configure block'
requirements:
_permission: 'configure any layout'
_layout_builder_access: 'view'
@@ -97,6 +100,7 @@ layout_builder.update_block:
path: '/layout_builder/update/block/{section_storage_type}/{section_storage}/{delta}/{region}/{uuid}'
defaults:
_form: '\Drupal\layout_builder\Form\UpdateBlockForm'
+ _title: 'Configure block'
requirements:
_permission: 'configure any layout'
_layout_builder_access: 'view'
diff --git a/core/modules/layout_builder/src/Controller/ChooseBlockController.php b/core/modules/layout_builder/src/Controller/ChooseBlockController.php
index 67bd528ce612..ea721b7717fe 100644
--- a/core/modules/layout_builder/src/Controller/ChooseBlockController.php
+++ b/core/modules/layout_builder/src/Controller/ChooseBlockController.php
@@ -74,7 +74,6 @@ public static function create(ContainerInterface $container) {
* A render array.
*/
public function build(SectionStorageInterface $section_storage, $delta, $region) {
- $build['#title'] = $this->t('Choose a block');
if ($this->entityTypeManager->hasDefinition('block_content_type') && $types = $this->entityTypeManager->getStorage('block_content_type')->loadMultiple()) {
if (count($types) === 1) {
$type = reset($types);
diff --git a/core/modules/layout_builder/src/Controller/ChooseSectionController.php b/core/modules/layout_builder/src/Controller/ChooseSectionController.php
index 3405692e53bf..f7c19c2118e3 100644
--- a/core/modules/layout_builder/src/Controller/ChooseSectionController.php
+++ b/core/modules/layout_builder/src/Controller/ChooseSectionController.php
@@ -59,8 +59,6 @@ public static function create(ContainerInterface $container) {
* The render array.
*/
public function build(SectionStorageInterface $section_storage, $delta) {
- $output['#title'] = $this->t('Choose a layout');
-
$items = [];
$definitions = $this->layoutManager->getFilteredDefinitions('layout_builder', [], ['section_storage' => $section_storage]);
foreach ($definitions as $plugin_id => $definition) {
--
GitLab