Skip to content

Commit d0197e3

Browse files
linawolflinawolf
committed
Adjust Bootstrap Menu Templates
1 parent 4546dc8 commit d0197e3

File tree

8 files changed

+31
-42
lines changed

8 files changed

+31
-42
lines changed

‎packages/guides-theme-bootstrap/resources/template/body/menu/mainmenu/menu-level.html.twig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<div class="level-x">
2-
{% for entry in node.entries -%}
2+
{% for entry in node.menuEntries -%}
3+
{% spaceless %}
34
<a href="{{ renderLink(entry.url) }}"
45
class="nav-link {% if entry.options.active %} active {% endif %}"
56
{% if entry.options.active %} aria-current="page" {% endif %} >
67
{{ renderNode(entry.value.value) }}
78
</a>
9+
{% endspaceless %}
810
{% endfor %}
911
</div>

‎packages/guides-theme-bootstrap/resources/template/body/menu/mainmenu/table-of-content.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
<nav class="nav flex-column">
3-
{% for entry in node.entries -%}
3+
{% for entry in node.menuEntries -%}
44
<a href="{{ renderLink(entry.url) }}"
55
class="nav-link {% if entry.options.active %} active {% endif %}"
6-
{% if entry.options.active %} aria-current="page" {% endif %} >
6+
{%- if entry.options.active %} aria-current="page" {% endif -%} >
77
{{ renderNode(entry.value.value) }}
88
</a>
99

‎packages/guides-theme-bootstrap/resources/template/body/menu/navbar/menu-level.html.twig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<ul class="level-{{ node.level }}">
2-
{% for entry in node.entries -%}
3-
2+
{% for entry in node.menuEntries -%}
3+
{% spaceless %}
44
<li class="nav-item">
55
<a href="{{ renderLink(entry.url) }}"
66
class="nav-link {% if entry.options.active %} active {% endif %}"
77
{% if entry.options.active %} aria-current="page" {% endif %} >
88
{{ renderNode(entry.value.value) }}
99
</a>
1010
</li>
11-
{% endfor %}
11+
{% endspaceless %}
12+
{%- endfor %}
1213
</ul>

‎packages/guides-theme-bootstrap/resources/template/body/menu/navbar/table-of-content.html.twig

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11

22
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
3-
{% for entry in node.entries -%}
3+
{% for entry in node.menuEntries -%}
44
<li class="nav-item">
5-
<a href="{{ renderLink(entry.url) }}"
6-
class="nav-link {% if entry.options.active %} active {% endif %}"
7-
{% if entry.options.active %} aria-current="page" {% endif %} >
5+
<a href="{{ renderLink(entry.url) }}" class="nav-link {% if entry.options.active %} active {% endif %}"
6+
{%- if entry.options.active %} aria-current="page" {% endif %} >
87
{{ renderNode(entry.value.value) }}
98
</a>
109
</li>

‎packages/guides-theme-bootstrap/resources/template/body/menu/table-of-content.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% include "body/menu/navbar/table-of-content.html.twig" %}
55
{% else %}
66
<div class="toc">
7-
{% for entry in node.entries -%}
7+
{% for entry in node.menuEntries -%}
88
{{ renderNode(entry) }}
99
{% endfor %}
1010
</div>

‎tests/Integration/tests-bootstrap/index/expected/index.html

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- Required meta tags -->
66
<meta charset="utf-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
8-
8+
99
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
1010
</head>
1111
<body>
@@ -20,18 +20,14 @@
2020
<div class="collapse navbar-collapse" id="navbarSupportedContent">
2121

2222

23-
23+
2424
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
2525
<li class="nav-item">
26-
<a href="/index.html"
27-
class="nav-link active "
28-
aria-current="page" >
26+
<a href="/index.html" class="nav-link " >
2927
Document Title
3028
</a>
3129
</li><li class="nav-item">
32-
<a href="/somePage.html"
33-
class="nav-link "
34-
>
30+
<a href="/somePage.html" class="nav-link " >
3531
Some Page
3632
</a>
3733
</li></ul>
@@ -47,21 +43,19 @@
4743
<div class="col-lg-3">
4844
<div class="rubric">Main Menu</div>
4945

50-
46+
5147
<nav class="nav flex-column">
5248
<a href="/index.html"
53-
class="nav-link active "
54-
aria-current="page" >
49+
class="nav-link ">
5550
Document Title
5651
</a><a href="/somePage.html"
57-
class="nav-link "
58-
>
52+
class="nav-link ">
5953
Some Page
6054
</a></nav>
6155

6256
</div>
6357
<div class="col-lg-9">
64-
58+
6559

6660
<div class="section" id="document-title">
6761
<h1>Document Title</h1>
@@ -79,7 +73,7 @@ <h1>Document Title</h1>
7973
<p>Generated by <a href="https://www.phpdoc.org/">phpDocumentor</a>.</p>
8074
</div>
8175
</footer>
82-
76+
8377
<!-- Optional JavaScript; choose one of the two! -->
8478

8579
<!-- Option 1: Bootstrap Bundle with Popper -->

‎tests/Integration/tests-bootstrap/index/expected/somePage.html

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- Required meta tags -->
66
<meta charset="utf-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
8-
8+
99
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
1010
</head>
1111
<body>
@@ -20,18 +20,14 @@
2020
<div class="collapse navbar-collapse" id="navbarSupportedContent">
2121

2222

23-
23+
2424
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
2525
<li class="nav-item">
26-
<a href="/index.html"
27-
class="nav-link "
28-
>
26+
<a href="/index.html" class="nav-link " >
2927
Document Title
3028
</a>
3129
</li><li class="nav-item">
32-
<a href="/somePage.html"
33-
class="nav-link active "
34-
aria-current="page" >
30+
<a href="/somePage.html" class="nav-link " >
3531
Some Page
3632
</a>
3733
</li></ul>
@@ -47,21 +43,19 @@
4743
<div class="col-lg-3">
4844
<div class="rubric">Main Menu</div>
4945

50-
46+
5147
<nav class="nav flex-column">
5248
<a href="/index.html"
53-
class="nav-link "
54-
>
49+
class="nav-link ">
5550
Document Title
5651
</a><a href="/somePage.html"
57-
class="nav-link active "
58-
aria-current="page" >
52+
class="nav-link ">
5953
Some Page
6054
</a></nav>
6155

6256
</div>
6357
<div class="col-lg-9">
64-
58+
6559

6660
<div class="section" id="some-page">
6761
<h1>Some Page</h1>
@@ -79,7 +73,7 @@ <h1>Some Page</h1>
7973
<p>Generated by <a href="https://www.phpdoc.org/">phpDocumentor</a>.</p>
8074
</div>
8175
</footer>
82-
76+
8377
<!-- Optional JavaScript; choose one of the two! -->
8478

8579
<!-- Option 1: Bootstrap Bundle with Popper -->

‎tests/Integration/tests-bootstrap/index/input/skip

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)