From 0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 9 Mar 2016 08:59:08 +0100 Subject: Convert english translation file - convert english translation to translate key - remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material) - fix tests about text in response (now checking translation key instead of translated text) - remove all ugly `` --- .../Resources/translations/wallabag_user.en.yml | 16 +++++--- .../Resources/translations/wallabag_user.fr.yml | 16 +++++--- .../Resources/translations/wallabag_user.tr.yml | 16 +++++--- .../Resources/views/Authentication/form.html.twig | 33 ++++++++++++++++ .../changePassword_content.html.twig | 12 ++++++ .../views/Registration/checkEmail.html.twig | 11 ++++++ .../views/Registration/confirmed.html.twig | 17 ++++++++ .../views/Registration/register_content.html.twig | 45 +++++++++++++++++++++ .../Resources/views/Resetting/checkEmail.html.twig | 11 ++++++ .../Resetting/passwordAlreadyRequested.html.twig | 11 ++++++ .../views/Resetting/request_content.html.twig | 30 ++++++++++++++ .../views/Resetting/reset_content.html.twig | 15 +++++++ .../Resources/views/Security/login.html.twig | 46 ++++++++++++++++++++++ .../views/TwoFactor/email_auth_code.html.twig | 2 +- .../UserBundle/Resources/views/layout.html.twig | 23 +++++++++++ .../themes/baggy/Authentication/form.html.twig | 32 --------------- .../themes/baggy/Registration/register.html.twig | 20 ---------- .../baggy/Registration/register_content.html.twig | 37 ----------------- .../themes/baggy/Resetting/checkEmail.html.twig | 17 -------- .../views/themes/baggy/Resetting/request.html.twig | 20 ---------- .../baggy/Resetting/request_content.html.twig | 17 -------- .../views/themes/baggy/Security/login.html.twig | 33 ---------------- .../Resources/views/themes/baggy/layout.html.twig | 16 -------- .../themes/material/Authentication/form.html.twig | 33 ---------------- .../changePassword_content.html.twig | 12 ------ .../material/Registration/checkEmail.html.twig | 11 ------ .../material/Registration/confirmed.html.twig | 17 -------- .../Registration/register_content.html.twig | 45 --------------------- .../themes/material/Resetting/checkEmail.html.twig | 11 ------ .../Resetting/passwordAlreadyRequested.html.twig | 11 ------ .../material/Resetting/request_content.html.twig | 26 ------------ .../material/Resetting/reset_content.html.twig | 15 ------- .../views/themes/material/Security/login.html.twig | 46 ---------------------- .../views/themes/material/layout.html.twig | 23 ----------- 34 files changed, 285 insertions(+), 461 deletions(-) create mode 100644 src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/ChangePassword/changePassword_content.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Security/login.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/layout.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Authentication/form.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/checkEmail.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Authentication/form.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig delete 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_content.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig delete 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/login.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig (limited to 'src/Wallabag/UserBundle') diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml index 4da6075f..85f2ea9c 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml @@ -1,7 +1,11 @@ # Two factor mail -auth_code.mailer.subject: 'Wallabag authentication Code' -auth_code.mailer.body.hello: "Hi %user%," -auth_code.mailer.body.first_para: "Since you enable two factor authentication on your wallabag account and you just logged in from a new device (computer, phone, etc.), we send you a code to validate your connection." -auth_code.mailer.body.second_para: "Here is the code:" -auth_code.mailer.body.support: "Please don't hesitate to contact us if you have any problems:" -auth_code.mailer.body.signature: "The wallabag team" +auth_code: + on: 'on' + mailer: + subject: 'Wallabag authentication Code' + body: + hello: "Hi %user%," + first_para: "Since you enable two factor authentication on your wallabag account and you just logged in from a new device (computer, phone, etc.), we send you a code to validate your connection." + second_para: "Here is the code:" + support: "Please don't hesitate to contact us if you have any problems:" + signature: "The wallabag team" diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml index b4448d3a..30ab5dd9 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml @@ -1,7 +1,11 @@ # Two factor mail -auth_code.mailer.subject: "Code d'authentification wallabag" -auth_code.mailer.body.hello: "Bonjour %user%," -auth_code.mailer.body.first_para: "Comme vous avez activé la double authentification sur votre compte wallabag et que vous venez de vous connecter depuis un nouvel appareil (ordinateur, téléphone, etc.), nous vous envoyons un code pour valider votre connexion." -auth_code.mailer.body.second_para: "Voici le code à renseigner :" -auth_code.mailer.body.support: "Si vous avez un problème de connexion, n'hésitez pas à contacter le support :" -auth_code.mailer.body.signature: "L'équipe wallabag" +auth_code: + on: 'sur' + mailer: + subject: "Code d'authentification wallabag" + body: + hello: "Bonjour %user%," + first_para: "Comme vous avez activé la double authentification sur votre compte wallabag et que vous venez de vous connecter depuis un nouvel appareil (ordinateur, téléphone, etc.), nous vous envoyons un code pour valider votre connexion." + second_para: "Voici le code à renseigner :" + support: "Si vous avez un problème de connexion, n'hésitez pas à contacter le support :" + signature: "L'équipe wallabag" diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.tr.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.tr.yml index d1fcb0e0..70646355 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.tr.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.tr.yml @@ -1,7 +1,11 @@ # Two factor mail -auth_code.mailer.subject: 'Wallabag Doğrulama Kodu' -auth_code.mailer.body.hello: "Merhaba %user%," -auth_code.mailer.body.first_para: "wallabag hesabınızda iki adımlı doğrulamayı etkinleştirdiğinizde ve bu yeni cihaz olduğunda (bilgisayar, telefon, vs.), biz size bu işlemi doğrulamak için bir kod göndeririz." -auth_code.mailer.body.second_para: "Bu işlem için doğrulama kodunuz:" -auth_code.mailer.body.support: "Eğer herhangi bir soru/sorununuz varsa, bizimle iletişime geçmekten çekinmeyin:" -auth_code.mailer.body.signature: "wallabag ekibi" +auth_code: + on: 'on' + mailer: + subject: 'Wallabag Doğrulama Kodu' + body: + hello: "Merhaba %user%," + first_para: "wallabag hesabınızda iki adımlı doğrulamayı etkinleştirdiğinizde ve bu yeni cihaz olduğunda (bilgisayar, telefon, vs.), biz size bu işlemi doğrulamak için bir kod göndeririz." + second_para: "Bu işlem için doğrulama kodunuz:" + support: "Eğer herhangi bir soru/sorununuz varsa, bizimle iletişime geçmekten çekinmeyin:" + signature: "wallabag ekibi" diff --git a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig new file mode 100644 index 00000000..acf69196 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig @@ -0,0 +1,33 @@ +{% extends "WallabagUserBundle::layout.html.twig" %} + +{% block fos_user_content %} +
+
+
+ + {% for flashMessage in app.session.flashbag.get("two_factor") %} +

{{ flashMessage|trans }}

+ {% endfor %} + +
+ + +
+ + {% if useTrustedOption %} +
+ + +
+ {% endif %} +
+
+
+ {{ 'security.login.cancel'|trans }} + +
+
+{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/ChangePassword/changePassword_content.html.twig b/src/Wallabag/UserBundle/Resources/views/ChangePassword/changePassword_content.html.twig new file mode 100644 index 00000000..abb68421 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/ChangePassword/changePassword_content.html.twig @@ -0,0 +1,12 @@ +{% trans_default_domain 'FOSUserBundle' %} + +{{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }} +
+
+ {{ form_widget(form) }} +
+ +
+
+
+ diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig new file mode 100644 index 00000000..50937276 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/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/Registration/confirmed.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig new file mode 100644 index 00000000..674eb217 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/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 %} +
+
+ {{ 'security.register.go_to_account'|trans }} +
+
+{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig new file mode 100644 index 00000000..7d2b45d4 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig @@ -0,0 +1,45 @@ +{% trans_default_domain 'FOSUserBundle' %} + +{{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }} +
+
+ + {{ form_widget(form._token) }} + + {% for flashMessage in app.session.flashbag.get('notice') %} +

{{ flashMessage }}

 + {% endfor %} + +
+ {{ form_errors(form.email) }} + {{ form_label(form.email) }} + {{ form_widget(form.email) }} +
+ +
+ {{ form_errors(form.username) }} + {{ form_label(form.username) }} + {{ form_widget(form.username) }} +
+ +
+ {{ form_errors(form.plainPassword.first) }} + {{ form_label(form.plainPassword.first) }} + {{ form_widget(form.plainPassword.first) }} +
+ +
+ {{ form_errors(form.plainPassword.second) }} + {{ form_label(form.plainPassword.second) }} + {{ form_widget(form.plainPassword.second) }} +
+
+
+
+ {{ 'security.login.submit'|trans }} + +
+ diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig new file mode 100644 index 00000000..66cbdc28 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/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/Resetting/passwordAlreadyRequested.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig new file mode 100644 index 00000000..1e245372 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/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/Resetting/request_content.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig new file mode 100644 index 00000000..7a5ac838 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig @@ -0,0 +1,30 @@ +{% trans_default_domain 'FOSUserBundle' %} + +
+
+
+

{{ 'security.resetting.description'|trans({}, "messages") }}

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

{{ flashMessage }}

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

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

+ {% endif %} + +
+ + +
+
+
+
+ + {{ 'security.login.submit'|trans({}, "messages") }} + + +
+
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig new file mode 100644 index 00000000..9d0a061c --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig @@ -0,0 +1,15 @@ +{% trans_default_domain 'FOSUserBundle' %} + +{{ form_start(form, { 'action': path('fos_user_resetting_reset', {'token': token}), 'attr': { 'class': 'fos_user_resetting_reset' } }) }} +
+
+ {{ form_widget(form) }} +
+
+ +
+
+ diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig new file mode 100644 index 00000000..982a33b2 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig @@ -0,0 +1,46 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% block fos_user_content %} +
+
+ + {% if error %} + {{ error.message }} + {% endif %} + + {% for flashMessage in app.session.flashbag.get('notice') %} +

{{ flashMessage }}

 + {% endfor %} + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+
+ + {{ 'security.login.register'|trans }} + +
+
+ {{ 'security.login.forgot_password'|trans }} +
+
+{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig b/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig index 69d23160..c44fcfb7 100644 --- a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig @@ -77,7 +77,7 @@ logo

wallabag

-
{% trans %}on{% endtrans %} {{ wallabag_url }}
+
{{ "auth_code.on"|trans({}, 'wallabag_user') }} {{ wallabag_url }}
 
diff --git a/src/Wallabag/UserBundle/Resources/views/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/layout.html.twig new file mode 100644 index 00000000..1d0189ca --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/layout.html.twig @@ -0,0 +1,23 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'security.login.page_title'|trans }}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} +
+
+
+
wallabag logo
+ {% block fos_user_content %} + {% endblock fos_user_content %} +
+
+
+{% endblock %} + +{% block footer %} +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Authentication/form.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Authentication/form.html.twig deleted file mode 100644 index 5bb91081..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Authentication/form.html.twig +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "WallabagUserBundle::layout.html.twig" %} - -{% block fos_user_content %} -
-
- {% for flashMessage in app.session.flashbag.get("two_factor") %} -

{{ flashMessage|trans }}

- {% endfor %} - -
- - -
- - {% if useTrustedOption %} -
- - -
- {% endif %} - -
- {% trans %}Cancel{% endtrans %} - -
-
- -
-{% endblock %} 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 deleted file mode 100644 index 2713bf45..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% 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 %} - {{ form_start(form) }} -
-

{% 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 deleted file mode 100644 index 41f94006..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig +++ /dev/null @@ -1,37 +0,0 @@ -{% trans_default_domain 'FOSUserBundle' %} - -{{ form_widget(form._token) }} - -{% for flashMessage in app.session.flashbag.get('notice') %} -

{{ flashMessage }}

 -{% endfor %} - -
- {{ form_errors(form.email) }} - {{ form_label(form.email) }} - {{ form_widget(form.email) }} -
- -
- {{ form_errors(form.username) }} - {{ form_label(form.username) }} - {{ form_widget(form.username) }} -
- -
- {{ form_errors(form.plainPassword.first) }} - {{ form_label(form.plainPassword.first) }} - {{ form_widget(form.plainPassword.first) }} -
- -
- {{ form_errors(form.plainPassword.second) }} - {{ form_label(form.plainPassword.second) }} - {{ form_widget(form.plainPassword.second) }} -
- - -
- - {% trans %}Login{% endtrans %} -
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/checkEmail.html.twig deleted file mode 100644 index 056d65b5..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/checkEmail.html.twig +++ /dev/null @@ -1,17 +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/baggy/Resetting/request.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig deleted file mode 100644 index 10094e83..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% 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 deleted file mode 100644 index 1f8da8d7..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -{% 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/UserBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig deleted file mode 100644 index d52c3662..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "FOSUserBundle::layout.html.twig" %} - -{% block fos_user_content %} -
-
-

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

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

{{ flashMessage }}

- {% endfor %} - -
- - -
- -
- - -
- -
- - - {% trans %}Register{% endtrans %} - Forgot your password? -
-
-
-{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig deleted file mode 100644 index 60b321bf..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Welcome to wallabag!{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} -{% block messages %}{% endblock %} - -{% block content %} - {% block fos_user_content %} - {% endblock fos_user_content %} -{% endblock %} - -{% block footer %} -{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Authentication/form.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Authentication/form.html.twig deleted file mode 100644 index fa0e3dc1..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Authentication/form.html.twig +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "WallabagUserBundle::layout.html.twig" %} - -{% block fos_user_content %} -
-
-
- - {% for flashMessage in app.session.flashbag.get("two_factor") %} -

{{ flashMessage|trans }}

- {% endfor %} - -
- - -
- - {% if useTrustedOption %} -
- - -
- {% endif %} -
-
-
- {% trans %}Cancel{% endtrans %} - -
-
-{% endblock %} 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 deleted file mode 100644 index abb68421..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% trans_default_domain 'FOSUserBundle' %} - -{{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }} -
-
- {{ 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 deleted file mode 100644 index 50937276..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% 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 deleted file mode 100644 index c6d4d3d2..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/confirmed.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -{% 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_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig deleted file mode 100644 index e92b515e..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig +++ /dev/null @@ -1,45 +0,0 @@ -{% trans_default_domain 'FOSUserBundle' %} - -{{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }} -
-
- - {{ form_widget(form._token) }} - - {% for flashMessage in app.session.flashbag.get('notice') %} -

{{ flashMessage }}

 - {% endfor %} - -
- {{ form_errors(form.email) }} - {{ form_label(form.email) }} - {{ form_widget(form.email) }} -
- -
- {{ form_errors(form.username) }} - {{ form_label(form.username) }} - {{ form_widget(form.username) }} -
- -
- {{ form_errors(form.plainPassword.first) }} - {{ form_label(form.plainPassword.first) }} - {{ form_widget(form.plainPassword.first) }} -
- -
- {{ form_errors(form.plainPassword.second) }} - {{ form_label(form.plainPassword.second) }} - {{ form_widget(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 deleted file mode 100644 index 66cbdc28..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% 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 deleted file mode 100644 index 1e245372..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% 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 deleted file mode 100644 index e871d7be..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig +++ /dev/null @@ -1,26 +0,0 @@ -{% 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 deleted file mode 100644 index 9d0a061c..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -{% trans_default_domain 'FOSUserBundle' %} - -{{ form_start(form, { 'action': path('fos_user_resetting_reset', {'token': token}), 'attr': { 'class': 'fos_user_resetting_reset' } }) }} -
-
- {{ form_widget(form) }} -
-
- -
-
- 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 deleted file mode 100644 index 6bf99bf8..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig +++ /dev/null @@ -1,46 +0,0 @@ -{% extends "FOSUserBundle::layout.html.twig" %} - -{% block fos_user_content %} -
-
- - {% if error %} - {{ error.message }} - {% endif %} - - {% for flashMessage in app.session.flashbag.get('notice') %} -

{{ flashMessage }}

 - {% endfor %} - -
- -
- - -
- -
- - -
- -
- - -
- -
-
-
- - {% trans %}Register{% endtrans %} - -
-
- {% trans %}Forgot your password?{% endtrans %} -
-
-{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig deleted file mode 100644 index cbdc1da2..00000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Welcome to wallabag!{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} -{% block messages %}{% endblock %} - -{% block content %} -
-
-
-
wallabag logo
- {% block fos_user_content %} - {% endblock fos_user_content %} -
-
-
-{% endblock %} - -{% block footer %} -{% endblock %} -- cgit v1.2.3