From 8809ae6952b682e0a7c9372986ec1563818917dd Mon Sep 17 00:00:00 2001
From: "lina.wolf" <lwolf@w-commerce.de>
Date: Sat, 20 Sep 2025 08:56:40 +0200
Subject: [PATCH 1/3] [BUGFIC] Remove duplicated admonition titles

resolves: https://github.com/TYPO3-Documentation/render-guides/issues/1030
---
 .../resources/template/body/admonition.html.twig    |  2 --
 .../tests/admonitions/expected/index.html           | 12 ++++++------
 .../tests/markdown/admonitions/expected/README.html | 11 +++++++++++
 .../tests/markdown/admonitions/input/README.md      |  4 ++++
 .../markdown/{ => admonitions}/input/guides.xml     |  0
 .../markdown/{ => readme}/expected/README.html      |  0
 .../tests/markdown/{ => readme}/input/README.md     |  0
 .../tests/markdown/readme/input/guides.xml          | 13 +++++++++++++
 8 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 tests/Integration/tests/markdown/admonitions/expected/README.html
 create mode 100644 tests/Integration/tests/markdown/admonitions/input/README.md
 rename tests/Integration/tests/markdown/{ => admonitions}/input/guides.xml (100%)
 rename tests/Integration/tests/markdown/{ => readme}/expected/README.html (100%)
 rename tests/Integration/tests/markdown/{ => readme}/input/README.md (100%)
 create mode 100644 tests/Integration/tests/markdown/readme/input/guides.xml

diff --git a/packages/typo3-docs-theme/resources/template/body/admonition.html.twig b/packages/typo3-docs-theme/resources/template/body/admonition.html.twig
index 262bb19b4..25d8c951c 100644
--- a/packages/typo3-docs-theme/resources/template/body/admonition.html.twig
+++ b/packages/typo3-docs-theme/resources/template/body/admonition.html.twig
@@ -24,8 +24,6 @@
     {% if titleOfSeverity %}<p class="admonition-title">{{ titleOfSeverity }}</p>
     {% elseif title and isTitled %}<p class="admonition-title">{{ renderNode(title) }}</p>
     {% endif %}
-    {% if title and not isTitled %}<p>{{ renderNode(title) }}</p>
-    {% endif %}
     {{ renderNode(node) }}
 </div>
 
diff --git a/tests/Integration/tests/admonitions/expected/index.html b/tests/Integration/tests/admonitions/expected/index.html
index f290c6f0c..efe5443d1 100644
--- a/tests/Integration/tests/admonitions/expected/index.html
+++ b/tests/Integration/tests/admonitions/expected/index.html
@@ -1,6 +1,6 @@
 <!-- content start -->
                 <section class="section" id="admonitions-tip-note-warning-see-also-etc">
-            <h1>Admonitions: Tip, Note, Warning, See also,  etc<a class="headerlink" href="#admonitions-tip-note-warning-see-also-etc" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h1>
+            <h1>Admonitions: Tip, Note, Warning, See also,  etc<a class="headerlink" href="#admonitions-tip-note-warning-see-also-etc" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h1>
 
 <div class="admonition custom-admonition" role="alert">
     <p class="admonition-title">Custom admonition</p>
@@ -9,7 +9,7 @@ <h1>Admonitions: Tip, Note, Warning, See also,  etc<a class="headerlink" href="#
 
 </div>
             <section class="section" id="see-also">
-            <h2>See also<a class="headerlink" href="#see-also" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
+            <h2>See also<a class="headerlink" href="#see-also" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
 
 <div class="admonition seealso" role="alert">
     <p class="admonition-title">See also</p>
@@ -19,7 +19,7 @@ <h2>See also<a class="headerlink" href="#see-also" data-bs-toggle="modal" data-b
 </div>
     </section>
             <section class="section" id="note">
-            <h2>Note<a class="headerlink" href="#note" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
+            <h2>Note<a class="headerlink" href="#note" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
 
 <div class="admonition note" role="alert">
     <p class="admonition-title">Note</p>
@@ -29,7 +29,7 @@ <h2>Note<a class="headerlink" href="#note" data-bs-toggle="modal" data-bs-target
 </div>
     </section>
             <section class="section" id="tip">
-            <h2>Tip<a class="headerlink" href="#tip" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
+            <h2>Tip<a class="headerlink" href="#tip" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
 
 <div class="admonition tip" role="alert">
     <p class="admonition-title">Tip</p>
@@ -52,7 +52,7 @@ <h2>Tip<a class="headerlink" href="#tip" data-bs-toggle="modal" data-bs-target="
 </div>
     </section>
             <section class="section" id="warning">
-            <h2>Warning<a class="headerlink" href="#warning" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
+            <h2>Warning<a class="headerlink" href="#warning" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
 
 <div class="admonition warning" role="alert">
     <p class="admonition-title">Warning</p>
@@ -83,7 +83,7 @@ <h2>Warning<a class="headerlink" href="#warning" data-bs-toggle="modal" data-bs-
 </div>
     </section>
             <section class="section" id="attention">
-            <h2>Attention<a class="headerlink" href="#attention" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
+            <h2>Attention<a class="headerlink" href="#attention" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
 
 <div class="admonition attention" role="alert">
     <p class="admonition-title">Attention</p>
diff --git a/tests/Integration/tests/markdown/admonitions/expected/README.html b/tests/Integration/tests/markdown/admonitions/expected/README.html
new file mode 100644
index 000000000..22aee3b3c
--- /dev/null
+++ b/tests/Integration/tests/markdown/admonitions/expected/README.html
@@ -0,0 +1,11 @@
+<!-- content start -->
+
+<section class="section" id="markdown-admonitions">
+            <h1>MarkDown admonitions<a class="headerlink" href="#markdown-admonitions" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h1>
+
+<div class="admonition note" role="alert">
+    <p class="admonition-title">Note</p>
+         <strong>Image and screenshot files</strong> should be placed within <code>Images/MyGuidesFileName/</code> where <code>MyGuidesFileName</code> is your guide&#039;s filename without the final <code>.md</code>.
+</div>
+    </section>
+        <!-- content end -->
diff --git a/tests/Integration/tests/markdown/admonitions/input/README.md b/tests/Integration/tests/markdown/admonitions/input/README.md
new file mode 100644
index 000000000..a9854d940
--- /dev/null
+++ b/tests/Integration/tests/markdown/admonitions/input/README.md
@@ -0,0 +1,4 @@
+# MarkDown admonitions
+
+> [!NOTE]
+> **Image and screenshot files** should be placed within `Images/MyGuidesFileName/` where `MyGuidesFileName` is your guide's filename without the final `.md`.
diff --git a/tests/Integration/tests/markdown/input/guides.xml b/tests/Integration/tests/markdown/admonitions/input/guides.xml
similarity index 100%
rename from tests/Integration/tests/markdown/input/guides.xml
rename to tests/Integration/tests/markdown/admonitions/input/guides.xml
diff --git a/tests/Integration/tests/markdown/expected/README.html b/tests/Integration/tests/markdown/readme/expected/README.html
similarity index 100%
rename from tests/Integration/tests/markdown/expected/README.html
rename to tests/Integration/tests/markdown/readme/expected/README.html
diff --git a/tests/Integration/tests/markdown/input/README.md b/tests/Integration/tests/markdown/readme/input/README.md
similarity index 100%
rename from tests/Integration/tests/markdown/input/README.md
rename to tests/Integration/tests/markdown/readme/input/README.md
diff --git a/tests/Integration/tests/markdown/readme/input/guides.xml b/tests/Integration/tests/markdown/readme/input/guides.xml
new file mode 100644
index 000000000..61d8d869d
--- /dev/null
+++ b/tests/Integration/tests/markdown/readme/input/guides.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<guides xmlns="https://www.phpdoc.org/guides"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://www.phpdoc.org/guides vendor/phpdocumentor/guides-cli/resources/schema/guides.xsd"
+    links-are-relative="true"
+    input-file="README.md"
+    input-format="md"
+>
+
+    <extension class="\T3Docs\Typo3DocsTheme\DependencyInjection\Typo3DocsThemeExtension"
+               copy-sources="false"
+    />
+</guides>

From d1b119246da95b752c10c82e90c5cea7680d9693 Mon Sep 17 00:00:00 2001
From: "lina.wolf" <lwolf@w-commerce.de>
Date: Sat, 20 Sep 2025 08:58:35 +0200
Subject: [PATCH 2/3] [BUGFIC] Remove duplicated admonition titles

resolves: https://github.com/TYPO3-Documentation/render-guides/issues/1030
---
 .../resources/template/body/admonition.html.twig                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/typo3-docs-theme/resources/template/body/admonition.html.twig b/packages/typo3-docs-theme/resources/template/body/admonition.html.twig
index 25d8c951c..a87494e4b 100644
--- a/packages/typo3-docs-theme/resources/template/body/admonition.html.twig
+++ b/packages/typo3-docs-theme/resources/template/body/admonition.html.twig
@@ -26,4 +26,3 @@
     {% endif %}
     {{ renderNode(node) }}
 </div>
-

From b36f062aa876e6eaa24bcbe627037935052a35fd Mon Sep 17 00:00:00 2001
From: "lina.wolf" <lwolf@w-commerce.de>
Date: Sat, 20 Sep 2025 09:20:25 +0200
Subject: [PATCH 3/3] [BUGFIX] Remove duplicated admonition titles

resolves: https://github.com/TYPO3-Documentation/render-guides/issues/1030
---
 .../tests/admonitions/expected/index.html           | 13 ++++++-------
 .../expected/README.html                            |  0
 .../{admonitions => md-admonitions}/input/README.md |  0
 .../input/guides.xml                                |  0
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename tests/Integration/tests/markdown/{admonitions => md-admonitions}/expected/README.html (100%)
 rename tests/Integration/tests/markdown/{admonitions => md-admonitions}/input/README.md (100%)
 rename tests/Integration/tests/markdown/{admonitions => md-admonitions}/input/guides.xml (100%)

diff --git a/tests/Integration/tests/admonitions/expected/index.html b/tests/Integration/tests/admonitions/expected/index.html
index efe5443d1..0779cc284 100644
--- a/tests/Integration/tests/admonitions/expected/index.html
+++ b/tests/Integration/tests/admonitions/expected/index.html
@@ -1,6 +1,6 @@
 <!-- content start -->
                 <section class="section" id="admonitions-tip-note-warning-see-also-etc">
-            <h1>Admonitions: Tip, Note, Warning, See also,  etc<a class="headerlink" href="#admonitions-tip-note-warning-see-also-etc" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h1>
+            <h1>Admonitions: Tip, Note, Warning, See also,  etc<a class="headerlink" href="#admonitions-tip-note-warning-see-also-etc" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h1>
 
 <div class="admonition custom-admonition" role="alert">
     <p class="admonition-title">Custom admonition</p>
@@ -9,7 +9,7 @@ <h1>Admonitions: Tip, Note, Warning, See also,  etc<a class="headerlink" href="#
 
 </div>
             <section class="section" id="see-also">
-            <h2>See also<a class="headerlink" href="#see-also" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
+            <h2>See also<a class="headerlink" href="#see-also" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
 
 <div class="admonition seealso" role="alert">
     <p class="admonition-title">See also</p>
@@ -19,7 +19,7 @@ <h2>See also<a class="headerlink" href="#see-also" data-bs-toggle="modal" data-b
 </div>
     </section>
             <section class="section" id="note">
-            <h2>Note<a class="headerlink" href="#note" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
+            <h2>Note<a class="headerlink" href="#note" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
 
 <div class="admonition note" role="alert">
     <p class="admonition-title">Note</p>
@@ -29,7 +29,7 @@ <h2>Note<a class="headerlink" href="#note" data-bs-toggle="modal" data-bs-target
 </div>
     </section>
             <section class="section" id="tip">
-            <h2>Tip<a class="headerlink" href="#tip" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
+            <h2>Tip<a class="headerlink" href="#tip" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
 
 <div class="admonition tip" role="alert">
     <p class="admonition-title">Tip</p>
@@ -47,12 +47,11 @@ <h2>Tip<a class="headerlink" href="#tip" data-bs-toggle="modal" data-bs-target="
 
 <div class="admonition hint" role="alert">
     <p class="admonition-title">Hint</p>
-        <p>One line hint</p>
 
 </div>
     </section>
             <section class="section" id="warning">
-            <h2>Warning<a class="headerlink" href="#warning" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
+            <h2>Warning<a class="headerlink" href="#warning" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
 
 <div class="admonition warning" role="alert">
     <p class="admonition-title">Warning</p>
@@ -83,7 +82,7 @@ <h2>Warning<a class="headerlink" href="#warning" data-bs-toggle="modal" data-bs-
 </div>
     </section>
             <section class="section" id="attention">
-            <h2>Attention<a class="headerlink" href="#attention" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h2>
+            <h2>Attention<a class="headerlink" href="#attention" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">&nbsp;<i class="fa-solid fa-link"></i></a></h2>
 
 <div class="admonition attention" role="alert">
     <p class="admonition-title">Attention</p>
diff --git a/tests/Integration/tests/markdown/admonitions/expected/README.html b/tests/Integration/tests/markdown/md-admonitions/expected/README.html
similarity index 100%
rename from tests/Integration/tests/markdown/admonitions/expected/README.html
rename to tests/Integration/tests/markdown/md-admonitions/expected/README.html
diff --git a/tests/Integration/tests/markdown/admonitions/input/README.md b/tests/Integration/tests/markdown/md-admonitions/input/README.md
similarity index 100%
rename from tests/Integration/tests/markdown/admonitions/input/README.md
rename to tests/Integration/tests/markdown/md-admonitions/input/README.md
diff --git a/tests/Integration/tests/markdown/admonitions/input/guides.xml b/tests/Integration/tests/markdown/md-admonitions/input/guides.xml
similarity index 100%
rename from tests/Integration/tests/markdown/admonitions/input/guides.xml
rename to tests/Integration/tests/markdown/md-admonitions/input/guides.xml