OEL-1543: Rename block templates to target plugin ids instead of block ids.

modules/oe_whitelabel_search/tests/src/Kernel/SearchBlockTest.php

@@ -122,10 +122,10 @@ public function testBlockRendering(): void {
     $render = $this->container->get('renderer')->renderRoot($build);
     $crawler = new Crawler($render->__toString());
 
-    // Assert the form rendering.
-    $block = $crawler->filter('#block-whitelabel-search-block');
-    $this->assertCount(1, $block);
-    $form = $block->filter('#oe-whitelabel-search-form');
+    // Select the search form in the block.
+    // The block template removes the block wrapper, so the form is the root
+    // element.
+    $form = $crawler->filter('body > form#oe-whitelabel-search-form');
     $this->assertCount(1, $form);
     $this->assertSame('d-flex mt-3 mt-lg-0', $form->attr('class'));
     // Assert the field wrapper rendering.

templates/overrides/navigation/block--language-block--language-interface.html.twig

@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Override for blocks with plugin id = 'language_block:language_interface'.
+ *
+ * @see \Drupal\language\Plugin\Block\LanguageBlock
+ */
+#}
+{% block content %}
+  <div class="language-switcher-block nav-link">
+    {{ content }}
+  </div>
+{% endblock %}

templates/overrides/navigation/block--oe-authentication-login_block.html.twig → templates/overrides/navigation/block--oe-authentication-login-block.html.twig

@@ -1,7 +1,9 @@
 {#
 /**
  * @file
- * icon.
+ * Override for blocks with plugin id = 'oe_authentication_login_block'.
+ *
+ * @see \Drupal\oe_authentication\Plugin\Block\LoginBlock
  */
 #}
 {% set extra_attributes = create_attribute() %}

templates/overrides/navigation/block--system-branding-block.html.twig

@@ -1,15 +1,10 @@
 {#
 /**
  * @file
- * Theme override for a branding block.
+ * Override for blocks with plugin id = 'system_branding_block'.
  *
- * Each branding element variable (logo, name, slogan) is only available if
- * enabled in the block configuration.
- *
- * Available variables:
- * - site_logo: Logo for site as defined in Appearance or theme settings.
- * - site_name: Name for site as defined in Site information settings.
- * - site_slogan: Slogan for site as defined in Site information settings.
+ * @see build/core/modules/system/templates/block--system-branding-block.html.twig
+ * @see \Drupal\system\Plugin\Block\SystemBrandingBlock
  */
 #}
 {% set light = bcl_header_style == 'light' %}

templates/overrides/search/block--facets-form.html.twig

@@ -1,12 +1,11 @@
 {#
 /**
  * @file
- * Theme block implementation to display facet form.
+ * Override for blocks with plugin id = 'facets_form'.
  *
- * @see ./core/themes/stable/templates/block/block.html.twig
+ * @see \Drupal\facets_form\Plugin\Block\FacetsFormBlock
  */
 #}
-
 {% if content.actions.reset['#type'] == 'link' %}
   {% set extra_attributes = create_attribute() %}
   {% set reset = pattern('link', {

templates/overrides/search/block--facets-summary-block.html.twig

@@ -1,9 +1,9 @@
 {#
 /**
  * @file
- * Theme block implementation to display facets summary.
+ * Override for blocks with plugin id = 'facets_summary_block'.
  *
- * @see ./core/themes/stable/templates/block/block.html.twig
+ * @see \Drupal\facets_summary\Plugin\Block\FacetsSummaryBlock
  */
 #}
 {% if label and content['#items'][0]['#theme'] is defined and content['#items'][0]['#theme'] == 'facets_summary_count' %}

templates/search/block--whitelabel-search-block.html.twig

@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Override for blocks with plugin id = 'whitelabel_search_block'.
+ *
+ * Removes outer wrapper div and block label.
+ *
+ * @see \Drupal\oe_whitelabel_search\Plugin\Block\SearchBlock
+ */
+#}
+{% block content %}
+  {{ content }}
+{% endblock %}

templates/search/form--oe-whitelabel-search-form.html.twig

@@ -1,8 +1,10 @@
 {#
 /**
  * @file
- * Theme override for a 'form' element.
- * @see ./core/themes/stable/templates/form/form.html.twig
+ * Override for forms with form id = 'oe_whitelabel_search_form'.
+ *
+ * @see ./core/modules/system/templates/form.html.twig
+ * @see \Drupal\oe_whitelabel_search\Form\SearchForm
  */
 #}
 <form{{ attributes.addClass('d-flex', 'mt-3', 'mt-lg-0') }}>