diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-09 08:59:08 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-20 21:12:22 +0100 |
commit | 0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc (patch) | |
tree | 4cf8b97ed3c06def270e9172c7b17c5c86048585 /src/Wallabag/UserBundle/Resources/views/themes | |
parent | d2b4f01d7435e8a8f99b15a2487916427c04e58d (diff) | |
download | wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.gz wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.zst wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.zip |
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 `<div class="hidden">{{ form_rest(form) }}</div>`
Diffstat (limited to 'src/Wallabag/UserBundle/Resources/views/themes')
19 files changed, 0 insertions, 442 deletions
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 @@ | |||
1 | {% extends "WallabagUserBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block fos_user_content %} | ||
4 | <form class="form" action="" method="post"> | ||
5 | <fieldset class="w500p center"> | ||
6 | {% for flashMessage in app.session.flashbag.get("two_factor") %} | ||
7 | <p class="error">{{ flashMessage|trans }}</p> | ||
8 | {% endfor %} | ||
9 | |||
10 | <div class="row"> | ||
11 | <label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label> | ||
12 | <input id="_auth_code" type="text" autocomplete="off" name="_auth_code" /> | ||
13 | </div> | ||
14 | |||
15 | {% if useTrustedOption %} | ||
16 | <div class="row"> | ||
17 | <input id="_trusted" type="checkbox" name="_trusted" /> | ||
18 | <label for="_trusted">{{ "scheb_two_factor.trusted"|trans }}</label> | ||
19 | </div> | ||
20 | {% endif %} | ||
21 | |||
22 | <div class="row mts txtcenter"> | ||
23 | <a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {% trans %}Cancel{% endtrans %}</a> | ||
24 | <button type="submit" name="send"> | ||
25 | {{ "scheb_two_factor.login"|trans }} | ||
26 | <i class="mdi-content-send right"></i> | ||
27 | </button> | ||
28 | </div> | ||
29 | </fieldset> | ||
30 | |||
31 | </form> | ||
32 | {% 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 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}create an account{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | {% block messages %}{% endblock %} | ||
9 | |||
10 | {% block content %} | ||
11 | {{ form_start(form) }} | ||
12 | <fieldset class="w500p center"> | ||
13 | <h2 class="mbs txtcenter">{% trans %}create an account{% endtrans %}</h2> | ||
14 | {% include "FOSUserBundle:Registration:register_content.html.twig" %} | ||
15 | </fieldset> | ||
16 | </form> | ||
17 | {% endblock %} | ||
18 | |||
19 | {% block footer %} | ||
20 | {% 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 @@ | |||
1 | {% trans_default_domain 'FOSUserBundle' %} | ||
2 | |||
3 | {{ form_widget(form._token) }} | ||
4 | |||
5 | {% for flashMessage in app.session.flashbag.get('notice') %} | ||
6 | <span><p>{{ flashMessage }}</p></span> | ||
7 | {% endfor %} | ||
8 | |||
9 | <div class="row"> | ||
10 | {{ form_errors(form.email) }} | ||
11 | {{ form_label(form.email) }} | ||
12 | {{ form_widget(form.email) }} | ||
13 | </div> | ||
14 | |||
15 | <div class="row"> | ||
16 | {{ form_errors(form.username) }} | ||
17 | {{ form_label(form.username) }} | ||
18 | {{ form_widget(form.username) }} | ||
19 | </div> | ||
20 | |||
21 | <div class="row"> | ||
22 | {{ form_errors(form.plainPassword.first) }} | ||
23 | {{ form_label(form.plainPassword.first) }} | ||
24 | {{ form_widget(form.plainPassword.first) }} | ||
25 | </div> | ||
26 | |||
27 | <div class="row"> | ||
28 | {{ form_errors(form.plainPassword.second) }} | ||
29 | {{ form_label(form.plainPassword.second) }} | ||
30 | {{ form_widget(form.plainPassword.second) }} | ||
31 | </div> | ||
32 | |||
33 | |||
34 | <div class="row mts txtcenter"> | ||
35 | <button type="submit">{{ 'registration.submit'|trans({}, 'FOSUserBundle') }}</button> | ||
36 | <a href="{{ path('fos_user_security_login') }}" class="button">{% trans %}Login{% endtrans %}</a> | ||
37 | </div> | ||
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 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | |||
9 | {% block content %} | ||
10 | <form> | ||
11 | <fieldset class="w500p center"> | ||
12 | <h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2> | ||
13 | |||
14 | <p>{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}</p> | ||
15 | </fieldset> | ||
16 | </form> | ||
17 | {% 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 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | {% block messages %}{% endblock %} | ||
9 | |||
10 | {% block content %} | ||
11 | <form action="{{ path('fos_user_resetting_send_email') }}" method="post" name="forgotPasswordform"> | ||
12 | <fieldset class="w500p center"> | ||
13 | <h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2> | ||
14 | {% include "FOSUserBundle:Resetting:request_content.html.twig" %} | ||
15 | </fieldset> | ||
16 | </form> | ||
17 | {% endblock %} | ||
18 | |||
19 | {% block footer %} | ||
20 | {% 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 @@ | |||
1 | {% trans_default_domain 'FOSUserBundle' %} | ||
2 | |||
3 | {% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %} | ||
4 | |||
5 | {% if invalid_username is defined %} | ||
6 | <p>{{ 'resetting.request.invalid_username'|trans({'%username%': invalid_username}) }}</p> | ||
7 | {% endif %} | ||
8 | |||
9 | <div class="row"> | ||
10 | <label for="username">{{ 'resetting.request.username'|trans }}</label> | ||
11 | <input type="text" id="username" name="username" required="required" /> | ||
12 | </div> | ||
13 | |||
14 | <div class="row mts txtcenter"> | ||
15 | <button type="submit">{{ 'resetting.request.submit'|trans }}</button> | ||
16 | <a href="{{ path('fos_user_security_login') }}" class="button">{% trans %}Login{% endtrans %}</a> | ||
17 | </div> | ||
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 @@ | |||
1 | {% extends "FOSUserBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block fos_user_content %} | ||
4 | <form action="{{ path('fos_user_security_check') }}" method="post" name="loginform"> | ||
5 | <fieldset class="w500p center"> | ||
6 | <h2 class="mbs txtcenter">{% trans %}Login to wallabag{% endtrans %}</h2> | ||
7 | {% if error %} | ||
8 | <div>{{ error.message }}</div> | ||
9 | {% endif %} | ||
10 | |||
11 | {% for flashMessage in app.session.flashbag.get('notice') %} | ||
12 | <p>{{ flashMessage }}</p> | ||
13 | {% endfor %} | ||
14 | |||
15 | <div class="row"> | ||
16 | <label class="col w150p" for="username">{% trans %}Username{% endtrans %}</label> | ||
17 | <input type="text" id="username" name="_username" value="{{ last_username }}" /> | ||
18 | </div> | ||
19 | |||
20 | <div class="row"> | ||
21 | <label class="col w150p" for="password">{% trans %}Password{% endtrans %}</label> | ||
22 | <input type="password" id="password" name="_password" /> | ||
23 | </div> | ||
24 | |||
25 | <div class="row mts txtcenter"> | ||
26 | <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" /> | ||
27 | <button type="submit">Login</button> | ||
28 | <a href="{{ path('fos_user_registration_register') }}" class="button">{% trans %}Register{% endtrans %}</a> | ||
29 | <a href="{{ path('fos_user_resetting_request') }}" class="small">Forgot your password?</a> | ||
30 | </div> | ||
31 | </fieldset> | ||
32 | </form> | ||
33 | {% 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 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}Welcome to wallabag!{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | {% block messages %}{% endblock %} | ||
9 | |||
10 | {% block content %} | ||
11 | {% block fos_user_content %} | ||
12 | {% endblock fos_user_content %} | ||
13 | {% endblock %} | ||
14 | |||
15 | {% block footer %} | ||
16 | {% 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 @@ | |||
1 | {% extends "WallabagUserBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block fos_user_content %} | ||
4 | <form class="form" action="" method="post"> | ||
5 | <div class="card-content"> | ||
6 | <div class="row"> | ||
7 | |||
8 | {% for flashMessage in app.session.flashbag.get("two_factor") %} | ||
9 | <p class="error">{{ flashMessage|trans }}</p> | ||
10 | {% endfor %} | ||
11 | |||
12 | <div class="input-field col s12"> | ||
13 | <label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label> | ||
14 | <input id="_auth_code" type="text" autocomplete="off" name="_auth_code" /> | ||
15 | </div> | ||
16 | |||
17 | {% if useTrustedOption %} | ||
18 | <div class="input-field col s12"> | ||
19 | <input id="_trusted" type="checkbox" name="_trusted" /> | ||
20 | <label for="_trusted">{{ "scheb_two_factor.trusted"|trans }}</label> | ||
21 | </div> | ||
22 | {% endif %} | ||
23 | </div> | ||
24 | </div> | ||
25 | <div class="card-action center"> | ||
26 | <a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {% trans %}Cancel{% endtrans %}</a> | ||
27 | <button class="btn waves-effect waves-light" type="submit" name="send"> | ||
28 | {{ "scheb_two_factor.login"|trans }} | ||
29 | <i class="mdi-content-send right"></i> | ||
30 | </button> | ||
31 | </div> | ||
32 | </form> | ||
33 | {% 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 @@ | |||
1 | {% trans_default_domain 'FOSUserBundle' %} | ||
2 | |||
3 | {{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }} | ||
4 | <div class="card-content"> | ||
5 | <div class="row"> | ||
6 | {{ form_widget(form) }} | ||
7 | <div> | ||
8 | <input type="submit" value="{{ 'change_password.submit'|trans }}" /> | ||
9 | </div> | ||
10 | </div> | ||
11 | </div> | ||
12 | </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 @@ | |||
1 | {% extends "FOSUserBundle::layout.html.twig" %} | ||
2 | |||
3 | {% trans_default_domain 'FOSUserBundle' %} | ||
4 | |||
5 | {% block fos_user_content %} | ||
6 | <div class="card-content"> | ||
7 | <div class="row"> | ||
8 | <p>{{ 'registration.check_email'|trans({'%email%': user.email}) }}</p> | ||
9 | </div> | ||
10 | </div> | ||
11 | {% 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 @@ | |||
1 | {% extends "FOSUserBundle::layout.html.twig" %} | ||
2 | |||
3 | {% trans_default_domain 'FOSUserBundle' %} | ||
4 | |||
5 | {% block fos_user_content %} | ||
6 | <div class="card-content"> | ||
7 | <div class="row"> | ||
8 | <p>{{ 'registration.confirmed'|trans({'%username%': user.username}) }}</p> | ||
9 | {% if targetUrl %} | ||
10 | <p><a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a></p> | ||
11 | {% endif %} | ||
12 | </div> | ||
13 | <div class="card-action center"> | ||
14 | <a href="{{ path('homepage') }}" class="waves-effect waves-light btn"><i class="material-icons left"></i> {% trans %}Go to your account{% endtrans %}</a> | ||
15 | </div> | ||
16 | </div> | ||
17 | {% 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 @@ | |||
1 | {% trans_default_domain 'FOSUserBundle' %} | ||
2 | |||
3 | {{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }} | ||
4 | <div class="card-content"> | ||
5 | <div class="row"> | ||
6 | |||
7 | {{ form_widget(form._token) }} | ||
8 | |||
9 | {% for flashMessage in app.session.flashbag.get('notice') %} | ||
10 | <span class="black-text"><p>{{ flashMessage }}</p></span> | ||
11 | {% endfor %} | ||
12 | |||
13 | <div class="input-field col s12"> | ||
14 | {{ form_errors(form.email) }} | ||
15 | {{ form_label(form.email) }} | ||
16 | {{ form_widget(form.email) }} | ||
17 | </div> | ||
18 | |||
19 | <div class="input-field col s12"> | ||
20 | {{ form_errors(form.username) }} | ||
21 | {{ form_label(form.username) }} | ||
22 | {{ form_widget(form.username) }} | ||
23 | </div> | ||
24 | |||
25 | <div class="input-field col s12"> | ||
26 | {{ form_errors(form.plainPassword.first) }} | ||
27 | {{ form_label(form.plainPassword.first) }} | ||
28 | {{ form_widget(form.plainPassword.first) }} | ||
29 | </div> | ||
30 | |||
31 | <div class="input-field col s12"> | ||
32 | {{ form_errors(form.plainPassword.second) }} | ||
33 | {{ form_label(form.plainPassword.second) }} | ||
34 | {{ form_widget(form.plainPassword.second) }} | ||
35 | </div> | ||
36 | </div> | ||
37 | </div> | ||
38 | <div class="card-action center"> | ||
39 | <a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {% trans %}Login{% endtrans %}</a> | ||
40 | <button class="btn waves-effect waves-light" type="submit" name="send"> | ||
41 | {{ 'registration.submit'|trans({}, 'FOSUserBundle') }} | ||
42 | <i class="mdi-content-send right"></i> | ||
43 | </button> | ||
44 | </div> | ||
45 | </form> | ||
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 @@ | |||
1 | {% extends "FOSUserBundle::layout.html.twig" %} | ||
2 | |||
3 | {% trans_default_domain 'FOSUserBundle' %} | ||
4 | |||
5 | {% block fos_user_content %} | ||
6 | <div class="card-content"> | ||
7 | <div class="row"> | ||
8 | {{ 'resetting.check_email'|trans({'%email%': email}) }} | ||
9 | </div> | ||
10 | </div> | ||
11 | {% 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 @@ | |||
1 | {% extends "FOSUserBundle::layout.html.twig" %} | ||
2 | |||
3 | {% trans_default_domain 'FOSUserBundle' %} | ||
4 | |||
5 | {% block fos_user_content %} | ||
6 | <div class="card-content"> | ||
7 | <div class="row"> | ||
8 | {{ 'resetting.password_already_requested'|trans }} | ||
9 | </div> | ||
10 | </div> | ||
11 | {% 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 @@ | |||
1 | {% trans_default_domain 'FOSUserBundle' %} | ||
2 | <form action="{{ path('fos_user_resetting_send_email') }}" method="POST" class="fos_user_resetting_request"> | ||
3 | <div class="card-content"> | ||
4 | <div class="row"> | ||
5 | <p>{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}</p> | ||
6 | {% for flashMessage in app.session.flashbag.get('notice') %} | ||
7 | <span class="black-text"><p>{{ flashMessage }}</p></span> | ||
8 | {% endfor %} | ||
9 | |||
10 | {% if invalid_username is defined %} | ||
11 | <p>{{ 'resetting.request.invalid_username'|trans({'%username%': invalid_username}) }}</p> | ||
12 | {% endif %} | ||
13 | |||
14 | <div class="input-field col s12"> | ||
15 | <label for="username">{{ 'resetting.request.username'|trans }}</label> | ||
16 | <input type="text" id="username" name="username" required="required" /> | ||
17 | </div> | ||
18 | </div> | ||
19 | </div> | ||
20 | <div class="card-action center"> | ||
21 | <a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {% trans %}Login{% endtrans %}</a> | ||
22 | <button class="btn waves-effect waves-light" type="submit" name="send"> | ||
23 | {{ 'resetting.request.submit'|trans }} | ||
24 | </button> | ||
25 | </div> | ||
26 | </form> | ||
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 @@ | |||
1 | {% trans_default_domain 'FOSUserBundle' %} | ||
2 | |||
3 | {{ form_start(form, { 'action': path('fos_user_resetting_reset', {'token': token}), 'attr': { 'class': 'fos_user_resetting_reset' } }) }} | ||
4 | <div class="card-content"> | ||
5 | <div class="row"> | ||
6 | {{ form_widget(form) }} | ||
7 | </div> | ||
8 | <div class="card-action center"> | ||
9 | <button class="btn waves-effect waves-light" type="submit" name="send"> | ||
10 | {{ 'resetting.reset.submit'|trans }} | ||
11 | <i class="mdi-content-send right"></i> | ||
12 | </button> | ||
13 | </div> | ||
14 | </div> | ||
15 | </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 @@ | |||
1 | {% extends "FOSUserBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block fos_user_content %} | ||
4 | <form action="{{ path('fos_user_security_check') }}" method="post" name="loginform"> | ||
5 | <div class="card-content"> | ||
6 | |||
7 | {% if error %} | ||
8 | <span class="black-text">{{ error.message }}</span> | ||
9 | {% endif %} | ||
10 | |||
11 | {% for flashMessage in app.session.flashbag.get('notice') %} | ||
12 | <span class="black-text"><p>{{ flashMessage }}</p></span> | ||
13 | {% endfor %} | ||
14 | |||
15 | <div class="row"> | ||
16 | |||
17 | <div class="input-field col s12"> | ||
18 | <label for="username">{% trans %}Username{% endtrans %}</label> | ||
19 | <input type="text" id="username" name="_username" value="{{ last_username }}" /> | ||
20 | </div> | ||
21 | |||
22 | <div class="input-field col s12"> | ||
23 | <label for="password">{% trans %}Password{% endtrans %}</label> | ||
24 | <input type="password" id="password" name="_password" /> | ||
25 | </div> | ||
26 | |||
27 | <div class="input-field col s12"> | ||
28 | <input type="checkbox" id="remember_me" name="_remember_me" checked /> | ||
29 | <label for="remember_me">{% trans %}Keep me logged in{% endtrans %}</label> | ||
30 | </div> | ||
31 | |||
32 | </div> | ||
33 | </div> | ||
34 | <div class="card-action center"> | ||
35 | <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" /> | ||
36 | <a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {% trans %}Register{% endtrans %}</a> | ||
37 | <button class="btn waves-effect waves-light" type="submit" name="send"> | ||
38 | {% trans %}Login{% endtrans %} | ||
39 | <i class="mdi-content-send right"></i> | ||
40 | </button> | ||
41 | </div> | ||
42 | <div class="center"> | ||
43 | <a href="{{ path('fos_user_resetting_request') }}">{% trans %}Forgot your password?{% endtrans %}</a> | ||
44 | </div> | ||
45 | </form> | ||
46 | {% 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 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}Welcome to wallabag!{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | {% block messages %}{% endblock %} | ||
9 | |||
10 | {% block content %} | ||
11 | <main class="valign-wrapper"> | ||
12 | <div class="valign row"> | ||
13 | <div class="card sw"> | ||
14 | <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-other_themes.png') }}" alt="wallabag logo" /></div> | ||
15 | {% block fos_user_content %} | ||
16 | {% endblock fos_user_content %} | ||
17 | </div> | ||
18 | </div> | ||
19 | </main> | ||
20 | {% endblock %} | ||
21 | |||
22 | {% block footer %} | ||
23 | {% endblock %} | ||