diff --git a/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php index a0fd13c..337d409 100644 --- a/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php +++ b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php @@ -90,46 +90,46 @@ public function testEntityForm() { // The field is moved to the default region for the new layout. $this->assertSession()->pageTextContains('Your settings have been saved.'); - $this->assertEquals(['Top', 'Left', 'Right', 'Bottom', 'Disabled'], $this->getRegionTitles()); + $this->assertEquals(['Top', 'First', 'Second', 'Bottom', 'Disabled'], $this->getRegionTitles()); $this->drupalGet('entity_test/manage/1/edit'); // No fields are visible, and the regions don't display when empty. - $this->assertFieldInRegion('field_test_text[0][value]', 'left'); - $this->assertSession()->elementExists('css', '.layout-region--left .field--name-field-test-text'); + $this->assertFieldInRegion('field_test_text[0][value]', 'first'); + $this->assertSession()->elementExists('css', '.layout-region--first .field--name-field-test-text'); // After a refresh the new regions are still there. $this->drupalGet('entity_test/structure/entity_test/form-display'); - $this->assertEquals(['Top', 'Left', 'Right', 'Bottom', 'Disabled'], $this->getRegionTitles()); + $this->assertEquals(['Top', 'First', 'Second', 'Bottom', 'Disabled'], $this->getRegionTitles()); - // Drag the field to the right region. + // Drag the field to the second region. $field_test_text_row = $this->getSession()->getPage()->find('css', '#field-test-text'); - $right_region_row = $this->getSession()->getPage()->find('css', '.region-right-message'); - $field_test_text_row->find('css', '.handle')->dragTo($right_region_row); + $second_region_row = $this->getSession()->getPage()->find('css', '.region-second-message'); + $field_test_text_row->find('css', '.handle')->dragTo($second_region_row); $this->assertSession()->assertWaitOnAjaxRequest(); $this->submitForm([], 'Save'); $this->assertSession()->pageTextContains('Your settings have been saved.'); // The new layout is used. $this->drupalGet('entity_test/manage/1/edit'); - $this->assertSession()->elementExists('css', '.layout-region--right .field--name-field-test-text'); - $this->assertFieldInRegion('field_test_text[0][value]', 'right'); + $this->assertSession()->elementExists('css', '.layout-region--second .field--name-field-test-text'); + $this->assertFieldInRegion('field_test_text[0][value]', 'second'); - // Move the field to the right region without tabledrag. + // Move the field to the second region without tabledrag. $this->drupalGet('entity_test/structure/entity_test/form-display'); $this->getSession()->getPage()->pressButton('Show row weights'); - $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'right'); + $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'second'); $this->assertSession()->assertWaitOnAjaxRequest(); $this->submitForm([], 'Save'); $this->assertSession()->pageTextContains('Your settings have been saved.'); // The updated region is used. $this->drupalGet('entity_test/manage/1/edit'); - $this->assertFieldInRegion('field_test_text[0][value]', 'right'); + $this->assertFieldInRegion('field_test_text[0][value]', 'second'); // The layout is still in use without Field UI. $this->container->get('module_installer')->uninstall(['field_ui']); $this->drupalGet('entity_test/manage/1/edit'); - $this->assertFieldInRegion('field_test_text[0][value]', 'right'); + $this->assertFieldInRegion('field_test_text[0][value]', 'second'); } /** @@ -147,7 +147,7 @@ public function testEntityView() { $this->submitForm([], 'Save'); $this->assertSession()->pageTextContains('Your settings have been saved.'); - $this->assertEquals(['Top', 'Left', 'Right', 'Bottom', 'Disabled'], $this->getRegionTitles()); + $this->assertEquals(['Top', 'First', 'Second', 'Bottom', 'Disabled'], $this->getRegionTitles()); $this->drupalGet('entity_test/1'); // No fields are visible, and the regions don't display when empty. @@ -157,13 +157,13 @@ public function testEntityView() { // After a refresh the new regions are still there. $this->drupalGet('entity_test/structure/entity_test/display'); - $this->assertEquals(['Top', 'Left', 'Right', 'Bottom', 'Disabled'], $this->getRegionTitles()); + $this->assertEquals(['Top', 'First', 'Second', 'Bottom', 'Disabled'], $this->getRegionTitles()); - // Drag the field to the left region. + // Drag the field to the first region. $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected()); $field_test_text_row = $this->getSession()->getPage()->find('css', '#field-test-text'); - $left_region_row = $this->getSession()->getPage()->find('css', '.region-left-message'); - $field_test_text_row->find('css', '.handle')->dragTo($left_region_row); + $first_region_row = $this->getSession()->getPage()->find('css', '.region-first-message'); + $field_test_text_row->find('css', '.handle')->dragTo($first_region_row); $this->assertSession()->assertWaitOnAjaxRequest(); $this->assertFalse($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected()); $this->submitForm([], 'Save'); @@ -172,25 +172,25 @@ public function testEntityView() { // The new layout is used. $this->drupalGet('entity_test/1'); $this->assertSession()->elementExists('css', '.layout--twocol'); - $this->assertSession()->elementExists('css', '.layout-region--left .field--name-field-test-text'); + $this->assertSession()->elementExists('css', '.layout-region--first .field--name-field-test-text'); - // Move the field to the right region without tabledrag. + // Move the field to the second region without tabledrag. $this->drupalGet('entity_test/structure/entity_test/display'); $this->getSession()->getPage()->pressButton('Show row weights'); - $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'right'); + $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'second'); $this->assertSession()->assertWaitOnAjaxRequest(); $this->submitForm([], 'Save'); $this->assertSession()->pageTextContains('Your settings have been saved.'); // The updated region is used. $this->drupalGet('entity_test/1'); - $this->assertSession()->elementExists('css', '.layout-region--right .field--name-field-test-text'); + $this->assertSession()->elementExists('css', '.layout-region--second .field--name-field-test-text'); // The layout is still in use without Field UI. $this->container->get('module_installer')->uninstall(['field_ui']); $this->drupalGet('entity_test/1'); $this->assertSession()->elementExists('css', '.layout--twocol'); - $this->assertSession()->elementExists('css', '.layout-region--right .field--name-field-test-text'); + $this->assertSession()->elementExists('css', '.layout-region--second .field--name-field-test-text'); } /** diff --git a/core/modules/layout_discovery/layout_discovery.layouts.yml b/core/modules/layout_discovery/layout_discovery.layouts.yml index 98b1ed6..d1b0e5a 100644 --- a/core/modules/layout_discovery/layout_discovery.layouts.yml +++ b/core/modules/layout_discovery/layout_discovery.layouts.yml @@ -15,14 +15,14 @@ layout_twocol: template: layout--twocol library: layout_discovery/twocol category: 'Columns: 2' - default_region: left + default_region: first regions: top: label: Top - left: - label: Left - right: - label: Right + first: + label: First + second: + label: Second bottom: label: Bottom @@ -36,16 +36,16 @@ layout_twocol_bricks: regions: top: label: Top - left_above: - label: 'Left above' - right_above: - label: 'Right above' + first_above: + label: 'First above' + second_above: + label: 'Second above' middle: label: Middle - left_below: - label: 'Left below' - right_below: - label: 'Right below' + first_below: + label: 'First below' + second_below: + label: 'Second below' bottom: label: Bottom @@ -55,16 +55,16 @@ layout_threecol_25_50_25: template: layout--threecol-25-50-25 library: layout_discovery/threecol_25_50_25 category: 'Columns: 3' - default_region: left + default_region: second regions: top: label: Top - left: - label: Left - middle: - label: Middle - right: - label: Right + first: + label: First + second: + label: Second + third: + label: Third bottom: label: Bottom @@ -74,15 +74,15 @@ layout_threecol_33_34_33: template: layout--threecol-33-34-33 library: layout_discovery/threecol_33_34_33 category: 'Columns: 3' - default_region: left + default_region: first regions: top: label: Top - left: - label: Left - middle: - label: Middle - right: - label: Right + first: + label: First + second: + label: Second + third: + label: Third bottom: label: Bottom diff --git a/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig b/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig index eb553cd..fd4c648 100644 --- a/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig +++ b/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig @@ -11,14 +11,14 @@ */ #} {% -set classes = [ -'layout--onecol', -] + set classes = [ + 'layout--onecol', + ] %} {% if content %} -