Skip to content

Commit 93538f7

Browse files
phpdoc-botphpdoc-bot
authored
Merge pull request #1080 from phpDocumentor/backport/1.x/pr-1079
[1.x] Merge pull request #1079 from phpDocumentor/feature/menu-subtitles
2 parents 468b9f4 + e8f9e5b commit 93538f7

File tree

9 files changed

+108
-66
lines changed

9 files changed

+108
-66
lines changed

‎packages/guides-restructured-text/src/RestructuredText/Directives/MenuDirective.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public function process(
4949
$parserContext = $blockContext->getDocumentParserContext()->getParser()->getParserContext();
5050
$options = $directive->getOptions();
5151
$options['glob'] = new DirectiveOption('glob', true);
52-
$options['titlesonly'] = new DirectiveOption('titlesonly', false);
5352
$options['globExclude'] ??= new DirectiveOption('globExclude', 'index,Index');
5453

5554
$toctreeFiles = $this->toctreeBuilder->buildToctreeEntries(

‎tests/Integration/tests/navigation/breadcrumb/expected/page1.html‎

Lines changed: 101 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,136 @@
11
<!-- content start -->
2-
<div class="section" id="page-1">
3-
<h1>Page 1</h1>
4-
<nav aria-label="breadcrumb">
5-
<a href="/index.html"
6-
class="breadcrumb level-0">Document Title</a> &gt;
7-
<span class="breadcrumb active level-1">Page 1</span>
8-
</nav>
2+
<div class="section" id="page-1">
3+
<h1>Page 1</h1>
4+
<nav aria-label="breadcrumb">
5+
<a href="/index.html"
6+
class="breadcrumb level-0">Document Title</a> &gt;
7+
<span class="breadcrumb active level-1">Page 1</span>
8+
</nav>
99

1010
<p>Lorem Ipsum Dolor.</p>
1111

12-
<div class="menu">
13-
<ul class="menu-level">
14-
<li class="toc-item current active">
15-
<a href="/page1.html#page-1">Page 1</a>
12+
<div class="menu">
13+
<ul class="menu-level">
14+
<li class="toc-item current active">
15+
<a href="/page1.html#page-1">Page 1</a>
1616

17+
<ul class="section-level-1">
18+
<li class="toc-item">
19+
<a href="/page1.html#page-1-level-2">Page 1 Level 2</a>
1720

18-
</li>
19-
<li class="toc-item">
20-
<a href="/page2.html#page-2">Page 2</a>
21+
<ul class="section-level-2">
22+
<li class="toc-item">
23+
<a href="/page1.html#page-1-level-3">Page 1 Level 3</a>
2124

25+
<ul class="section-level-2">
26+
<li class="toc-item">
27+
<a href="/page1.html#page-1-level-4">Page 1 Level 4</a>
2228

23-
</li>
24-
<li class="toc-item">
25-
<a href="/level-1-1/index.html#level-1-1">Level 1-1</a>
26-
<ul class="menu-level-1">
29+
30+
</li>
31+
</ul>
32+
</li>
33+
</ul>
34+
</li>
35+
</ul>
36+
</li>
2737
<li class="toc-item">
28-
<a href="/level-1-1/subpage1.html#subpage-1-level-1-1">Subpage 1, Level 1-1</a>
38+
<a href="/page2.html#page-2">Page 2</a>
2939

40+
<ul class="section-level-1">
41+
<li class="toc-item">
42+
<a href="/page2.html#page-2-level-2">Page 2 Level 2</a>
3043

31-
</li>
32-
<li class="toc-item">
33-
<a href="/level-1-1/subpage2.html#subpage-2-level-1-1">Subpage 2, Level 1-1</a>
44+
<ul class="section-level-2">
45+
<li class="toc-item">
46+
<a href="/page2.html#page-2-level-3">Page 2 Level 3</a>
3447

48+
<ul class="section-level-2">
49+
<li class="toc-item">
50+
<a href="/page2.html#page-2-level-4">Page 2 Level 4</a>
3551

36-
</li>
37-
<li class="toc-item">
38-
<a href="/level-1-1/level-2-1/index.html#level-2-1">Level 2-1</a>
39-
<ul class="menu-level-2">
52+
53+
</li>
54+
</ul>
55+
</li>
56+
</ul>
57+
</li>
58+
</ul>
59+
</li>
4060
<li class="toc-item">
41-
<a href="/level-1-1/level-2-1/subpage1.html#subpage-1-level-2-1">Subpage 1, Level 2-1</a>
61+
<a href="/level-1-1/index.html#level-1-1">Level 1-1</a>
62+
<ul class="menu-level-1">
63+
<li class="toc-item">
64+
<a href="/level-1-1/subpage1.html#subpage-1-level-1-1">Subpage 1, Level 1-1</a>
4265

4366

44-
</li>
45-
<li class="toc-item">
46-
<a href="/level-1-1/level-2-1/subpage2.html#subpage-2-level-2-1">Subpage 2, Level 2-1</a>
67+
</li>
68+
<li class="toc-item">
69+
<a href="/level-1-1/subpage2.html#subpage-2-level-1-1">Subpage 2, Level 1-1</a>
4770

4871

49-
</li>
50-
</ul>
72+
</li>
73+
<li class="toc-item">
74+
<a href="/level-1-1/level-2-1/index.html#level-2-1">Level 2-1</a>
75+
<ul class="menu-level-2">
76+
<li class="toc-item">
77+
<a href="/level-1-1/level-2-1/subpage1.html#subpage-1-level-2-1">Subpage 1, Level 2-1</a>
5178

52-
</li>
53-
<li class="toc-item">
54-
<a href="/level-1-1/level-2-2/index.html#level-2-2">Level 2-2</a>
55-
<ul class="menu-level-2">
56-
<li class="toc-item">
57-
<a href="/level-1-1/level-2-2/subpage1.html#subpage-1-level-2-2">Subpage 1, Level 2-2</a>
5879

80+
</li>
81+
<li class="toc-item">
82+
<a href="/level-1-1/level-2-1/subpage2.html#subpage-2-level-2-1">Subpage 2, Level 2-1</a>
5983

60-
</li>
61-
<li class="toc-item">
62-
<a href="/level-1-1/level-2-2/subpage2.html#subpage-2-level-2-2">Subpage 2, Level 2-2</a>
6384

85+
</li>
86+
</ul>
6487

65-
</li>
66-
</ul>
88+
</li>
89+
<li class="toc-item">
90+
<a href="/level-1-1/level-2-2/index.html#level-2-2">Level 2-2</a>
91+
<ul class="menu-level-2">
92+
<li class="toc-item">
93+
<a href="/level-1-1/level-2-2/subpage1.html#subpage-1-level-2-2">Subpage 1, Level 2-2</a>
6794

68-
</li>
69-
</ul>
7095

71-
</li>
72-
<li class="toc-item">
73-
<a href="/level-1-2/index.html#level-1-2">Level 1-2</a>
74-
<ul class="menu-level-1">
75-
<li class="toc-item">
76-
<a href="/level-1-2/subpage1.html#subpage-1-level-1-2">Subpage 1, Level 1-2</a>
96+
</li>
97+
<li class="toc-item">
98+
<a href="/level-1-1/level-2-2/subpage2.html#subpage-2-level-2-2">Subpage 2, Level 2-2</a>
99+
77100

101+
</li>
102+
</ul>
78103

79-
</li>
104+
</li>
105+
</ul>
106+
107+
</li>
80108
<li class="toc-item">
81-
<a href="/level-1-2/subpage2.html#subpage-2-level-1-2">Subpage 2, Level 1-2</a>
109+
<a href="/level-1-2/index.html#level-1-2">Level 1-2</a>
110+
<ul class="menu-level-1">
111+
<li class="toc-item">
112+
<a href="/level-1-2/subpage1.html#subpage-1-level-1-2">Subpage 1, Level 1-2</a>
82113

83114

84-
</li>
85-
</ul>
115+
</li>
116+
<li class="toc-item">
117+
<a href="/level-1-2/subpage2.html#subpage-2-level-1-2">Subpage 2, Level 1-2</a>
86118

87-
</li>
88-
</ul>
89-
</div>
90-
<div class="section" id="page-1-level-2">
91-
<h2>Page 1 Level 2</h2>
92-
<div class="section" id="page-1-level-3">
119+
120+
</li>
121+
</ul>
122+
123+
</li>
124+
</ul>
125+
</div>
126+
<div class="section" id="page-1-level-2">
127+
<h2>Page 1 Level 2</h2>
128+
<div class="section" id="page-1-level-3">
93129
<h3>Page 1 Level 3</h3>
94130
<div class="section" id="page-1-level-4">
95-
<h4>Page 1 Level 4</h4>
96-
</div>
97-
</div>
98-
</div>
131+
<h4>Page 1 Level 4</h4>
132+
</div>
133+
</div>
99134
</div>
135+
</div>
100136
<!-- content end -->

‎tests/Integration/tests/navigation/menu-level-3/input/level-1-1/level-2-2/subpage1.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Subpage 1, Level 2-2
55
Lorem Ipsum Dolor.
66

77
.. menu::
8+
:titlesonly:
89

910
/*
1011
/*/index

‎tests/Integration/tests/navigation/menu-level-3/input/level-1-2/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ A Toctree with multiple whitespaces in the directive:
1313

1414

1515
.. menu::
16+
:titlesonly:

‎tests/Integration/tests/navigation/menu-level-3/input/level-1-2/subpage1.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Subpage 1, Level 1-2
55
Lorem Ipsum Dolor.
66

77
.. menu::
8+
:titlesonly:
89

910
/*
1011
/*/index

‎tests/Integration/tests/navigation/menu-level-3/input/page1.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Page 1
55
Lorem Ipsum Dolor.
66

77
.. menu::
8+
:titlesonly:
89

910
/*
1011
/*/index

‎tests/Integration/tests/navigation/menu-relative/input/level-1-1/level-2-2/subpage1.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Subpage 1, Level 2-2
55
Lorem Ipsum Dolor.
66

77
.. menu::
8+
:titlesonly:
89

910
/*
1011
/*/index

‎tests/Integration/tests/navigation/menu-relative/input/level-1-2/subpage1.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Subpage 1, Level 1-2
55
Lorem Ipsum Dolor.
66

77
.. menu::
8+
:titlesonly:
89

910
/*
1011
/*/index

‎tests/Integration/tests/navigation/menu-relative/input/page1.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Page 1
55
Lorem Ipsum Dolor.
66

77
.. menu::
8+
:titlesonly:
89

910
/*
1011
/*/index

0 commit comments

Comments
 (0)