diff --git a/user/pages/02.projets/blog.md b/user/pages/02.projets/blog.md index 3e416d3..9e9d590 100644 --- a/user/pages/02.projets/blog.md +++ b/user/pages/02.projets/blog.md @@ -10,4 +10,3 @@ content: pagination: true url_taxonomy_filters: true --- - diff --git a/user/themes/figureslibres/templates/blog.html.twig b/user/themes/figureslibres/templates/blog.html.twig index ec349ae..0f649ac 100644 --- a/user/themes/figureslibres/templates/blog.html.twig +++ b/user/themes/figureslibres/templates/blog.html.twig @@ -43,9 +43,7 @@ {% endblock %} - {% block sidebar %} - {% include 'partials/sidebar.html.twig' %} - {% endblock %} + {% endembed %} diff --git a/user/themes/figureslibres/templates/item.html.twig b/user/themes/figureslibres/templates/item.html.twig index f73fc52..3ecf48d 100644 --- a/user/themes/figureslibres/templates/item.html.twig +++ b/user/themes/figureslibres/templates/item.html.twig @@ -31,9 +31,7 @@ {% block item %} {% include 'partials/blog-item.html.twig' %} {% endblock %} - {% block sidebar %} - {% include 'partials/sidebar.html.twig' %} - {% endblock %} + {% endembed %} diff --git a/user/themes/figureslibres/templates/partials/base.html.twig b/user/themes/figureslibres/templates/partials/base.html.twig index 5bccd54..23aaa4d 100644 --- a/user/themes/figureslibres/templates/partials/base.html.twig +++ b/user/themes/figureslibres/templates/partials/base.html.twig @@ -35,55 +35,36 @@ {% endblock head %} -
+ {% block header %}
+

{{ site.title }}

+
-
-
- - - -
-
+ {% endblock %} - {% block hero %}{% endblock %} - -
- {% block body %} -
-
- {% block messages %} - {% include 'partials/messages.html.twig' ignore missing %} - {% endblock %} - {% block content %}{% endblock %} -
-
- {% endblock %} +
+ {% block body %} +
+ {% block content %}{% endblock %}
-
+ {% block aside %} + {% include 'partials/sidebar.html.twig' %} + {% endblock %} - {% block footer %} - {% include 'partials/footer.html.twig' %} - {% endblock %} + {% block footer %} + {% include 'partials/footer.html.twig' %} + {% endblock %} -
-
- - -
-
+ {% endblock %} + {% block bottom %} {{ assets.js('bottom')|raw }} diff --git a/user/themes/figureslibres/templates/partials/footer.html.twig b/user/themes/figureslibres/templates/partials/footer.html.twig index 15ea155..c89fa3f 100644 --- a/user/themes/figureslibres/templates/partials/footer.html.twig +++ b/user/themes/figureslibres/templates/partials/footer.html.twig @@ -1,5 +1,3 @@ - diff --git a/user/themes/figureslibres/templates/partials/sidebar.html.twig b/user/themes/figureslibres/templates/partials/sidebar.html.twig index ea6a34c..4038efb 100644 --- a/user/themes/figureslibres/templates/partials/sidebar.html.twig +++ b/user/themes/figureslibres/templates/partials/sidebar.html.twig @@ -41,3 +41,17 @@ {% if config.plugins.feed.enable_json_feed %} JSON{% endif %} {% endif %} + + + +