diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index 3f795d9..0b0ddbe 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -1,5 +1,6 @@ twig: file_name_pattern: '*.twig' + form_themes: ['bootstrap_5_layout.html.twig'] when@test: twig: diff --git a/src/Controller/LoginController.php b/src/Controller/LoginController.php deleted file mode 100644 index ba8f478..0000000 --- a/src/Controller/LoginController.php +++ /dev/null @@ -1,27 +0,0 @@ -getLastAuthenticationError(); - - // last username entered by the user - $lastUsername = $authenticationUtils->getLastUsername(); - - return $this->render('login/index.html.twig', [ - 'last_username' => $lastUsername, - 'error' => $error, - ]); - - } -} diff --git a/templates/base.html.twig b/templates/base.html.twig index 233148c..3aac3b0 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -3,8 +3,9 @@ {% block title %}Welcome to Herbarium!{% endblock %} - + {% block stylesheets %} + {% endblock %} {% block javascripts %} @@ -12,6 +13,18 @@ {% endblock %} - {% block body %}{% endblock %} + +
+ {% block body %}{% endblock %} +
diff --git a/templates/login/index.html.twig b/templates/login/index.html.twig deleted file mode 100644 index 9bdb835..0000000 --- a/templates/login/index.html.twig +++ /dev/null @@ -1,22 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block title %}Hello LoginController!{% endblock %} - -{% block body %} - {% if error %} -
{{ error.messageKey|trans(error.messageData, 'security') }}
- {% endif %} - -
- - - - - - - {# If you want to control the URL the user is redirected to on success - #} - - -
-{% endblock %} diff --git a/templates/post/_delete_form.html.twig b/templates/post/_delete_form.html.twig index 1223c9b..a3d1403 100644 --- a/templates/post/_delete_form.html.twig +++ b/templates/post/_delete_form.html.twig @@ -1,4 +1,4 @@
- +
diff --git a/templates/registration/register.html.twig b/templates/registration/register.html.twig index 97f32c9..4bbc321 100644 --- a/templates/registration/register.html.twig +++ b/templates/registration/register.html.twig @@ -14,6 +14,6 @@ }) }} {{ form_row(registrationForm.agreeTerms) }} - + {{ form_end(registrationForm) }} {% endblock %} diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig index 916c1d3..d24cfff 100644 --- a/templates/security/login.html.twig +++ b/templates/security/login.html.twig @@ -15,10 +15,14 @@ {% endif %}

Please sign in

- - - - +
+ + +
+
+ + +
#} - + + Sign up + {% endblock %} diff --git a/templates/species/_delete_form.html.twig b/templates/species/_delete_form.html.twig index 9e7c05a..bc97a0a 100644 --- a/templates/species/_delete_form.html.twig +++ b/templates/species/_delete_form.html.twig @@ -1,4 +1,4 @@
- +