diff --git a/src/AdminUi/templates/security/login.html.twig b/src/AdminUi/templates/security/login.html.twig index 03081e73..f811f75e 100644 --- a/src/AdminUi/templates/security/login.html.twig +++ b/src/AdminUi/templates/security/login.html.twig @@ -5,9 +5,5 @@ {% block body_class %}d-flex flex-column{% endblock %} {% block body %} -
-
- {% hook 'sylius_admin.security.login' with { form, last_error, last_username } %} -
-
+ {% hook 'sylius_admin.security.login' with { form, last_error, last_username } %} {% endblock %} diff --git a/src/BootstrapAdminUi/config/app/twig_hooks/security/login.php b/src/BootstrapAdminUi/config/app/twig_hooks/security/login.php index a9a157ce..855d56bc 100644 --- a/src/BootstrapAdminUi/config/app/twig_hooks/security/login.php +++ b/src/BootstrapAdminUi/config/app/twig_hooks/security/login.php @@ -17,6 +17,12 @@ $container->extension('sylius_twig_hooks', [ 'hooks' => [ 'sylius_admin.security.login' => [ + 'page' => [ + 'template' => '@SyliusBootstrapAdminUi/security/common/page.html.twig', + ], + ], + + 'sylius_admin.security.login.page' => [ 'logo' => [ 'template' => '@SyliusBootstrapAdminUi/security/common/logo.html.twig', ], @@ -25,13 +31,13 @@ ], ], - 'sylius_admin.security.login.logo' => [ + 'sylius_admin.security.login.page.logo' => [ 'image' => [ 'template' => '@SyliusBootstrapAdminUi/security/common/logo/image.html.twig', ], ], - 'sylius_admin.security.login.content' => [ + 'sylius_admin.security.login.page.content' => [ 'header' => [ 'template' => '@SyliusBootstrapAdminUi/security/common/content/header.html.twig', ], @@ -39,25 +45,25 @@ 'template' => '@SyliusBootstrapAdminUi/shared/crud/common/content/flashes.html.twig', ], 'form' => [ - 'template' => '@SyliusBootstrapAdminUi/security/login/content/form.html.twig', + 'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form.html.twig', ], ], - 'sylius_admin.security.login.content.form' => [ + 'sylius_admin.security.login.page.content.form' => [ 'error' => [ - 'template' => '@SyliusBootstrapAdminUi/security/login/content/form/error.html.twig', + 'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/error.html.twig', ], 'username' => [ - 'template' => '@SyliusBootstrapAdminUi/security/login/content/form/username.html.twig', + 'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/username.html.twig', ], 'password' => [ - 'template' => '@SyliusBootstrapAdminUi/security/login/content/form/password.html.twig', + 'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/password.html.twig', ], 'remember_me' => [ - 'template' => '@SyliusBootstrapAdminUi/security/login/content/form/remember_me.html.twig', + 'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/remember_me.html.twig', ], 'submit' => [ - 'template' => '@SyliusBootstrapAdminUi/security/login/content/form/submit.html.twig', + 'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/submit.html.twig', ], ], ], diff --git a/src/BootstrapAdminUi/templates/security/common/page.html.twig b/src/BootstrapAdminUi/templates/security/common/page.html.twig new file mode 100644 index 00000000..5f9e16b8 --- /dev/null +++ b/src/BootstrapAdminUi/templates/security/common/page.html.twig @@ -0,0 +1,5 @@ +
+
+ {% hook 'page' %} +
+
diff --git a/src/BootstrapAdminUi/templates/security/login/content/form.html.twig b/src/BootstrapAdminUi/templates/security/login/page/content/form.html.twig similarity index 100% rename from src/BootstrapAdminUi/templates/security/login/content/form.html.twig rename to src/BootstrapAdminUi/templates/security/login/page/content/form.html.twig diff --git a/src/BootstrapAdminUi/templates/security/login/content/form/error.html.twig b/src/BootstrapAdminUi/templates/security/login/page/content/form/error.html.twig similarity index 100% rename from src/BootstrapAdminUi/templates/security/login/content/form/error.html.twig rename to src/BootstrapAdminUi/templates/security/login/page/content/form/error.html.twig diff --git a/src/BootstrapAdminUi/templates/security/login/content/form/password.html.twig b/src/BootstrapAdminUi/templates/security/login/page/content/form/password.html.twig similarity index 100% rename from src/BootstrapAdminUi/templates/security/login/content/form/password.html.twig rename to src/BootstrapAdminUi/templates/security/login/page/content/form/password.html.twig diff --git a/src/BootstrapAdminUi/templates/security/login/content/form/remember_me.html.twig b/src/BootstrapAdminUi/templates/security/login/page/content/form/remember_me.html.twig similarity index 100% rename from src/BootstrapAdminUi/templates/security/login/content/form/remember_me.html.twig rename to src/BootstrapAdminUi/templates/security/login/page/content/form/remember_me.html.twig diff --git a/src/BootstrapAdminUi/templates/security/login/content/form/submit.html.twig b/src/BootstrapAdminUi/templates/security/login/page/content/form/submit.html.twig similarity index 100% rename from src/BootstrapAdminUi/templates/security/login/content/form/submit.html.twig rename to src/BootstrapAdminUi/templates/security/login/page/content/form/submit.html.twig diff --git a/src/BootstrapAdminUi/templates/security/login/content/form/username.html.twig b/src/BootstrapAdminUi/templates/security/login/page/content/form/username.html.twig similarity index 100% rename from src/BootstrapAdminUi/templates/security/login/content/form/username.html.twig rename to src/BootstrapAdminUi/templates/security/login/page/content/form/username.html.twig