From 14c242d65b11d6a261c6a00c9b087778ae0baa67 Mon Sep 17 00:00:00 2001
From: Leo Feyer <1192057+leofeyer@users.noreply.github.com>
Date: Fri, 24 May 2024 14:18:50 +0200
Subject: [PATCH] Use the `attr()` method in templates (see #7218)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Description
-----------

See https://github.com/contao/contao/pull/7209/files#r1598224759

<img width="775" alt="" src="https://github.com/contao/contao/assets/1192057/00e4aad4-2ea5-423f-8d80-c917b2b67641">

The content element templates belong to deprecated legacy elements, so I‘m not sure if we want to update these, too?

Commits
-------

b8eaf2d9 Use the `attr()` method in templates
01e85a54 Allow overwriting the wrapper attributes in child templates
3f428e9c Reduce duplicate code
9dcc4271 Unify HtmlAttributes usage in legacy templates (see #13)
3f4899c1 Clean up
3e27bb57 Move the $this->extend() call to the top
a62e0720 Adjust the ce_teaser.html5 template
bf5e8ee0 Adjust the info_default.html5 template

Co-authored-by: fritzmg <fmg@inspiredminds.at>
---
 .../templates/block/block_searchable.html5    | 30 +++++++++++++------
 .../templates/block/block_unsearchable.html5  | 20 ++++---------
 .../elements/ce_accordionSingle.html5         | 12 +++++++-
 .../elements/ce_accordionStart.html5          | 12 +++++++-
 .../templates/elements/ce_headline.html5      | 12 +++++++-
 .../templates/elements/ce_sliderStart.html5   | 12 +++++++-
 .../contao/templates/elements/ce_teaser.html5 | 20 +++++++++----
 .../templates/elements/ce_toplink.html5       | 12 +++++++-
 .../templates/forms/form_explanation.html5    | 11 ++++++-
 .../contao/templates/forms/form_row.html5     | 11 ++++++-
 .../contao/templates/forms/form_wrapper.html5 | 12 +++++++-
 .../templates/member/member_default.html5     | 20 ++++++++-----
 .../templates/member/member_grouped.html5     | 20 ++++++++-----
 .../templates/modules/mod_article.html5       | 14 +++++++--
 .../templates/modules/mod_articlenav.html5    | 19 +++++++-----
 .../templates/modules/mod_breadcrumb.html5    | 13 +++++++-
 .../modules/mod_changePassword.html5          | 11 ++-----
 .../contao/templates/modules/mod_login.html5  | 19 +++++++-----
 .../templates/modules/mod_navigation.html5    | 12 +++++++-
 .../templates/modules/mod_password.html5      | 11 ++-----
 .../templates/modules/mod_two_factor.html5    | 19 +++++++-----
 .../contao/templates/rss/rss_items_only.html5 |  2 +-
 .../contao/templates/info/info_default.html5  | 17 +++++++----
 .../templates/listing/list_default.html5      | 17 +++++++----
 24 files changed, 255 insertions(+), 103 deletions(-)

diff --git a/core-bundle/contao/templates/block/block_searchable.html5 b/core-bundle/contao/templates/block/block_searchable.html5
index 3a0aef47ea4..7f2168375f2 100644
--- a/core-bundle/contao/templates/block/block_searchable.html5
+++ b/core-bundle/contao/templates/block/block_searchable.html5
@@ -1,13 +1,25 @@
+<?php
 
-<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
 
-  <?php $this->block('headline'); ?>
-    <?php if ($this->headline): ?>
-      <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-    <?php endif; ?>
-  <?php $this->endblock(); ?>
+?>
 
-  <?php $this->block('content'); ?>
-  <?php $this->endblock(); ?>
+<?php $this->block('wrapper'); ?>
+  <div<?= $this->wrapperAttributes ?>>
 
-</div>
+    <?php $this->block('headline'); ?>
+      <?php if ($this->headline): ?>
+        <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
+      <?php endif; ?>
+    <?php $this->endblock(); ?>
+
+    <?php $this->block('content'); ?>
+    <?php $this->endblock(); ?>
+
+  </div>
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/block/block_unsearchable.html5 b/core-bundle/contao/templates/block/block_unsearchable.html5
index af1e3925a57..8e0df1da3c6 100644
--- a/core-bundle/contao/templates/block/block_unsearchable.html5
+++ b/core-bundle/contao/templates/block/block_unsearchable.html5
@@ -1,15 +1,7 @@
+<?php $this->extend('block_searchable') ?>
 
-<!-- indexer::stop -->
-<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
-
-  <?php $this->block('headline'); ?>
-    <?php if ($this->headline): ?>
-      <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-    <?php endif; ?>
-  <?php $this->endblock(); ?>
-
-  <?php $this->block('content'); ?>
-  <?php $this->endblock(); ?>
-
-</div>
-<!-- indexer::continue -->
+<?php $this->block('wrapper'); ?>
+  <!-- indexer::stop -->
+  <?php $this->parent(); ?>
+  <!-- indexer::continue -->
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/elements/ce_accordionSingle.html5 b/core-bundle/contao/templates/elements/ce_accordionSingle.html5
index 01b08bbcf85..7ce926cbea5 100644
--- a/core-bundle/contao/templates/elements/ce_accordionSingle.html5
+++ b/core-bundle/contao/templates/elements/ce_accordionSingle.html5
@@ -1,5 +1,15 @@
+<?php
 
-<section class="<?= $this->class ?> ce_accordion ce_text block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'ce_accordion', 'ce_text', 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<section<?= $this->wrapperAttributes ?>>
 
   <div class="<?= $this->toggler ?>"<?php if ($this->headlineStyle): ?> style="<?= $this->headlineStyle ?>"<?php endif; ?>>
     <?= $this->headline ?>
diff --git a/core-bundle/contao/templates/elements/ce_accordionStart.html5 b/core-bundle/contao/templates/elements/ce_accordionStart.html5
index 078a74d16f4..dbf45fa0274 100644
--- a/core-bundle/contao/templates/elements/ce_accordionStart.html5
+++ b/core-bundle/contao/templates/elements/ce_accordionStart.html5
@@ -1,5 +1,15 @@
+<?php
 
-<section class="<?= $this->class ?> ce_accordion block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'ce_accordion', 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<section<?= $this->wrapperAttributes ?>>
 
   <div class="<?= $this->toggler ?>"<?php if ($this->headlineStyle): ?> style="<?= $this->headlineStyle ?>"<?php endif; ?>>
     <?= $this->headline ?>
diff --git a/core-bundle/contao/templates/elements/ce_headline.html5 b/core-bundle/contao/templates/elements/ce_headline.html5
index 1bf6aaeb25d..03c1707ccab 100644
--- a/core-bundle/contao/templates/elements/ce_headline.html5
+++ b/core-bundle/contao/templates/elements/ce_headline.html5
@@ -1,4 +1,14 @@
+<?php
 
-<<?= $this->hl ?> class="<?= $this->class ?>"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass($this->class)
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<<?= $this->hl ?><?= $this->wrapperAttributes ?>>
   <?= $this->headline ?>
 </<?= $this->hl ?>>
diff --git a/core-bundle/contao/templates/elements/ce_sliderStart.html5 b/core-bundle/contao/templates/elements/ce_sliderStart.html5
index a17580b1e56..b8c8ef2316a 100644
--- a/core-bundle/contao/templates/elements/ce_sliderStart.html5
+++ b/core-bundle/contao/templates/elements/ce_sliderStart.html5
@@ -1,5 +1,15 @@
+<?php
 
-<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<div<?= $this->wrapperAttributes ?>>
 
   <?php if ($this->headline): ?>
     <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
diff --git a/core-bundle/contao/templates/elements/ce_teaser.html5 b/core-bundle/contao/templates/elements/ce_teaser.html5
index 773abe89342..fe7d67d9dec 100644
--- a/core-bundle/contao/templates/elements/ce_teaser.html5
+++ b/core-bundle/contao/templates/elements/ce_teaser.html5
@@ -1,12 +1,20 @@
+<?php $this->extend('block_searchable'); ?>
 
-<div class="<?= $this->class ?> ce_text block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<?php
 
-  <?php if ($this->headline): ?>
-    <h1><?= $this->headline ?></h1>
-  <?php endif; ?>
+$this->wrapperAttributes = $this
+    ->attr()
+    ->addClass('ce_text')
+    ->mergeWith($this->wrapperAttributes)
+;
 
-  <?= $this->text ?>
+$this->hl = 'h1';
+
+?>
 
+<?php $this->block('content'); ?>
+
+  <?= $this->text ?>
   <p class="more"><a href="<?= $this->href ?>" title="<?= $this->readMore ?>"><?= $this->more ?><span class="invisible"> <?= $this->headline ?></span></a></p>
 
-</div>
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/elements/ce_toplink.html5 b/core-bundle/contao/templates/elements/ce_toplink.html5
index 6d1f9071399..fcc6fb5c933 100644
--- a/core-bundle/contao/templates/elements/ce_toplink.html5
+++ b/core-bundle/contao/templates/elements/ce_toplink.html5
@@ -1,6 +1,16 @@
+<?php
+
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
 
 <!-- indexer::stop -->
-<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<div<?= $this->wrapperAttributes ?>>
   <a href="<?= $this->request ?>#top" title="<?= $this->title ?>"><?= $this->label ?></a>
 </div>
 <!-- indexer::continue -->
diff --git a/core-bundle/contao/templates/forms/form_explanation.html5 b/core-bundle/contao/templates/forms/form_explanation.html5
index 3730bdeef76..0865052585e 100644
--- a/core-bundle/contao/templates/forms/form_explanation.html5
+++ b/core-bundle/contao/templates/forms/form_explanation.html5
@@ -1,4 +1,13 @@
+<?php
 
-<div class="<?= $this->prefix ?> explanation<?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>">
+$this->wrapperAttributes = $this
+    ->attr()
+    ->addClass([$this->prefix, 'explanation', $this->class])
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<div<?= $this->wrapperAttributes ?>>
   <?= $this->cspInlineStyles($this->generate()) ?>
 </div>
diff --git a/core-bundle/contao/templates/forms/form_row.html5 b/core-bundle/contao/templates/forms/form_row.html5
index 6daf04df54d..66b3913f913 100644
--- a/core-bundle/contao/templates/forms/form_row.html5
+++ b/core-bundle/contao/templates/forms/form_row.html5
@@ -1,5 +1,14 @@
+<?php
 
-<div class="<?= $this->prefix ?><?php if ($this->class): ?> <?= $this->class ?><?php endif; ?>">
+$this->wrapperAttributes = $this
+    ->attr()
+    ->addClass([$this->prefix, $this->class])
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<div<?= $this->wrapperAttributes ?>>
   <?php $this->block('label'); ?>
   <?php $this->endblock(); ?>
 
diff --git a/core-bundle/contao/templates/forms/form_wrapper.html5 b/core-bundle/contao/templates/forms/form_wrapper.html5
index 8627af64461..4b8029323a5 100644
--- a/core-bundle/contao/templates/forms/form_wrapper.html5
+++ b/core-bundle/contao/templates/forms/form_wrapper.html5
@@ -1,6 +1,16 @@
+<?php
+
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
 
 <!-- indexer::stop -->
-<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<div<?= $this->wrapperAttributes ?>>
 
   <?php if ($this->headline): ?>
     <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
diff --git a/core-bundle/contao/templates/member/member_default.html5 b/core-bundle/contao/templates/member/member_default.html5
index 0486e654b89..72cbd7df286 100644
--- a/core-bundle/contao/templates/member/member_default.html5
+++ b/core-bundle/contao/templates/member/member_default.html5
@@ -1,10 +1,17 @@
+<?php $this->extend('block_unsearchable'); ?>
 
-<!-- indexer::stop -->
-<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<?php
 
-  <?php if ($this->headline): ?>
-    <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-  <?php endif; ?>
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<?php $this->block('content'); ?>
 
   <?php if ($this->message): ?>
     <p class="tl_confirm"><?= $this->message ?></p>
@@ -21,5 +28,4 @@
     </div>
   </form>
 
-</div>
-<!-- indexer::continue -->
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/member/member_grouped.html5 b/core-bundle/contao/templates/member/member_grouped.html5
index 368833aeb12..c7db93e2f16 100644
--- a/core-bundle/contao/templates/member/member_grouped.html5
+++ b/core-bundle/contao/templates/member/member_grouped.html5
@@ -1,10 +1,17 @@
+<?php $this->extend('block_unsearchable'); ?>
 
-<!-- indexer::stop -->
-<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<?php
 
-  <?php if ($this->headline): ?>
-    <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-  <?php endif; ?>
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<?php $this->block('content'); ?>
 
   <?php if ($this->message): ?>
     <p class="tl_confirm"><?= $this->message ?></p>
@@ -30,5 +37,4 @@
     </div>
   </form>
 
-</div>
-<!-- indexer::continue -->
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/modules/mod_article.html5 b/core-bundle/contao/templates/modules/mod_article.html5
index 0ec200759d2..3be35bca8af 100644
--- a/core-bundle/contao/templates/modules/mod_article.html5
+++ b/core-bundle/contao/templates/modules/mod_article.html5
@@ -1,8 +1,18 @@
+<?php
+
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
 
 <?php if ($this->teaserOnly): ?>
 
   <?php $this->block('alias'); ?>
-    <article class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+    <article<?= $this->wrapperAttributes ?>>
       <div class="ce_text block">
         <h2><?= $this->headline ?></h2>
         <div class="teaser">
@@ -21,7 +31,7 @@
 
 <?php else: ?>
 
-  <div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+  <div<?= $this->wrapperAttributes ?>>
     <?php if ($this->printable): ?>
       <?php $this->block('syndication'); ?>
         <!-- indexer::stop -->
diff --git a/core-bundle/contao/templates/modules/mod_articlenav.html5 b/core-bundle/contao/templates/modules/mod_articlenav.html5
index 2687fb3fa5e..da83a810998 100644
--- a/core-bundle/contao/templates/modules/mod_articlenav.html5
+++ b/core-bundle/contao/templates/modules/mod_articlenav.html5
@@ -1,10 +1,16 @@
+<?php $this->extend('block_unsearchable'); ?>
 
-<!-- indexer::stop -->
-<div class="<?= $this->class ?> pagination block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<?php
 
-  <?php if ($this->headline): ?>
-    <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-  <?php endif; ?>
+$this->wrapperAttributes = $this
+    ->attr()
+    ->addClass('pagination')
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<?php $this->block('content'); ?>
 
   <ul>
     <?php if ($this->first): ?>
@@ -32,5 +38,4 @@
     <?php endif; ?>
   </ul>
 
-</div>
-<!-- indexer::continue -->
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/modules/mod_breadcrumb.html5 b/core-bundle/contao/templates/modules/mod_breadcrumb.html5
index 03c70c4a7f9..a337fdd497e 100644
--- a/core-bundle/contao/templates/modules/mod_breadcrumb.html5
+++ b/core-bundle/contao/templates/modules/mod_breadcrumb.html5
@@ -1,6 +1,17 @@
+<?php
+
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'block'])
+    ->addStyle($this->style)
+    ->set('aria-label', 'Breadcrumb')
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
 
 <!-- indexer::stop -->
-<nav class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?> aria-label="Breadcrumb">
+<nav<?= $this->wrapperAttributes ?>>
 
   <?php $this->block('headline'); ?>
     <?php if ($this->headline): ?>
diff --git a/core-bundle/contao/templates/modules/mod_changePassword.html5 b/core-bundle/contao/templates/modules/mod_changePassword.html5
index c977319a928..fd9f92432a3 100644
--- a/core-bundle/contao/templates/modules/mod_changePassword.html5
+++ b/core-bundle/contao/templates/modules/mod_changePassword.html5
@@ -1,10 +1,6 @@
+<?php $this->extend('block_unsearchable'); ?>
 
-<!-- indexer::stop -->
-<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
-
-  <?php if ($this->headline): ?>
-    <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-  <?php endif; ?>
+<?php $this->block('content'); ?>
 
   <?php if ($this->message): ?>
     <p class="tl_confirm"><?= $this->message ?></p>
@@ -21,5 +17,4 @@
     </div>
   </form>
 
-</div>
-<!-- indexer::continue -->
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/modules/mod_login.html5 b/core-bundle/contao/templates/modules/mod_login.html5
index e8ef6c4f181..b7898c5c9bc 100644
--- a/core-bundle/contao/templates/modules/mod_login.html5
+++ b/core-bundle/contao/templates/modules/mod_login.html5
@@ -1,10 +1,16 @@
+<?php $this->extend('block_unsearchable'); ?>
 
-<!-- indexer::stop -->
-<div class="<?= $this->class ?> <?= $this->logout ? 'logout' : 'login' ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<?php
 
-  <?php if ($this->headline): ?>
-    <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-  <?php endif; ?>
+$this->wrapperAttributes = $this
+    ->attr()
+    ->addClass($this->logout ? 'logout' : 'login')
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<?php $this->block('content'); ?>
 
   <form<?php if ($this->action): ?> action="<?= $this->action ?>"<?php endif; ?> id="<?= $this->formId ?>" method="post">
     <div class="formbody">
@@ -67,5 +73,4 @@
     </div>
   </form>
 
-</div>
-<!-- indexer::continue -->
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/modules/mod_navigation.html5 b/core-bundle/contao/templates/modules/mod_navigation.html5
index 3dfe1adc710..ebaa6b177bc 100644
--- a/core-bundle/contao/templates/modules/mod_navigation.html5
+++ b/core-bundle/contao/templates/modules/mod_navigation.html5
@@ -1,6 +1,16 @@
+<?php
+
+$this->wrapperAttributes = $this
+    ->attr($this->cssID)
+    ->addClass([$this->class, 'block'])
+    ->addStyle($this->style)
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
 
 <!-- indexer::stop -->
-<nav class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<nav<?= $this->wrapperAttributes ?>>
 
   <?php if ($this->headline): ?>
     <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
diff --git a/core-bundle/contao/templates/modules/mod_password.html5 b/core-bundle/contao/templates/modules/mod_password.html5
index 786aa54ec8d..3e4ee7341ea 100644
--- a/core-bundle/contao/templates/modules/mod_password.html5
+++ b/core-bundle/contao/templates/modules/mod_password.html5
@@ -1,10 +1,6 @@
+<?php $this->extend('block_unsearchable'); ?>
 
-<!-- indexer::stop -->
-<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
-
-  <?php if ($this->headline): ?>
-    <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-  <?php endif; ?>
+<?php $this->block('content'); ?>
 
   <form id="<?= $this->formId ?>" method="post">
     <div class="formbody">
@@ -20,5 +16,4 @@
     </div>
   </form>
 
-</div>
-<!-- indexer::continue -->
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/modules/mod_two_factor.html5 b/core-bundle/contao/templates/modules/mod_two_factor.html5
index 2db846b9e59..7636a8b037a 100644
--- a/core-bundle/contao/templates/modules/mod_two_factor.html5
+++ b/core-bundle/contao/templates/modules/mod_two_factor.html5
@@ -1,10 +1,16 @@
+<?php $this->extend('block_unsearchable'); ?>
 
-<!-- indexer::stop -->
-<div class="<?= $this->class ?> two-factor block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<?php
 
-  <?php if ($this->headline): ?>
-    <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-  <?php endif; ?>
+$this->wrapperAttributes = $this
+    ->attr()
+    ->addClass('two-factor')
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<?php $this->block('content'); ?>
 
   <?php if ($this->enable): ?>
     <?php if ($this->message): ?>
@@ -113,5 +119,4 @@
     </div>
   <?php endif; ?>
 
-</div>
-<!-- indexer::continue -->
+<?php $this->endblock(); ?>
diff --git a/core-bundle/contao/templates/rss/rss_items_only.html5 b/core-bundle/contao/templates/rss/rss_items_only.html5
index 650afe83f83..c11e622ed3b 100644
--- a/core-bundle/contao/templates/rss/rss_items_only.html5
+++ b/core-bundle/contao/templates/rss/rss_items_only.html5
@@ -3,7 +3,7 @@
 <?php $this->block('content'); ?>
 
   <?php foreach ($this->items as $item): ?>
-    <div class="rss_items_only<?= $item['class'] ?>">
+    <div class="rss_items_only<?= $item['class'] ?? '' ?>">
       <h2><a href="<?= $item['link'] ?>" target="_blank" rel="noreferrer noopener"><?= $item['title'] ?></a></h2>
       <div class="description"><?= $item['description'] ?></div>
     </div>
diff --git a/listing-bundle/contao/templates/info/info_default.html5 b/listing-bundle/contao/templates/info/info_default.html5
index b49cad3b881..9ec043ab11a 100644
--- a/listing-bundle/contao/templates/info/info_default.html5
+++ b/listing-bundle/contao/templates/info/info_default.html5
@@ -1,9 +1,16 @@
+<?php $this->extend('block_searchable'); ?>
 
-<div class="<?= $this->class ?> listing block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<?php
 
-  <?php if ($this->headline): ?>
-    <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-  <?php endif; ?>
+$this->wrapperAttributes = $this
+    ->attr()
+    ->addClass('listing')
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<?php $this->block('content'); ?>
 
   <table class="single_record">
   <tbody>
@@ -20,4 +27,4 @@
   <p class="back"><a href="<?= $this->referer ?>" title="<?= $this->back ?>"><?= $this->back ?></a></p>
   <!-- indexer::continue -->
 
-</div>
+<?php $this->endblock(); ?>
diff --git a/listing-bundle/contao/templates/listing/list_default.html5 b/listing-bundle/contao/templates/listing/list_default.html5
index 9ec4a6969f2..7eb051e5e5e 100644
--- a/listing-bundle/contao/templates/listing/list_default.html5
+++ b/listing-bundle/contao/templates/listing/list_default.html5
@@ -1,9 +1,16 @@
+<?php $this->extend('block_searchable'); ?>
 
-<div class="<?= $this->class ?> ce_table listing block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+<?php
 
-  <?php if ($this->headline): ?>
-    <<?= $this->hl ?>><?= $this->headline ?></<?= $this->hl ?>>
-  <?php endif; ?>
+$this->wrapperAttributes = $this
+    ->attr()
+    ->addClass(['ce_table', 'listing'])
+    ->mergeWith($this->wrapperAttributes)
+;
+
+?>
+
+<?php $this->block('content'); ?>
 
   <?php if ($this->searchable): ?>
     <div class="list_search">
@@ -93,4 +100,4 @@
 
   <?= $this->pagination ?>
 
-</div>
+<?php $this->endblock(); ?>