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/material/Resetting | |
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/material/Resetting')
4 files changed, 0 insertions, 63 deletions
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> | ||