diff --git a/core/Bundle/AppBundle.php b/core/Bundle/CoreBundle.php similarity index 92% rename from core/Bundle/AppBundle.php rename to core/Bundle/CoreBundle.php index a0da128..f2b4d32 100644 --- a/core/Bundle/AppBundle.php +++ b/core/Bundle/CoreBundle.php @@ -14,7 +14,7 @@ namespace App\Core\Bundle; use App\Core\DependencyInjection\AppExtension; use Symfony\Component\HttpKernel\Bundle\Bundle; -class AppBundle extends Bundle +class CoreBundle extends Bundle { public function getContainerExtension() { diff --git a/core/Controller/Account/AccountAdminController.php b/core/Controller/Account/AccountAdminController.php index dcc59e7..dea9d30 100644 --- a/core/Controller/Account/AccountAdminController.php +++ b/core/Controller/Account/AccountAdminController.php @@ -26,7 +26,7 @@ class AccountAdminController extends AdminController { $account = $this->getUser(); - return $this->render('account/admin/edit.html.twig', [ + return $this->render('@Core/account/admin/edit.html.twig', [ 'account' => $account, ]); } @@ -86,7 +86,7 @@ class AccountAdminController extends AdminController } } - return $this->render('account/admin/edit.html.twig', [ + return $this->render('@Core/account/admin/edit.html.twig', [ 'account' => $account, 'twoFaKey' => $secret, 'twoFaQrCodeContent' => $qrCodeContent, diff --git a/core/Controller/Auth/AuthController.php b/core/Controller/Auth/AuthController.php index 153ae17..94f1b86 100644 --- a/core/Controller/Auth/AuthController.php +++ b/core/Controller/Auth/AuthController.php @@ -29,7 +29,7 @@ class AuthController extends AbstractController $error = $authenticationUtils->getLastAuthenticationError(); $lastUsername = $authenticationUtils->getLastUsername(); - return $this->render('auth/login.html.twig', [ + return $this->render('@Core/auth/login.html.twig', [ 'last_username' => $lastUsername, 'error' => $error, ]); @@ -81,7 +81,7 @@ class AuthController extends AbstractController } } - return $this->render('auth/resetting_request.html.twig', [ + return $this->render('@Core/auth/resetting_request.html.twig', [ 'email_sent' => $emailSent, ]); } @@ -142,7 +142,7 @@ class AuthController extends AbstractController } } - return $this->render('auth/resetting_update.html.twig', [ + return $this->render('@Core/auth/resetting_update.html.twig', [ 'password_updated' => $passwordUpdated, 'token' => $token, 'expired' => $expired, diff --git a/core/Controller/Dashboard/DashboardAdminController.php b/core/Controller/Dashboard/DashboardAdminController.php index a514bd5..9000b83 100644 --- a/core/Controller/Dashboard/DashboardAdminController.php +++ b/core/Controller/Dashboard/DashboardAdminController.php @@ -16,7 +16,7 @@ class DashboardAdminController extends AdminController */ public function index(): Response { - return $this->render('dashboard/admin/index.html.twig', [ + return $this->render('@Core/dashboard/admin/index.html.twig', [ ]); } diff --git a/core/Controller/Site/NavigationAdminController.php b/core/Controller/Site/NavigationAdminController.php index 1e3af7e..954c1f3 100644 --- a/core/Controller/Site/NavigationAdminController.php +++ b/core/Controller/Site/NavigationAdminController.php @@ -24,7 +24,7 @@ class NavigationAdminController extends AdminController { $pager = $query->paginate($page); - return $this->render('site/navigation_admin/index.html.twig', [ + return $this->render('@Core/site/navigation_admin/index.html.twig', [ 'pager' => $pager, ]); } @@ -51,7 +51,7 @@ class NavigationAdminController extends AdminController $this->addFlash('warning', 'Le formulaire est invalide.'); } - return $this->render('site/navigation_admin/new.html.twig', [ + return $this->render('@Core/site/navigation_admin/new.html.twig', [ 'form' => $form->createView(), 'entity' => $entity, ]); @@ -79,7 +79,7 @@ class NavigationAdminController extends AdminController $this->addFlash('warning', 'Le formulaire est invalide.'); } - return $this->render('site/navigation_admin/edit.html.twig', [ + return $this->render('@Core/site/navigation_admin/edit.html.twig', [ 'form' => $form->createView(), 'entity' => $entity, ]); @@ -90,7 +90,7 @@ class NavigationAdminController extends AdminController */ public function show(Entity $entity): Response { - return $this->render('site/navigation_admin/show.html.twig', [ + return $this->render('@Core/site/navigation_admin/show.html.twig', [ 'entity' => $entity, ]); } diff --git a/core/Controller/Site/NodeAdminController.php b/core/Controller/Site/NodeAdminController.php index 0517de1..cda8e29 100644 --- a/core/Controller/Site/NodeAdminController.php +++ b/core/Controller/Site/NodeAdminController.php @@ -88,7 +88,7 @@ class NodeAdminController extends AdminController ]); } - return $this->render('site/node_admin/new.html.twig', [ + return $this->render('@Core/site/node_admin/new.html.twig', [ 'form' => $form->createView(), 'node' => $node, 'entity' => $entity, @@ -137,7 +137,7 @@ class NodeAdminController extends AdminController ]); } - return $this->render('site/node_admin/edit.html.twig', [ + return $this->render('@Core/site/node_admin/edit.html.twig', [ 'form' => $form->createView(), 'entity' => $entity, 'tab' => $tab, @@ -149,7 +149,7 @@ class NodeAdminController extends AdminController */ public function urls(Entity $entity, SitemapBuilder $builder): Response { - return $this->render('site/node_admin/urls.html.twig', [ + return $this->render('@Core/site/node_admin/urls.html.twig', [ 'entity' => $entity, 'urls' => $builder->getNodeUrls($entity), ]); @@ -205,7 +205,7 @@ class NodeAdminController extends AdminController ]); } - return $this->render('site/node_admin/move.html.twig', [ + return $this->render('@Core/site/node_admin/move.html.twig', [ 'form' => $form->createView(), 'entity' => $entity, ]); diff --git a/core/Controller/Site/PageAdminController.php b/core/Controller/Site/PageAdminController.php index e42582e..086f726 100644 --- a/core/Controller/Site/PageAdminController.php +++ b/core/Controller/Site/PageAdminController.php @@ -27,7 +27,7 @@ class PageAdminController extends AdminController { $pager = $query->paginate($page); - return $this->render('site/page_admin/index.html.twig', [ + return $this->render('@Core/site/page_admin/index.html.twig', [ 'pager' => $pager, ]); } @@ -82,7 +82,7 @@ class PageAdminController extends AdminController $this->addFlash('warning', 'Le formulaire est invalide.'); } - return $this->render('site/page_admin/edit.html.twig', [ + return $this->render('@Core/site/page_admin/edit.html.twig', [ 'form' => $form->createView(), 'entity' => $entity, ]); diff --git a/core/Controller/Site/SitemapController.php b/core/Controller/Site/SitemapController.php index 0556b88..ea1fe29 100644 --- a/core/Controller/Site/SitemapController.php +++ b/core/Controller/Site/SitemapController.php @@ -33,7 +33,7 @@ class SitemapController extends AbstractController $response = new Response(); $response->headers->set('Content-Type', 'text/xml'); - return $this->render('site/sitemap/sitemap.xml.twig', [ + return $this->render('@Core/site/sitemap/sitemap.xml.twig', [ 'items' => $items, ], $response); } diff --git a/core/Controller/Site/TreeAdminController.php b/core/Controller/Site/TreeAdminController.php index 6700592..3a5275d 100644 --- a/core/Controller/Site/TreeAdminController.php +++ b/core/Controller/Site/TreeAdminController.php @@ -52,7 +52,7 @@ class TreeAdminController extends AdminController $forms['menus'][$menu->getId()] = $this->createForm(MenuType::class, $menu)->createView(); } - return $this->render('site/tree_admin/navigation.html.twig', [ + return $this->render('@Core/site/tree_admin/navigation.html.twig', [ 'navigation' => $navigation, 'navigations' => $navigations, 'forms' => $forms, diff --git a/core/Controller/User/UserAdminController.php b/core/Controller/User/UserAdminController.php index b5cbb08..9f4f545 100644 --- a/core/Controller/User/UserAdminController.php +++ b/core/Controller/User/UserAdminController.php @@ -28,7 +28,7 @@ class UserAdminController extends AdminController { $pager = $query->paginate($page); - return $this->render('user/user_admin/index.html.twig', [ + return $this->render('@Core/user/user_admin/index.html.twig', [ 'pager' => $pager, ]); } @@ -59,7 +59,7 @@ class UserAdminController extends AdminController $this->addFlash('warning', 'Le formulaire est invalide.'); } - return $this->render('user/user_admin/new.html.twig', [ + return $this->render('@Core/user/user_admin/new.html.twig', [ 'form' => $form->createView(), 'entity' => $entity, ]); @@ -86,7 +86,7 @@ class UserAdminController extends AdminController $this->addFlash('warning', 'Le formulaire est invalide.'); } - return $this->render('user/user_admin/edit.html.twig', [ + return $this->render('@Core/user/user_admin/edit.html.twig', [ 'form' => $form->createView(), 'entity' => $entity, ]); @@ -97,7 +97,7 @@ class UserAdminController extends AdminController */ public function show(Entity $entity): Response { - return $this->render('user/user_admin/show.html.twig', [ + return $this->render('@Core/user/user_admin/show.html.twig', [ 'entity' => $entity, ]); } diff --git a/templates/account/admin/edit.html.twig b/core/Resources/views/account/admin/edit.html.twig similarity index 99% rename from templates/account/admin/edit.html.twig rename to core/Resources/views/account/admin/edit.html.twig index c259267..12df01b 100644 --- a/templates/account/admin/edit.html.twig +++ b/core/Resources/views/account/admin/edit.html.twig @@ -1,4 +1,4 @@ -{% extends 'admin/layout.html.twig' %} +{% extends '@Core/admin/layout.html.twig' %} {% import _self as macros %} diff --git a/core/Resources/views/admin/layout.html.twig b/core/Resources/views/admin/layout.html.twig new file mode 100644 index 0000000..7419c30 --- /dev/null +++ b/core/Resources/views/admin/layout.html.twig @@ -0,0 +1,57 @@ +{% apply spaceless %} + + +
+ {{ include('@Core/admin/module/metas.html.twig') }} + +