Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add "vertical layout" template #3

Merged
merged 41 commits into from
May 17, 2022
Merged

Add "vertical layout" template #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
626fd12
Add "vertical layout" template
Dec 3, 2021
b4d91a7
Pooling of "horizontal" and "vertical" layout
Dec 3, 2021
6f63581
Update src/Helper/ContextHelper.php
cavasinf Dec 3, 2021
cc86c6c
Update src/Helper/ContextHelper.php
cavasinf Dec 3, 2021
2b07d71
Change layout includes files location
Dec 3, 2021
ccc4f46
Set getLayout to private access
Dec 3, 2021
58a754c
BugFix block overriding from "base" (user) template
Dec 6, 2021
c284556
BugFix block horizontal template name
Dec 6, 2021
af9a000
Add "HTML attribute id" config to primary blocks
Dec 10, 2021
40325cb
Add hasActiveChildren() on menu + auto open tree
Dec 13, 2021
d3809ea
Merge branch 'main' into layout-vertical
cavasinf Dec 21, 2021
6e39911
Add new tabler param to ConfigurationTest
Dec 22, 2021
de1240b
BugFix when focus out, active menu was closed
Jan 3, 2022
d01dee9
Add dark-mode for header and navbar individually
Jan 3, 2022
13597db
Add new dark param into default configuration for tests
Jan 3, 2022
7d3989b
Merge branch 'main' into layout-vertical
kevinpapst Jan 8, 2022
5eea967
remove required config, it has a default value
kevinpapst Jan 8, 2022
0085d69
Update templates/includes/layout_vertical.html.twig
cavasinf Jan 10, 2022
e831141
Use include navbar template
Jan 10, 2022
62b2fb6
Add `header` block as default from layout vertical
Jan 10, 2022
90e3e3b
singular = hasActiveChild()
Jan 10, 2022
e8c7df1
Remove hacky include way
Jan 10, 2022
a33825a
Add `navbar` block as default from layout horizontal
Jan 10, 2022
e224005
Update menu twig to allows childs of a child item
Feb 18, 2022
21b1119
Explode layout option into twigs layout
Feb 18, 2022
58591e6
Remove `layout` tabler configuration
Feb 18, 2022
56e4f1d
Remove `layout` tabler configuration
Feb 18, 2022
6534bcc
Merge branch 'main' into layout-vertical
Feb 18, 2022
7500575
BugFix extends & variable layout type
Feb 18, 2022
9e280c7
Clean unused `includes`
Feb 18, 2022
ec345da
Add badge option on child item
Feb 21, 2022
4e51950
Merge branch 'main' into layout-vertical
Mar 8, 2022
bcc1ab5
[Redo] Update menu twig to allows childs of a child item
Mar 8, 2022
f80cf40
Remove navbar embeded (twig doens't allow block override in embeded f…
Mar 26, 2022
efaf141
Redo PR #74
Mar 26, 2022
636fc1a
Switch navbar into macro
Mar 26, 2022
a1e81cc
Add safe escape
Mar 26, 2022
72512a0
Merge branch 'main' into layout-vertical
Apr 13, 2022
081ae49
remove tabler_layoutType, do not show badge on first level vertical m…
kevinpapst May 17, 2022
9d2c766
remove tabler_layoutType, do not show badge on first level vertical m…
kevinpapst May 17, 2022
0558b4b
added missing commits
kevinpapst May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions templates/includes/layout_horizontal.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% block layout_vertical %}
<header class="navbar navbar-expand-md navbar-light d-print-none">
<div class="{{ ''|tabler_container }}">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu">
Expand Down Expand Up @@ -51,3 +52,4 @@
</div>
</div>
{% endif %}
{% endblock %}
2 changes: 2 additions & 0 deletions templates/includes/layout_vertical.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% block layout_vertical %}
<aside class="navbar navbar-vertical navbar-expand-lg navbar-dark">
<div class="{{ ''|tabler_container }}">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu">
Expand Down Expand Up @@ -43,3 +44,4 @@
</div>
</header>
{% endif %}
{% endblock %}
6 changes: 4 additions & 2 deletions templates/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ Enjoy your theme!
<div class="wrapper">

{% if tabler_bundle.isLayoutHorizontal() %}
{% include '@Tabler/includes/layout_horizontal.html.twig' %}
{% use '@Tabler/includes/layout_horizontal.html.twig' %}
{% block layout_horizontal %}{{ parent() }}{% endblock %}
cavasinf marked this conversation as resolved.
Show resolved Hide resolved
{% elseif tabler_bundle.isLayoutVertical() %}
{% include '@Tabler/includes/layout_vertical.html.twig' %}
{% use '@Tabler/includes/layout_vertical.html.twig' %}
{% block layout_vertical %}{{ parent() }}{% endblock %}
cavasinf marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}


Expand Down