diff --git a/config/packages/app.yaml b/config/packages/app.yaml index 0140a5a..b1d2dfd 100644 --- a/config/packages/app.yaml +++ b/config/packages/app.yaml @@ -21,6 +21,26 @@ core: name: 'Page de contenu' templates: - {name: "Par défaut", file: "page/simple/default.html.twig"} + App\Entity\Page\PostPage: + name: 'Page article' + templates: + - {name: "Par défaut", file: "page/post/default.html.twig"} + App\Entity\Page\PostsPage: + name: 'Page d''articles' + templates: + - {name: "Par défaut", file: "page/posts/default.html.twig"} + App\Entity\Page\CategoryPage: + name: 'Page de categorie' + templates: + - {name: "Par défaut", file: "page/category/default.html.twig"} + App\Entity\Page\CategoriesPage: + name: 'Page des catégories' + templates: + - {name: "Par défaut", file: "page/categories/default.html.twig"} + App\Entity\Page\SearchPage: + name: 'Page de recherche' + templates: + - {name: "Par défaut", file: "page/search/default.html.twig"} App\Entity\Page\ContactPage: name: 'Contact' templates: @@ -29,10 +49,6 @@ core: name: 'Liens partagés' templates: - {name: "Par défaut", file: "page/links/default.html.twig"} - App\Entity\Page\TitledPage: - name: 'Page titrée' - templates: - - {name: "Par défaut", file: "page/titled/default.html.twig"} App\Entity\Page\RssPage: name: 'RSS' templates: @@ -45,6 +61,10 @@ core: name: 'Texte' templates: - {name: "Par défaut", file: "page/text/default.txt.twig"} + App\Entity\Page\TitledPage: + name: '_' + templates: + - {name: "Par défaut", file: "page/text/default.txt.twig"} file_manager: mimes: diff --git a/src/Controller/Blog/CategoryController.php b/src/Controller/Blog/CategoryController.php index 43dd2fb..d348875 100644 --- a/src/Controller/Blog/CategoryController.php +++ b/src/Controller/Blog/CategoryController.php @@ -23,7 +23,7 @@ class CategoryController extends PageController { $entities = $this->createQuery()->find(); - return $this->defaultRender('blog/post/categories.html.twig', [ + return $this->defaultRender($this->siteRequest->getPage()->getTemplate(), [ 'categories' => $entities, ]); } diff --git a/src/Controller/Blog/PostController.php b/src/Controller/Blog/PostController.php index f790154..0cfca84 100644 --- a/src/Controller/Blog/PostController.php +++ b/src/Controller/Blog/PostController.php @@ -75,7 +75,7 @@ class PostController extends PageController $this->addFlash('error', 'Le formulaire n\'est pas valide.'); } - return $this->defaultRender('blog/post/post.html.twig', [ + return $this->defaultRender($this->siteRequest->getPage()->getTemplate(), [ 'post' => $post, 'form' => $form->createView(), ]); @@ -87,7 +87,7 @@ class PostController extends PageController ->paginate($page, 5) ; - return $this->defaultRender('blog/post/posts.html.twig', [ + return $this->defaultRender($this->siteRequest->getPage()->getTemplate(), [ 'pager' => $entities, ]); } @@ -104,7 +104,7 @@ class PostController extends PageController ; } - return $this->defaultRender('blog/post/search.html.twig', [ + return $this->defaultRender($this->siteRequest->getPage()->getTemplate(), [ 'pager' => $entities ?? null, 'query' => $query, ]); @@ -134,7 +134,7 @@ class PostController extends PageController ); } - return $this->defaultRender('blog/post/category.html.twig', [ + return $this->defaultRender($this->siteRequest->getPage()->getTemplate(), [ 'category' => $category, 'pager' => $entities, ]); diff --git a/src/Entity/Page/CategoriesPage.php b/src/Entity/Page/CategoriesPage.php new file mode 100644 index 0000000..d3257e1 --- /dev/null +++ b/src/Entity/Page/CategoriesPage.php @@ -0,0 +1,12 @@ + -