Skip to content

Commit e60c601

Browse files
committed
Merge remote-tracking branch 'upstream/main' into main
* upstream/main: Fixed the generation of TOCs Tweaked the prompts of console code blocks (#103) Added some CSS class to configuration block tabs (#104)
2 parents bc49abe + 9010b35 commit e60c601

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

src/Templates/default/html/directives/configuration-block.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="configuration-block">
2-
<ul class="configuration-tabs">
2+
<ul class="configuration-tabs configuration-tabs-length-{{ blocks|length }}">
33
{% for block in blocks %}
44
<li data-language="{{ block.language }}" {{ loop.first ? 'data-active="true"' }}>
55
<span>{{ block.language_label }}</span>

src/Twig/TocExtension.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,16 @@ public function getFunctions(): array
2424
public static function getOptions(array $toc): array
2525
{
2626
$flattendToc = self::flattenToc($toc);
27-
$maxDepth = 0;
27+
// FIXME: this hardcoded '2' value should instead be obtained
28+
// automatically using the 'maxdepth' option of 'toctree' directive.
29+
// See https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html
30+
$maxDepth = 2;
2831
$numVisibleItems = 0;
2932
foreach ($flattendToc as $tocItem) {
30-
$maxDepth = max($maxDepth, $tocItem['level']);
33+
if ($tocItem['level'] > $maxDepth) {
34+
continue;
35+
}
36+
3137
$numVisibleItems++;
3238
}
3339

tests/fixtures/expected/blocks/directives/configuration-block.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="configuration-block">
2-
<ul class="configuration-tabs">
2+
<ul class="configuration-tabs configuration-tabs-length-2">
33
<li data-language="yaml" data-active="true"> <span>YAML</span> </li>
44
<li data-language="php" > <span>PHP</span> </li>
55
</ul>

tests/fixtures/expected/main/datetime.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ <h3 id="error-bubbling"><a class="headerlink" href="#error-bubbling" title="Perm
189189
</div>
190190
<p>And configuration blocks:</p>
191191
<div class="configuration-block">
192-
<ul class="configuration-tabs">
192+
<ul class="configuration-tabs configuration-tabs-length-3">
193193
<li data-language="yaml" data-active="true"> <span>YAML</span> </li>
194194
<li data-language="xml" > <span>XML</span> </li>
195195
<li data-language="php" > <span>PHP</span> </li>

0 commit comments

Comments
 (0)