From ec3ce598f6423fcccd88a4fdd77f817c50bc5ab6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Oct 2015 22:16:18 +0200 Subject: [PATCH] material design for register/login/recover pages --- app/config/config.yml | 2 - .../CoreBundle/Command/InstallCommand.php | 5 +- .../CoreBundle/Form/Type/RegistrationType.php | 24 ----- .../CoreBundle/Resources/views/base.html.twig | 4 +- .../baggy/Security/forgotPassword.html.twig | 31 ------ .../themes/baggy/Security/reset.html.twig | 35 ------- .../views/themes/material/public/css/main.css | 5 + .../material/public/img/logo-other_themes.png | Bin 3922 -> 3058 bytes .../Controller/ResettingController.php | 75 ++++++++++++++ .../baggy/Registration/register.html.twig | 20 ++++ .../Registration/register_content.html.twig | 38 +++++++ .../baggy/Resetting}/checkEmail.html.twig | 0 .../themes/baggy/Resetting/request.html.twig | 20 ++++ .../baggy/Resetting/request_content.html.twig | 17 +++ .../themes/baggy/Security/login.html.twig | 4 +- .../changePassword_content.html.twig | 12 +++ .../Registration/checkEmail.html.twig | 11 ++ .../material/Registration/confirmed.html.twig | 17 +++ .../material/Registration/register.html.twig | 32 ------ .../Registration/register_content.html.twig | 40 +++++++- .../material/Resetting/checkEmail.html.twig | 11 ++ .../passwordAlreadyRequested.html.twig | 11 ++ .../Resetting/request_content.html.twig | 26 +++++ .../Resetting/reset_content.html.twig | 15 +++ .../material/Security/checkEmail.html.twig | 27 ----- .../Security/forgotPassword.html.twig | 59 ----------- .../themes/material/Security/login.html.twig | 97 +++++++----------- .../themes/material/Security/reset.html.twig | 57 ---------- .../views/themes/material/layout.html.twig | 26 +++++ 29 files changed, 384 insertions(+), 337 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Form/Type/RegistrationType.php delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig create mode 100644 src/Wallabag/UserBundle/Controller/ResettingController.php create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig rename src/Wallabag/{CoreBundle/Resources/views/themes/baggy/Security => UserBundle/Resources/views/themes/baggy/Resetting}/checkEmail.html.twig (100%) create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig rename src/Wallabag/{CoreBundle => UserBundle}/Resources/views/themes/baggy/Security/login.html.twig (88%) create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Registration/confirmed.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig diff --git a/app/config/config.yml b/app/config/config.yml index a4d18c6d..0d893ecf 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -160,8 +160,6 @@ fos_user: firewall_name: main user_class: Wallabag\UserBundle\Entity\User registration: - form: - type: wallabag_user_registration confirmation: enabled: true diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 140fdf9e..6ebbd93c 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -188,9 +188,10 @@ class InstallCommand extends ContainerAwareCommand $em = $this->getContainer()->get('doctrine.orm.entity_manager'); - $user = new User(); + $userManager = $this->getContainer()->get('fos_user.user_manager'); + $user = $userManager->createUser(); $user->setUsername($dialog->ask($this->defaultOutput, 'Username (default: wallabag) :', 'wallabag')); - $user->setPassword($dialog->ask($this->defaultOutput, 'Password (default: wallabag) :', 'wallabag')); + $user->setPlainPassword($dialog->ask($this->defaultOutput, 'Password (default: wallabag) :', 'wallabag')); $user->setEmail($dialog->ask($this->defaultOutput, 'Email:', '')); $user->setEnabled(true); diff --git a/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php b/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php deleted file mode 100644 index 47d4f341..00000000 --- a/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php +++ /dev/null @@ -1,24 +0,0 @@ -add('name'); - } - - public function getParent() - { - return 'fos_user_registration'; - } - - public function getName() - { - return 'wallabag_user_registration'; - } -} diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 152c5c28..c94c0044 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -45,7 +45,7 @@ {% endblock %} - {% block title %}{% endblock %} - wallabag + {% block title %}{% endblock %} {% endblock %} @@ -60,7 +60,7 @@ {% block messages %}{% endblock %} -
+
{% block content %}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig deleted file mode 100644 index 4476ea7b..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
-
-

{% trans %}Forgot password{% endtrans %}

- - {{ form_errors(form) }} - -

Enter your email address below and we'll send you password reset instructions.

- -
- {{ form_label(form.email) }} - {{ form_errors(form.email) }} - {{ form_widget(form.email) }} -
- -
- -
-
- - {{ form_rest(form) }} -
-{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig deleted file mode 100644 index fda88af2..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Change password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
-
-

{% trans %}Change password{% endtrans %}

- - {{ form_errors(form) }} - -
- {{ form_label(form.new_password.first) }} - {{ form_errors(form.new_password.first) }} - {{ form_widget(form.new_password.first) }} -
- -
- {{ form_label(form.new_password.second) }} - {{ form_errors(form.new_password.second) }} - {{ form_widget(form.new_password.second) }} -
- -
- -
-
- - {{ form_rest(form) }} -
-{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css index 7a4e7df2..eb33f042 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css @@ -250,9 +250,14 @@ main ul.row { } .card .card-action a { + color: #ffffff; margin: 0; } +.card .card-action a:hover { + color: #ffffff; +} + .settings .div_tabs { padding-bottom: 15px; } diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png index 32543a449079cba30d6b6d673f950a63fbcd06a1..c90aa46f857f029fc89b4080879451bf9d290f68 100755 GIT binary patch literal 3058 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 diff --git a/src/Wallabag/UserBundle/Controller/ResettingController.php b/src/Wallabag/UserBundle/Controller/ResettingController.php new file mode 100644 index 00000000..8aa1e230 --- /dev/null +++ b/src/Wallabag/UserBundle/Controller/ResettingController.php @@ -0,0 +1,75 @@ +get('fos_user.resetting.form.factory'); + /** @var $userManager \FOS\UserBundle\Model\UserManagerInterface */ + $userManager = $this->get('fos_user.user_manager'); + /** @var $dispatcher \Symfony\Component\EventDispatcher\EventDispatcherInterface */ + $dispatcher = $this->get('event_dispatcher'); + + $user = $userManager->findUserByConfirmationToken($token); + + if (null === $user) { + throw new NotFoundHttpException(sprintf('The user with "confirmation token" does not exist for value "%s"', $token)); + } + + $event = new GetResponseUserEvent($user, $request); + $dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_INITIALIZE, $event); + + if (null !== $event->getResponse()) { + return $event->getResponse(); + } + + $form = $formFactory->createForm(); + $form->setData($user); + + $form->handleRequest($request); + + if ($form->isValid()) { + $event = new FormEvent($form, $request); + $dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_SUCCESS, $event); + + $userManager->updateUser($user); + + if (null === $response = $event->getResponse()) { + $this->get('session')->getFlashBag()->add( + 'notice', + 'Password updated' + ); + $url = $this->generateUrl('homepage'); + $response = new RedirectResponse($url); + } + + $dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_COMPLETED, new FilterUserResponseEvent($user, $request, $response)); + + return $response; + } + + return $this->render('FOSUserBundle:Resetting:reset.html.twig', array( + 'token' => $token, + 'form' => $form->createView(), + )); + } +} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig new file mode 100644 index 00000000..e5c1876b --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig @@ -0,0 +1,20 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}create an account{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} +
+
+

{% trans %}create an account{% endtrans %}

+ {% include "FOSUserBundle:Registration:register_content.html.twig" %} +
+
+{% endblock %} + +{% block footer %} +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig new file mode 100644 index 00000000..f1f899d2 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig @@ -0,0 +1,38 @@ +{% trans_default_domain 'FOSUserBundle' %} + +{{ form_errors(form) }} +{{ form_widget(form._token) }} + +{% for flashMessage in app.session.flashbag.get('notice') %} +

{{ flashMessage }}

 +{% endfor %} + +
+ {{ form_errors(form.email) }} + + +
+ +
+ {{ form_errors(form.username) }} + + +
+ +
+ {{ form_errors(form.plainPassword.first) }} + + +
+ +
+ {{ form_errors(form.plainPassword.second) }} + + +
+ + +
+ + {% trans %}Login{% endtrans %} +
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/checkEmail.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig rename to src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/checkEmail.html.twig diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig new file mode 100644 index 00000000..10094e83 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig @@ -0,0 +1,20 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} +
+
+

{% trans %}Forgot password{% endtrans %}

+ {% include "FOSUserBundle:Resetting:request_content.html.twig" %} +
+
+{% endblock %} + +{% block footer %} +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig new file mode 100644 index 00000000..1f8da8d7 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig @@ -0,0 +1,17 @@ +{% trans_default_domain 'FOSUserBundle' %} + +{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %} + +{% if invalid_username is defined %} +

{{ 'resetting.request.invalid_username'|trans({'%username%': invalid_username}) }}

+{% endif %} + +
+ + +
+ +
+ + {% trans %}Login{% endtrans %} +
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig similarity index 88% rename from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig rename to src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig index 9a59dfc6..0e7bba0f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig @@ -8,7 +8,7 @@ {% block messages %}{% endblock %} {% block content %} -
+

{% trans %}Login to wallabag{% endtrans %}

{% if error %} @@ -33,7 +33,7 @@ {% trans %}Register{% endtrans %} - Forgot your password? + Forgot your password?
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig new file mode 100644 index 00000000..e7b7318b --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig @@ -0,0 +1,12 @@ +{% trans_default_domain 'FOSUserBundle' %} + +
+
+
+ {{ form_widget(form) }} +
+ +
+
+
+
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig new file mode 100644 index 00000000..50937276 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig @@ -0,0 +1,11 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
+
+

{{ 'registration.check_email'|trans({'%email%': user.email}) }}

+
+
+{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/confirmed.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/confirmed.html.twig new file mode 100644 index 00000000..c6d4d3d2 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/confirmed.html.twig @@ -0,0 +1,17 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
+
+

{{ 'registration.confirmed'|trans({'%username%': user.username}) }}

+ {% if targetUrl %} +

{{ 'registration.back'|trans }}

+ {% endif %} +
+
+ {% trans %}Go to your account{% endtrans %} +
+
+{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig deleted file mode 100644 index d765c851..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}create an account{% endtrans %}{% endblock %} - -{% block body_class %}register{% endblock %} - -{% block menu %}{% endblock %} -{% block messages %}{% endblock %} - -{% block content %} -
-
-
-
wallabag logo
- - {% include "FOSUserBundle:Registration:register_content.html.twig" %} - -
-
- {% trans %}Already have an account?{% endtrans %} -
-
-
- -{% endblock %} - -{% block footer %} -{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig index 26a91433..b356f58c 100644 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig @@ -2,12 +2,44 @@
- {{ form_widget(form) }} - +
+ + {{ form_errors(form) }} + {{ form_widget(form._token) }} + + {% for flashMessage in app.session.flashbag.get('notice') %} +

{{ flashMessage }}

 + {% endfor %} + +
+ {{ form_errors(form.email) }} + + +
+ +
+ {{ form_errors(form.username) }} + + +
+ +
+ {{ form_errors(form.plainPassword.first) }} + + +
+ +
+ {{ form_errors(form.plainPassword.second) }} + + +
+
-
+
+ {% trans %}Login{% endtrans %}
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig new file mode 100644 index 00000000..66cbdc28 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig @@ -0,0 +1,11 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
+
+ {{ 'resetting.check_email'|trans({'%email%': email}) }} +
+
+{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig new file mode 100644 index 00000000..0eec4301 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig @@ -0,0 +1,11 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
+
+ {{ 'resetting.password_already_requested'|trans }} +
+
+{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig new file mode 100644 index 00000000..e871d7be --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig @@ -0,0 +1,26 @@ +{% trans_default_domain 'FOSUserBundle' %} + +
+
+

{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}

+ {% for flashMessage in app.session.flashbag.get('notice') %} +

{{ flashMessage }}

 + {% endfor %} + + {% if invalid_username is defined %} +

{{ 'resetting.request.invalid_username'|trans({'%username%': invalid_username}) }}

+ {% endif %} + +
+ + +
+
+
+
+ {% trans %}Login{% endtrans %} + +
+ diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig new file mode 100644 index 00000000..f7e061dd --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig @@ -0,0 +1,15 @@ +{% trans_default_domain 'FOSUserBundle' %} + +
+
+
+ {{ form_widget(form) }} +
+
+ +
+
+
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig deleted file mode 100644 index 8f698e17..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
-
-

{% trans %}Forgot password{% endtrans %}

-
-
- -

{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}

- -
-
-
-
- -{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig deleted file mode 100644 index 9750f8ba..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig +++ /dev/null @@ -1,59 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
-
-

{% trans %}Forgot password{% endtrans %}

-
-
-
- -

{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}

 - - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} - - {% for flashMessage in app.session.flashbag.get('notice') %} -

{{ flashMessage }}

 - {% endfor %} - - {% if form_errors(form.email) %} - {{ form_errors(form.email) }} - {% endif %} - -
- {{ form_label(form.email) }} - {{ form_widget(form.email) }} -
- -
-
- -
- {{ form_rest(form) }} -
-
-
- {% trans %}Back to login{% endtrans %} -
-
-
- -{% endblock %} - -{% block footer %} -{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig index e9532037..6bf99bf8 100644 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig @@ -1,69 +1,46 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} +{% extends "FOSUserBundle::layout.html.twig" %} -{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %} +{% block fos_user_content %} +
+
-{% block body_class %}login{% endblock %} + {% if error %} + {{ error.message }} + {% endif %} -{% block menu %}{% endblock %} -{% block messages %}{% endblock %} + {% for flashMessage in app.session.flashbag.get('notice') %} +

{{ flashMessage }}

 + {% endfor %} -{% block content %} -
-
-
-
wallabag logo
- -
+
- {% if error %} - {{ error.message }} - {% endif %} - - {% for flashMessage in app.session.flashbag.get('notice') %} -

{{ flashMessage }}

 - {% endfor %} - -
- -
- - -
- -
- - -
- -
- - -
- -
+
+ + +
-
-
- - - {% trans %}Register{% endtrans %} -
- +
+ +
-
- {% trans %}Forgot your password?{% endtrans %} + +
+ +
-
-
- -{% endblock %} -{% block footer %} -{% endblock %} +
+
+
+ + {% trans %}Register{% endtrans %} + +
+
+ {% trans %}Forgot your password?{% endtrans %} +
+ +{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig deleted file mode 100644 index 09d0b634..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Change password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
-
-
-
-
- -

{% trans %}Change password{% endtrans %}

 - - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} - - {% if form_errors(form.new_password.first) %} - {{ form_errors(form.new_password.first) }} - {% endif %} - - {% if form_errors(form.new_password.second) %} - {{ form_errors(form.new_password.second) }} - {% endif %} - -
- {{ form_label(form.new_password.first) }} - {{ form_widget(form.new_password.first) }} -
- -
- {{ form_label(form.new_password.second) }} - {{ form_widget(form.new_password.second) }} -
- -
-
- -
- {{ form_rest(form) }} -
-
-
-
- -{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig new file mode 100644 index 00000000..0305ea45 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig @@ -0,0 +1,26 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}Welcome on wallabag!{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} +
+
+
+
wallabag logo
+ {% block fos_user_content %} + {% endblock fos_user_content %} +
+
+
+ +{% endblock %} + +{% block footer %} +{% endblock %} -- 2.41.0