Skip to content

Commit 06fbd81

Browse files
weaverryanweaverryan
authored
Merge pull request #91 from javiereguiluz/configuration-tabs
Added some missing labels in configuration blocks
2 parents 15631fc + a76a2e7 commit 06fbd81

File tree

4 files changed

+34
-31
lines changed

4 files changed

+34
-31
lines changed

‎src/Directive/ConfigurationBlockDirective.php‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,27 @@
1717

1818
class ConfigurationBlockDirective extends SubDirective
1919
{
20+
private const LANGUAGE_LABELS = [
21+
'env' => 'Bash',
22+
'html+jinja' => 'Twig',
23+
'html+php' => 'PHP',
24+
'html+twig' => 'Twig',
25+
'jinja' => 'Twig',
26+
'php' => 'PHP',
27+
'php-annotations' => 'Annotations',
28+
'php-attributes' => 'Attributes',
29+
'php-standalone' => 'Standalone Use',
30+
'php-symfony' => 'Framework Use',
31+
'rst' => 'RST',
32+
'terminal' => 'Bash',
33+
'varnish3' => 'Varnish 3',
34+
'varnish4' => 'Varnish 4',
35+
'vcl' => 'VCL',
36+
'xml' => 'XML',
37+
'xml+php' => 'XML',
38+
'yaml' => 'YAML',
39+
];
40+
2041
public function getName(): string
2142
{
2243
return 'configuration-block';
@@ -33,7 +54,8 @@ public function processSub(Parser $parser, ?Node $document, string $variable, st
3354
$language = $node->getLanguage() ?? 'Unknown';
3455

3556
$blocks[] = [
36-
'language' => $this->formatLanguageTab($language),
57+
'language_label' => self::LANGUAGE_LABELS[$language] ?? ucfirst(str_replace('-', ' ', $language)),
58+
'language' => $language,
3759
'code' => $node->render(),
3860
];
3961
}
@@ -47,23 +69,4 @@ public function processSub(Parser $parser, ?Node $document, string $variable, st
4769

4870
return $parser->getNodeFactory()->createWrapperNode(null, $wrapperDiv, '</div>');
4971
}
50-
51-
/**
52-
* A hack to print exactly what we want in the tab of a configuration block.
53-
*/
54-
private function formatLanguageTab(string $language): string
55-
{
56-
switch ($language) {
57-
case 'php-annotations':
58-
return 'Annotations';
59-
case 'php-attributes':
60-
return 'Attributes';
61-
case 'xml':
62-
case 'yaml':
63-
case 'php':
64-
return strtoupper($language);
65-
default:
66-
return $language;
67-
}
68-
}
6972
}

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

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<div class="configuration-block">
22
<ul class="configuration-tabs">
3-
<li data-language="YAML" data-active="true"> <span>YAML</span> </li>
4-
<li data-language="PHP" > <span>PHP</span> </li>
3+
<li data-language="yaml" data-active="true"> <span>YAML</span> </li>
4+
<li data-language="php" > <span>PHP</span> </li>
55
</ul>
6-
<div class="configuration-codeblock" data-language="YAML" style="">
6+
<div class="configuration-codeblock" data-language="yaml" style="">
77
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-yaml">
88
<div class="codeblock-scroll">
99
<pre class="codeblock-lines">1</pre>
1010
<pre class="codeblock-code"><code><span class="hljs-comment"># app/config/services.yml</span></code></pre>
1111
</div>
1212
</div>
1313
</div>
14-
<div class="configuration-codeblock" data-language="PHP" style="display: none">
14+
<div class="configuration-codeblock" data-language="php" style="display: none">
1515
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-php">
1616
<div class="codeblock-scroll">
1717
<pre class="codeblock-lines">1</pre>

‎tests/fixtures/expected/main/datetime.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ <h3 id="error-bubbling"><a class="headerlink" href="#error-bubbling" title="Perm
190190
<p>And configuration blocks:</p>
191191
<div class="configuration-block">
192192
<ul class="configuration-tabs">
193-
<li data-language="YAML" data-active="true"> <span>YAML</span> </li>
194-
<li data-language="XML" > <span>XML</span> </li>
195-
<li data-language="PHP" > <span>PHP</span> </li>
193+
<li data-language="yaml" data-active="true"> <span>YAML</span> </li>
194+
<li data-language="xml" > <span>XML</span> </li>
195+
<li data-language="php" > <span>PHP</span> </li>
196196
</ul>
197-
<div class="configuration-codeblock" data-language="YAML" style="">
197+
<div class="configuration-codeblock" data-language="yaml" style="">
198198
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-yaml">
199199
<div class="codeblock-scroll">
200200
<pre class="codeblock-lines">1
@@ -215,7 +215,7 @@ <h3 id="error-bubbling"><a class="headerlink" href="#error-bubbling" title="Perm
215215
</div>
216216
</div>
217217
</div>
218-
<div class="configuration-codeblock" data-language="XML" style="display: none">
218+
<div class="configuration-codeblock" data-language="xml" style="display: none">
219219
<div translate="no" class="notranslate codeblock codeblock-loc-2 codeblock-xml">
220220
<div class="codeblock-scroll">
221221
<pre class="codeblock-lines">1
@@ -262,7 +262,7 @@ <h3 id="error-bubbling"><a class="headerlink" href="#error-bubbling" title="Perm
262262
</div>
263263
</div>
264264
</div>
265-
<div class="configuration-codeblock" data-language="PHP" style="display: none">
265+
<div class="configuration-codeblock" data-language="php" style="display: none">
266266
<div translate="no" class="notranslate codeblock codeblock-loc-2 codeblock-php">
267267
<div class="codeblock-scroll">
268268
<pre class="codeblock-lines">1

0 commit comments

Comments
 (0)