diff --git a/templates/base.html.twig b/templates/base.html.twig index e2eded5..d0ccace 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -84,9 +84,13 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX {% block page_subtitle %} -

- {{- 'DevOp animé par la culture du libre et du hacking' -}} -

+ {% set pageSubTitle = pageSubTitle ?? null %} + + {% if pageSubTitle %} +

+ {{- pageSubTitle|raw -}} +

+ {% endif %} {% endblock %} diff --git a/templates/page/category/default.html.twig b/templates/page/category/default.html.twig index 81817a3..eb70835 100644 --- a/templates/page/category/default.html.twig +++ b/templates/page/category/default.html.twig @@ -5,7 +5,7 @@ {% endblock %} {% block meta_description %} - {{- parent()|build_string(post) -}} + {{- parent()|build_string(category) -}} {% endblock %} {% block page_title %} @@ -13,18 +13,34 @@ {% endblock %} {% block page_subtitle %} - {{- parent()|build_string(category) -}} + {% set pageSubTitle = _page.subTitle.value|build_string(category) %} + + {{- parent() -}} {% endblock %} -{% block pager %} - {{ include('module/_pager.html.twig', { - route: _node.routeName, - routeParams: { - category: category.id, - slug: category.slug, - _domain: _domain, - }, - pages: pager.paginationData.endPage, - currentPage: pager.paginationData.current - }) }} +{% block body %} + {% for post in pager %} + {% if not loop.first %} +
+ {% endif %} + + {{ include('page/post/_post.html.twig', {post: post}) }} + {% endfor %} + + {% if pager.getPaginationData.pageCount > 1 %} +
+
+
+ {% block pager %} + {{ include('module/_pager.html.twig', { + route: _node.routeName, + routeParams: {_domain: _domain}, + pages: pager.paginationData.endPage, + currentPage: pager.paginationData.current + }) }} + {% endblock %} +
+
+
+ {% endif %} {% endblock %} diff --git a/templates/page/post/default.html.twig b/templates/page/post/default.html.twig index 2a7ecb0..83dc631 100644 --- a/templates/page/post/default.html.twig +++ b/templates/page/post/default.html.twig @@ -1,5 +1,9 @@ {% extends "page/titled/default.html.twig" %} +{%- block page_title -%} + {{- parent()|build_string(post) -}} +{% endblock %} + {%- block meta_title -%} {{- parent()|build_string(post) -}} {% endblock %} @@ -8,10 +12,6 @@ {{- parent()|build_string(post) -}} {% endblock %} -{% block page_title %} - {{- parent()|build_string(post) -}} -{% endblock %} - {%- block page_subtitle -%}