Skip to content

Commit af4a164

Browse files
linawolflinawolf
committed
[BUGFIX] Fix menu directive
1 parent 9f9f466 commit af4a164

File tree

41 files changed

+81
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+81
-96
lines changed

‎packages/typo3-docs-theme/resources/template/body/menu/menu.html.twig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
21
{% if node.options.menu == 'mainmenu' %}
32
{% include "structure/navigation/menu.html.twig" %}
43
{% elseif node.options.menu == 'sitemap' %}
54
{% include "body/menu/sitemap.html.twig" %}
65
{% else %}
76
<div class="toctree-wrapper compound">
7+
{% if node.caption -%}
8+
<p class="topic-title">{{ renderNode(node.caption) }}</p>
9+
{% elseif node.options['caption'] -%}
10+
<p class="topic-title">{{ node.options['caption'] }}</p>
11+
{% endif -%}
812
<ul>
9-
{% for entry in node.entries -%}
13+
{% for entry in node.menuEntries -%}
1014
{{ renderNode(entry) }}
1115
{% endfor %}
1216
</ul>

‎tests/Integration/tests-full/breadcrumb/expected/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
</div> <div class="toc-collapse">
8181
<div aria-label="main navigation" class="toc" role="navigation">
8282
<div aria-label="Main navigation" class="main_menu" role="navigation">
83-
84-
<ul class="menu-level-1">
83+
<ul class="menu-level-1">
8584
<li class="">
8685
<a href="page.html">
8786
Page

‎tests/Integration/tests-full/breadcrumb/expected/page.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
</div> <div class="toc-collapse">
8282
<div aria-label="main navigation" class="toc" role="navigation">
8383
<div aria-label="Main navigation" class="main_menu" role="navigation">
84-
85-
<ul class="menu-level-1">
84+
<ul class="menu-level-1">
8685
<li class=" current active">
8786
<a href="#" aria-current="page">
8887
Page

‎tests/Integration/tests-full/breadcrumb/expected/yetAnotherPage.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
</div> <div class="toc-collapse">
8181
<div aria-label="main navigation" class="toc" role="navigation">
8282
<div aria-label="Main navigation" class="main_menu" role="navigation">
83-
84-
<ul class="menu-level-1">
83+
<ul class="menu-level-1">
8584
<li class="">
8685
<a href="page.html">
8786
Page TYPO3 Extension oauth2 (mfc/oauth2)

‎tests/Integration/tests-full/changelog/expected/Changelog/12.0/Breaking-87616-RemovedHookForAlteringPageLinks.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,14 @@
9595
</div> <div class="toc-collapse">
9696
<div aria-label="main navigation" class="toc" role="navigation">
9797
<div aria-label="Main navigation" class="main_menu" role="navigation">
98-
99-
<ul class="menu-level-1">
98+
<ul class="menu-level-1">
10099
<li class=" active">
101100
<a href="../../Changelog-12.html">
102101
ChangeLog v12
103102
</a> <ul class="menu-level-1"><li class=" active">
104103
<a href="Index.html">
105104
12.0 Changes
106-
</a></li></ul></li> </ul>
107-
<ul class="menu-level-1">
105+
</a></li></ul></li> </ul> <ul class="menu-level-1">
108106
<li class="">
109107
<a href="../../Sitemap.html">
110108
Sitemap

‎tests/Integration/tests-full/changelog/expected/Changelog/12.0/Index.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,14 @@
9696
</div> <div class="toc-collapse">
9797
<div aria-label="main navigation" class="toc" role="navigation">
9898
<div aria-label="Main navigation" class="main_menu" role="navigation">
99-
100-
<ul class="menu-level-1">
99+
<ul class="menu-level-1">
101100
<li class=" active">
102101
<a href="../../Changelog-12.html">
103102
ChangeLog v12
104103
</a> <ul class="menu-level-1"><li class=" current active">
105104
<a href="#" aria-current="page">
106105
12.0 Changes
107-
</a></li></ul></li> </ul>
108-
<ul class="menu-level-1">
106+
</a></li></ul></li> </ul> <ul class="menu-level-1">
109107
<li class="">
110108
<a href="../../Sitemap.html">
111109
Sitemap

‎tests/Integration/tests-full/changelog/expected/Index.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,14 @@
9494
</div> <div class="toc-collapse">
9595
<div aria-label="main navigation" class="toc" role="navigation">
9696
<div aria-label="Main navigation" class="main_menu" role="navigation">
97-
98-
<ul class="menu-level-1">
97+
<ul class="menu-level-1">
9998
<li class="">
10099
<a href="Changelog-12.html">
101100
ChangeLog v12
102101
</a> <ul class="menu-level-1"><li class="">
103102
<a href="Changelog/12.0/Index.html">
104103
12.0 Changes
105-
</a></li></ul></li> </ul>
106-
<ul class="menu-level-1">
104+
</a></li></ul></li> </ul> <ul class="menu-level-1">
107105
<li class="">
108106
<a href="Sitemap.html">
109107
Sitemap

‎tests/Integration/tests-full/changelog/expected/Sitemap.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,14 @@
9595
</div> <div class="toc-collapse">
9696
<div aria-label="main navigation" class="toc" role="navigation">
9797
<div aria-label="Main navigation" class="main_menu" role="navigation">
98-
99-
<ul class="menu-level-1">
98+
<ul class="menu-level-1">
10099
<li class="">
101100
<a href="Changelog-12.html">
102101
ChangeLog v12
103102
</a> <ul class="menu-level-1"><li class="">
104103
<a href="Changelog/12.0/Index.html">
105104
12.0 Changes
106-
</a></li></ul></li> </ul>
107-
<ul class="menu-level-1">
105+
</a></li></ul></li> </ul> <ul class="menu-level-1">
108106
<li class=" current active">
109107
<a href="#" aria-current="page">
110108
Sitemap
@@ -162,8 +160,7 @@
162160
<h1>Sitemap<a class="headerlink" href="#sitemap" data-bs-toggle="modal" data-bs-target="#linkReferenceModal" title="Reference this headline"><i class="fa-solid fa-paragraph"></i></a></h1>
163161
</section>
164162
<div class="section">
165-
166-
<div class="sitemap">
163+
<div class="sitemap">
167164
<ul>
168165
<li class="toctree-l0">
169166
<a href="Changelog-12.html"
@@ -174,8 +171,7 @@ <h1>Sitemap<a class="headerlink" href="#sitemap" data-bs-toggle="modal" data-bs-
174171
class="reference internal">
175172
12.0 Changes
176173
</a></li></ul></li> </ul>
177-
</div>
178-
<div class="sitemap">
174+
</div> <div class="sitemap">
179175
<ul>
180176
<li class="toctree-l0">
181177
<a href="#"

‎tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
</div> <div class="toc-collapse">
8181
<div aria-label="main navigation" class="toc" role="navigation">
8282
<div aria-label="Main navigation" class="main_menu" role="navigation">
83-
84-
<ul class="menu-level-1">
83+
<ul class="menu-level-1">
8584
<li class="">
8685
<a href="page1.html">
8786
Avatar ViewHelper &lt;be:avatar&gt;

‎tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/page1.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
</div> <div class="toc-collapse">
8181
<div aria-label="main navigation" class="toc" role="navigation">
8282
<div aria-label="Main navigation" class="main_menu" role="navigation">
83-
84-
<ul class="menu-level-1">
83+
<ul class="menu-level-1">
8584
<li class=" current active">
8685
<a href="#" aria-current="page">
8786
Avatar ViewHelper &lt;be:avatar&gt;

‎tests/Integration/tests-full/main-menu-json/expected/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
</div> <div class="toc-collapse">
8181
<div aria-label="main navigation" class="toc" role="navigation">
8282
<div aria-label="Main navigation" class="main_menu" role="navigation">
83-
84-
<ul class="menu-level-1">
83+
<ul class="menu-level-1">
8584
<li class="">
8685
<a href="mainMenu.json.html">
8786
&lt;Unknown&gt;

‎tests/Integration/tests-full/menu-subpages-max-1/expected/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@
9494
</div> <div class="toc-collapse">
9595
<div aria-label="main navigation" class="toc" role="navigation">
9696
<div aria-label="Main navigation" class="main_menu" role="navigation">
97-
98-
<ul class="menu-level-1">
97+
<ul class="menu-level-1">
9998
<li class="">
10099
<a href="someDirectory/index.html">
101100
Some Page

‎tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-1/expected/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@
9494
</div> <div class="toc-collapse">
9595
<div aria-label="main navigation" class="toc" role="navigation">
9696
<div aria-label="Main navigation" class="main_menu" role="navigation">
97-
98-
<ul class="menu-level-1">
97+
<ul class="menu-level-1">
9998
<li class="">
10099
<a href="someDirectory/index.html">
101100
Some Page

‎tests/Integration/tests-full/menu-subpages-no-titlesonly-maxdepth-2/expected/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@
9494
</div> <div class="toc-collapse">
9595
<div aria-label="main navigation" class="toc" role="navigation">
9696
<div aria-label="Main navigation" class="main_menu" role="navigation">
97-
98-
<ul class="menu-level-1">
97+
<ul class="menu-level-1">
9998
<li class="">
10099
<a href="someDirectory/index.html">
101100
Some Page

‎tests/Integration/tests-full/menu-subpages/expected/index.html

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
</div> <div class="toc-collapse">
9595
<div aria-label="main navigation" class="toc" role="navigation">
9696
<div aria-label="Main navigation" class="main_menu" role="navigation">
97-
98-
<ul class="menu-level-1">
97+
<p class="caption"><span class="caption-text">This is the toctree</span></p>
98+
<ul class="menu-level-1">
9999
<li class="">
100100
<a href="someDirectory/index.html">
101101
Some Page
@@ -151,6 +151,7 @@ <h1>Document Title<a class="headerlink" href="#document-title" data-bs-toggle="m
151151
<p>Lorem Ipsum Dolor.</p>
152152

153153
<div class="toctree-wrapper compound">
154+
<p class="topic-title">This is the toctree</p>
154155
<ul class="menu-level">
155156
<li class="toc-item">
156157
<a href="someDirectory/index.html#some-page">Some Page</a>
@@ -159,6 +160,23 @@ <h1>Document Title<a class="headerlink" href="#document-title" data-bs-toggle="m
159160
</li>
160161
</ul>
161162
</div>
163+
<div class="toctree-wrapper compound">
164+
<p class="topic-title">This is a menu</p>
165+
<ul>
166+
<li class="toc-item">
167+
<a href="someDirectory/index.html#some-page">Some Page</a>
168+
<ul class="menu-level-1">
169+
<li class="toc-item">
170+
<a href="someDirectory/anotherDirectory/index.html#another-page">Another Page</a>
171+
172+
173+
</li>
174+
</ul>
175+
176+
</li>
177+
</ul>
178+
</div>
179+
162180
</section>
163181
<!-- content end -->
164182
</div>

‎tests/Integration/tests-full/menu-subpages/input/index.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,17 @@ Document Title
1313
Lorem Ipsum Dolor.
1414

1515
.. toctree::
16+
:caption: This is the toctree
1617
:glob:
1718
:titlesonly:
1819
:maxdepth: 1
1920

2021
*/index
22+
23+
.. menu::
24+
:caption: This is a menu
25+
:glob:
26+
:titlesonly:
27+
:maxdepth: 2
28+
29+
*/index

‎tests/Integration/tests-full/navigation-title/expected/anotherPage.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@
9595
</div> <div class="toc-collapse">
9696
<div aria-label="main navigation" class="toc" role="navigation">
9797
<div aria-label="Main navigation" class="main_menu" role="navigation">
98-
99-
<ul class="menu-level-1">
98+
<ul class="menu-level-1">
10099
<li class=" current active">
101100
<a href="#" aria-current="page">
102101
Another Page

‎tests/Integration/tests-full/navigation-title/expected/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@
9494
</div> <div class="toc-collapse">
9595
<div aria-label="main navigation" class="toc" role="navigation">
9696
<div aria-label="Main navigation" class="main_menu" role="navigation">
97-
98-
<ul class="menu-level-1">
97+
<ul class="menu-level-1">
9998
<li class="">
10099
<a href="anotherPage.html">
101100
Another Page

‎tests/Integration/tests-full/navigation-title/expected/yetAnotherPage.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@
9494
</div> <div class="toc-collapse">
9595
<div aria-label="main navigation" class="toc" role="navigation">
9696
<div aria-label="Main navigation" class="main_menu" role="navigation">
97-
98-
<ul class="menu-level-1">
97+
<ul class="menu-level-1">
9998
<li class="">
10099
<a href="anotherPage.html">
101100
Another Page

‎tests/Integration/tests-full/next-prev-by-toctree/expected/four.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
</div> <div class="toc-collapse">
8282
<div aria-label="main navigation" class="toc" role="navigation">
8383
<div aria-label="Main navigation" class="main_menu" role="navigation">
84-
85-
<ul class="menu-level-1">
84+
<ul class="menu-level-1">
8685
<li class="">
8786
<a href="one.html">
8887
One

‎tests/Integration/tests-full/next-prev-by-toctree/expected/i.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@
8282
</div> <div class="toc-collapse">
8383
<div aria-label="main navigation" class="toc" role="navigation">
8484
<div aria-label="Main navigation" class="main_menu" role="navigation">
85-
86-
<ul class="menu-level-1">
85+
<ul class="menu-level-1">
8786
<li class="">
8887
<a href="one.html">
8988
One

‎tests/Integration/tests-full/next-prev-by-toctree/expected/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
</div> <div class="toc-collapse">
8181
<div aria-label="main navigation" class="toc" role="navigation">
8282
<div aria-label="Main navigation" class="main_menu" role="navigation">
83-
84-
<ul class="menu-level-1">
83+
<ul class="menu-level-1">
8584
<li class="">
8685
<a href="one.html">
8786
One

‎tests/Integration/tests-full/next-prev-by-toctree/expected/one.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
</div> <div class="toc-collapse">
8282
<div aria-label="main navigation" class="toc" role="navigation">
8383
<div aria-label="Main navigation" class="main_menu" role="navigation">
84-
85-
<ul class="menu-level-1">
84+
<ul class="menu-level-1">
8685
<li class=" current active">
8786
<a href="#" aria-current="page">
8887
One

‎tests/Integration/tests-full/next-prev-by-toctree/expected/three/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
</div> <div class="toc-collapse">
8282
<div aria-label="main navigation" class="toc" role="navigation">
8383
<div aria-label="Main navigation" class="main_menu" role="navigation">
84-
85-
<ul class="menu-level-1">
84+
<ul class="menu-level-1">
8685
<li class="">
8786
<a href="../one.html">
8887
One

‎tests/Integration/tests-full/next-prev-by-toctree/expected/three/pi.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
</div> <div class="toc-collapse">
8282
<div aria-label="main navigation" class="toc" role="navigation">
8383
<div aria-label="Main navigation" class="main_menu" role="navigation">
84-
85-
<ul class="menu-level-1">
84+
<ul class="menu-level-1">
8685
<li class="">
8786
<a href="../one.html">
8887
One

‎tests/Integration/tests-full/next-prev-by-toctree/expected/three/three.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
</div> <div class="toc-collapse">
8282
<div aria-label="main navigation" class="toc" role="navigation">
8383
<div aria-label="Main navigation" class="main_menu" role="navigation">
84-
85-
<ul class="menu-level-1">
84+
<ul class="menu-level-1">
8685
<li class="">
8786
<a href="../one.html">
8887
One

‎tests/Integration/tests-full/next-prev-by-toctree/expected/three/threepointfive.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
</div> <div class="toc-collapse">
8282
<div aria-label="main navigation" class="toc" role="navigation">
8383
<div aria-label="Main navigation" class="main_menu" role="navigation">
84-
85-
<ul class="menu-level-1">
84+
<ul class="menu-level-1">
8685
<li class="">
8786
<a href="../one.html">
8887
One

‎tests/Integration/tests-full/next-prev-by-toctree/expected/two.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
</div> <div class="toc-collapse">
8282
<div aria-label="main navigation" class="toc" role="navigation">
8383
<div aria-label="Main navigation" class="main_menu" role="navigation">
84-
85-
<ul class="menu-level-1">
84+
<ul class="menu-level-1">
8685
<li class="">
8786
<a href="one.html">
8887
One

‎tests/Integration/tests-full/next-prev/expected/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
</div> <div class="toc-collapse">
8181
<div aria-label="main navigation" class="toc" role="navigation">
8282
<div aria-label="Main navigation" class="main_menu" role="navigation">
83-
84-
<ul class="menu-level-1">
83+
<ul class="menu-level-1">
8584
<li class="">
8685
<a href="page.html">
8786
Page

0 commit comments

Comments
 (0)