diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-12-01 13:35:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 13:35:55 +0100 |
| commit | 075e1d75e247d3edde366d3c460ee3b3a648541e (patch) | |
| tree | 644a3a7a135d9eb1ea181e402a238a8a8153e626 /src | |
| parent | 4bd42110c6c90bd02bca6edfc15913680e021091 (diff) | |
| parent | 68da51d2a39f5922a34090a0ec4ece295f85054d (diff) | |
| download | wallabag-075e1d75e247d3edde366d3c460ee3b3a648541e.tar.gz wallabag-075e1d75e247d3edde366d3c460ee3b3a648541e.tar.zst wallabag-075e1d75e247d3edde366d3c460ee3b3a648541e.zip | |
Merge pull request #2674 from wallabag/fix-404img-2FA
Fixed 404 for wallabag logo in 2FA
Diffstat (limited to 'src')
| -rw-r--r-- | src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml | 2 | ||||
| -rw-r--r-- | src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml index 85f2ea9c..ee0a27d5 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | auth_code: | 2 | auth_code: |
| 3 | on: 'on' | 3 | on: 'on' |
| 4 | mailer: | 4 | mailer: |
| 5 | subject: 'Wallabag authentication Code' | 5 | subject: 'wallabag authentication code' |
| 6 | body: | 6 | body: |
| 7 | hello: "Hi %user%," | 7 | hello: "Hi %user%," |
| 8 | 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." | 8 | 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." |
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 3731f13b..5d1f22b7 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 | |||
| @@ -74,7 +74,7 @@ | |||
| 74 | 74 | ||
| 75 | <table cellpadding="0" cellspacing="0" border="0" align="center" id="card"> | 75 | <table cellpadding="0" cellspacing="0" border="0" align="center" id="card"> |
| 76 | <tr> | 76 | <tr> |
| 77 | <td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{{ asset('bundles/wallabagcore/themes/material/img/logo-other_themes.png') }}" alt="logo" title="{{ wallabag_url }}" style="width: 96px; height: 96px;" /></td> | 77 | <td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{{ absolute_url(asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png')) }}" alt="logo" title="{{ wallabag_url }}" style="width: 96px; height: 96px;" /></td> |
| 78 | <td style="padding: 20px; padding-left: 0;" valign="top" id="cell_desc"> | 78 | <td style="padding: 20px; padding-left: 0;" valign="top" id="cell_desc"> |
| 79 | <h1>wallabag</h1> | 79 | <h1>wallabag</h1> |
| 80 | <h5>{{ "auth_code.on"|trans({}, 'wallabag_user') }} {{ wallabag_url }}</h5> | 80 | <h5>{{ "auth_code.on"|trans({}, 'wallabag_user') }} {{ wallabag_url }}</h5> |