diff --git a/core/modules/media/templates/media.html.twig b/core/modules/media/templates/media.html.twig index 28c0a83..6b3d6b3 100644 --- a/core/modules/media/templates/media.html.twig +++ b/core/modules/media/templates/media.html.twig @@ -26,11 +26,16 @@ * - title_attributes: Same as attributes, except applied to the main title * tag that appears in the template. * + * Note that we print {{ title_suffix }} even though the title is not included. + * This is intentional, once contextual links are embedded in the "title_suffix" + * variable. See #2775131 for more information on the background about this. + * * @see template_preprocess_media() * * @ingroup themeable */ #} + {{ title_suffix }} {{ content }} diff --git a/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php b/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php new file mode 100644 index 0000000..1d97773 --- /dev/null +++ b/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php @@ -0,0 +1,45 @@ +createMediaType(); + + // Create a media item. + $media = Media::create([ + 'bundle' => $mediaType->id(), + 'name' => 'Unnamed', + ]); + $media->save(); + + $user = $this->drupalCreateUser([ + 'administer media', + 'access contextual links', + ]); + $this->drupalLogin($user); + + $this->drupalGet('media/' . $media->id()); + $this->assertSession()->elementAttributeContains('css', 'div[data-contextual-id]', 'data-contextual-id', 'media:media=' . $media->id() . ':'); + } + +} diff --git a/core/themes/classy/templates/content/media.html.twig b/core/themes/classy/templates/content/media.html.twig index f36975c..6728367 100644 --- a/core/themes/classy/templates/content/media.html.twig +++ b/core/themes/classy/templates/content/media.html.twig @@ -7,6 +7,10 @@ * - name: Name of the media. * - content: Media content. * + * Note that we print {{ title_suffix }} even though the title is not included. + * This is intentional, once contextual links are embedded in the "title_suffix" + * variable. See #2775131 for more information on the background about this. + * * @see template_preprocess_media() * * @ingroup themeable @@ -21,6 +25,7 @@ ] %} + {{ title_suffix }} {% if content %} {{ content }} {% endif %} diff --git a/core/themes/stable/templates/content/media.html.twig b/core/themes/stable/templates/content/media.html.twig index 769b7be..cecaac8 100644 --- a/core/themes/stable/templates/content/media.html.twig +++ b/core/themes/stable/templates/content/media.html.twig @@ -7,12 +7,17 @@ * - name: Name of the media. * - content: Media content. * + * Note that we print {{ title_suffix }} even though the title is not included. + * This is intentional, once contextual links are embedded in the "title_suffix" + * variable. See #2775131 for more information on the background about this. + * * @see template_preprocess_media() * * @ingroup themeable */ #} + {{ title_suffix }} {% if content %} {{ content }} {% endif %}