-
Notifications
You must be signed in to change notification settings - Fork 25
Tweaked the configuration block directive #85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
weaverryan
merged 3 commits into
symfony-tools:main
from
javiereguiluz:configuration_block
Mar 26, 2021
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
13 changes: 9 additions & 4 deletions
13
src/Templates/default/html/directives/configuration-block.html.twig
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,14 @@ | ||
| <div class="configuration-block"> | ||
| <ul class="simple"> | ||
| <ul class="configuration-tabs"> | ||
| {% for block in blocks %} | ||
| <li> | ||
| <em>{{ block.language }}</em> | ||
| {{ block.code|raw }} | ||
| <li data-language="{{ block.language }}" {{ loop.first ? 'data-active="true"' }}> | ||
| <span>{{ block.language }}</span> | ||
| </li> | ||
| {% endfor %} | ||
| </ul> | ||
|
|
||
| {% for block in blocks %} | ||
| <div class="configuration-codeblock" data-language="{{ block.language }}" style="{{ not loop.first ? 'display: none' }}"> | ||
| {{ block.code|raw }} | ||
| </div> | ||
| {% endfor %} |
37 changes: 18 additions & 19 deletions
37
tests/fixtures/expected/blocks/directives/configuration-block.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,22 @@ | ||
| <div class="configuration-block"> | ||
| <ul class="simple"> | ||
| <li> | ||
| <em>YAML</em> | ||
| <div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-yaml"> | ||
| <div class="codeblock-scroll"> | ||
| <pre class="codeblock-lines">1</pre> | ||
| <pre class="codeblock-code"><code><span class="hljs-comment"># app/config/services.yml</span> | ||
| </code></pre> | ||
| <ul class="configuration-tabs"> | ||
| <li data-language="YAML" data-active="true"> <span>YAML</span> </li> | ||
| <li data-language="PHP" > <span>PHP</span> </li> | ||
| </ul> | ||
| <div class="configuration-codeblock" data-language="YAML" style=""> | ||
| <div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-yaml"> | ||
| <div class="codeblock-scroll"> | ||
| <pre class="codeblock-lines">1</pre> | ||
| <pre class="codeblock-code"><code><span class="hljs-comment"># app/config/services.yml</span></code></pre> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </li> | ||
| <li> | ||
| <em>PHP</em> | ||
| <div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-php"> | ||
| <div class="codeblock-scroll"> | ||
| <pre class="codeblock-lines">1</pre> | ||
| <pre class="codeblock-code"><code><span class="hljs-comment">// config/routes.php</span> | ||
| </code></pre> | ||
| <div class="configuration-codeblock" data-language="PHP" style="display: none"> | ||
| <div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-php"> | ||
| <div class="codeblock-scroll"> | ||
| <pre class="codeblock-lines">1</pre> | ||
| <pre class="codeblock-code"><code><span class="hljs-comment">// config/routes.php</span></code></pre> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </li> | ||
| </ul></div> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we really need to generate these spaces?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd prefer to keep it (it's the same case as https://github.com/weaverryan/docs-builder/pull/56#issuecomment-791463260).
I know some people disagree but ... I prefer to make templates readable instead of making the generated HTML perfect, because templates are for humans (and they must maintain them in the future) and HTML is for machines and they don't care.
I hope you agree somewhat on this 🙏
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 to be pragmatic on this kind of things