diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
commit | 64a8781e453c40ff144d03405abe2dc1ccfacbe0 (patch) | |
tree | 311473a357e3dedd496e1417293eed9a2a116ad6 /src/Wallabag/UserBundle/Resources | |
parent | 9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5 (diff) | |
parent | c64b4941d5222586a82d2c8d6a61969bb9cfe96b (diff) | |
download | wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.gz wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.zst wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.zip |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'src/Wallabag/UserBundle/Resources')
-rw-r--r-- | src/Wallabag/UserBundle/Resources/views/Security/login.html.twig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig index 938f1a31..fc0d97e7 100644 --- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig | |||
@@ -5,11 +5,11 @@ | |||
5 | <div class="card-content"> | 5 | <div class="card-content"> |
6 | 6 | ||
7 | {% if error %} | 7 | {% if error %} |
8 | <span class="black-text">{{ error.message }}</span> | 8 | <script>Materialize.toast('{{ error.message }}', 4000)</script> |
9 | {% endif %} | 9 | {% endif %} |
10 | 10 | ||
11 | {% for flashMessage in app.session.flashbag.get('notice') %} | 11 | {% for flashMessage in app.session.flashbag.get('notice') %} |
12 | <span class="black-text"><p>{{ flashMessage }}</p></span> | 12 | <script>Materialize.toast('{{ flashMessage }}')</script> |
13 | {% endfor %} | 13 | {% endfor %} |
14 | 14 | ||
15 | <div class="row"> | 15 | <div class="row"> |
@@ -41,7 +41,7 @@ | |||
41 | <i class="material-icons right">send</i> | 41 | <i class="material-icons right">send</i> |
42 | </button> | 42 | </button> |
43 | </div> | 43 | </div> |
44 | <div class="row center"> | 44 | <div class="card-action center"> |
45 | <a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a> | 45 | <a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a> |
46 | </div> | 46 | </div> |
47 | </form> | 47 | </form> |