diff --git a/src/Controller/RegistrationController.php b/src/Controller/RegistrationController.php index e6410636e992e254eae341243c741209ad1e4129..abd35e4d0d10fe269f21252802f479de1ebfc02b 100755 --- a/src/Controller/RegistrationController.php +++ b/src/Controller/RegistrationController.php @@ -100,7 +100,7 @@ class RegistrationController extends AbstractController $this->addCapsuleToConfirmedPreviousPendingEditor($user); $this->addFlash( - 'email_verified_success', + 'success', $translator->trans('registration.email_verified_success') ); diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php index a58c51a80a2cbf43725301164807baafaf8b95ef..7cb9a8c480ea3aac61f14b228574bb352c342642 100755 --- a/src/Controller/ResetPasswordController.php +++ b/src/Controller/ResetPasswordController.php @@ -86,7 +86,7 @@ class ResetPasswordController extends AbstractController throw new \Exception("User should be an instance of UserPasswordHasherInterface"); } } catch (ResetPasswordExceptionInterface $e) { - $this->addFlash('reset_password_error', sprintf( + $this->addFlash('error', sprintf( 'There was a problem validating your reset request - %s', $e->getReason() )); diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 89f7ecae410d7d489d8749a1800b67f471fa688b..62c65506711efd47477f2467fce3f9dec4a89b34 100755 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -133,7 +133,7 @@ class UserController extends AbstractController $this->entity_manager->flush(); $this->addFlash( - 'profile_updated_success', + 'success', $this->translator->trans('user.password.updated_success') ); diff --git a/templates/capsule/editors/list_editors.html.twig b/templates/capsule/editors/list_editors.html.twig index 0b71139fb3a355c7088c6e6ea959357c2dc45914..222c51508795c875659edc43f763148d7bfb799b 100644 --- a/templates/capsule/editors/list_editors.html.twig +++ b/templates/capsule/editors/list_editors.html.twig @@ -18,13 +18,13 @@ </div> {% for flashWarning in app.flashes('warning') %} - <div class="text-center alert alert-warning col-11 col-md-10 col-lg-9 col-xl-8 mx-auto my-5 mt-2" role="alert"> + <div class="text-center alert alert-warning col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashWarning }} </div> {% endfor %} {% for flashSuccess in app.flashes('success') %} - <div class="text-center alert alert-success col-11 col-md-10 col-lg-9 col-xl-8 mx-auto my-5 mt-2" role="alert"> + <div class="text-center alert alert-success col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashSuccess }} </div> {% endfor %} diff --git a/templates/capsule/groups/capsule_groups.html.twig b/templates/capsule/groups/capsule_groups.html.twig index ad38080a086ba9178f00752cbd144c58053aef3c..02c0a8260f959c8201e88761ec9dbb3057e042ff 100644 --- a/templates/capsule/groups/capsule_groups.html.twig +++ b/templates/capsule/groups/capsule_groups.html.twig @@ -18,13 +18,13 @@ </div> {% for flashWarning in app.flashes('warning') %} - <div class="text-center alert alert-warning col-11 col-md-10 col-lg-9 col-xl-8 mx-auto my-5 mt-2" role="alert"> + <div class="text-center alert alert-warning col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashWarning }} </div> {% endfor %} {% for flashSuccess in app.flashes('success') %} - <div class="text-center alert alert-success col-11 col-md-10 col-lg-9 col-xl-8 mx-auto my-5 mt-2" role="alert"> + <div class="text-center alert alert-success col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashSuccess }} </div> {% endfor %} diff --git a/templates/capsule/groups/user_groups.html.twig b/templates/capsule/groups/user_groups.html.twig index 808b416dd7f22040826f594ff249afb6cb725fb6..d2096e4367a35d29c87b6570c0b620678b32c8dc 100644 --- a/templates/capsule/groups/user_groups.html.twig +++ b/templates/capsule/groups/user_groups.html.twig @@ -17,13 +17,13 @@ </div> {% for flashWarning in app.flashes('warning') %} - <div class="text-center alert alert-warning col-11 col-md-10 col-lg-9 col-xl-8 mx-auto my-5 mt-2" role="alert"> + <div class="text-center alert alert-warning col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashWarning }} </div> {% endfor %} {% for flashSuccess in app.flashes('success') %} - <div class="text-center alert alert-success col-11 col-md-10 col-lg-9 col-xl-8 mx-auto my-5 mt-2" role="alert"> + <div class="text-center alert alert-success col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashSuccess }} </div> {% endfor %} diff --git a/templates/capsule/index.html.twig b/templates/capsule/index.html.twig index 59b64dbb425eb630fd4ab7dc3bcc59b88974d6ff..1a9c22616b13481b6841b679cdad859068a6fdf0 100644 --- a/templates/capsule/index.html.twig +++ b/templates/capsule/index.html.twig @@ -34,13 +34,13 @@ </div> {% for flashWarning in app.flashes('warning') %} - <div class="text-center alert alert-warning col-11 col-md-10 col-lg-9 col-xl-8 mx-auto my-5" role="alert"> + <div class="text-center alert alert-warning col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashWarning }} </div> {% endfor %} {% for flashSuccess in app.flashes('success') %} - <div class="text-center alert alert-success col-11 col-md-10 col-lg-9 col-xl-8 mx-auto my-5" role="alert"> + <div class="text-center alert alert-success col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashSuccess }} </div> {% endfor %} diff --git a/templates/registration/register.html.twig b/templates/registration/register.html.twig index 99d5864530a878b05bb61cf9f2bcee6d7bbfa18e..de27d29064450994700f59f0257b3f5ffebb0aeb 100644 --- a/templates/registration/register.html.twig +++ b/templates/registration/register.html.twig @@ -7,7 +7,7 @@ {% block body %} <div class="mt-4"> {% for flashError in app.flashes('error') %} - <div class="alert alert-danger col-11 col-md-10 col-lg-9 col-xl-8 mx-auto my-5 h1" role="alert"> + <div class="alert alert-danger col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5 h1" role="alert"> {{ flashError }} </div> {% endfor %} diff --git a/templates/reset_password/request.html.twig b/templates/reset_password/request.html.twig index 5cc417ed4effa88f1af6b0f904f400040a83fcc7..6caf46d5ce8e60fbf35d2cf9e2ab0449d6ebf5a7 100644 --- a/templates/reset_password/request.html.twig +++ b/templates/reset_password/request.html.twig @@ -5,8 +5,10 @@ {% endblock %} {% block body %} - {% for flashError in app.flashes('reset_password_error') %} - <div class="alert alert-danger" role="alert">{{ flashError }}</div> + {% for flashError in app.flashes('error') %} + <div class="text-center alert alert-danger col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> + {{ flashError }} + </div> {% endfor %} <h1 class="m-auto mb-4 mt-4 col-6"> {{ 'reset_password.title'|trans }} diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig index aff2910422d3ff81631e8d00161287fd617f286e..a4495117a08d82e3926a92e5390848dd6eb4c0c2 100644 --- a/templates/security/login.html.twig +++ b/templates/security/login.html.twig @@ -8,8 +8,10 @@ {% if error %} <div class="alert alert-danger col-6 m-auto">{{ error.messageKey|trans(error.messageData, 'security') }}</div> {% endif %} - {% for flashMessage in app.flashes('email_verified_success') %} - <div class="text-center alert alert-warning col-6 m-auto" role="alert" >{{ flashMessage }}</div> + {% for flashMessage in app.flashes('error') %} + <div class="text-center alert alert-warning col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert" > + {{ flashMessage }} + </div> {% endfor %} <form method="post" class="d-flex flex-column justify-content-center"> diff --git a/templates/user/profile.html.twig b/templates/user/profile.html.twig index d6e80801ccecf76763cd89894490417248212004..1aff1e193cb5f455093ea8cfc8b9d2bb3e1e4e34 100644 --- a/templates/user/profile.html.twig +++ b/templates/user/profile.html.twig @@ -14,13 +14,13 @@ </div> {% for flashSuccess in app.flashes('success') %} - <div class="text-center alert alert-success col-11 col-md-10 col-lg-9 col-xl-8 mx-auto mt-0 mb-4" role="alert"> + <div class="text-center alert alert-success col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashSuccess }} </div> {% endfor %} {% for flashWarning in app.flashes('warning') %} - <div class="text-center alert alert-warning col-11 col-md-10 col-lg-9 col-xl-8 mx-auto mt-0 mb-4" role="alert"> + <div class="text-center alert alert-warning col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert"> {{ flashWarning }} </div> {% endfor %}