pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update HTML 2FA template

Browse Source 
Split paragraph in translation
Inject wallabag_url for image in HTML template
Remove username & password from config_dev.yml (null are already the default value)
This commit is contained in:
Jeremy Benoist
2016-01-20 17:43:10 +01:00
parent 5f736213af
commit abd454c456
7 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig
View File

@ -2,6 +2,17 @@
{{ "auth_code.mailer.subject"|trans({}, 'wallabag_user') }}
{% endblock %}
{% block body_text %}
{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }}
{{ "auth_code.mailer.body.first_para"|trans({}, 'wallabag_user') }}
{{ "auth_code.mailer.body.second_para"|trans({}, 'wallabag_user') }} {{ code }}
{{ "auth_code.mailer.body.support"|trans({}, 'wallabag_user') }} {{ support_url }}
{{ "auth_code.mailer.body.signature"|trans({}, 'wallabag_user') }}
{% endblock %}
{% block body_html %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@ -63,10 +74,10 @@
<table cellpadding="0" cellspacing="0" border="0" align="center" id="card">
<tr>
<td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{ wallabag_url }/themes/material/img/logo-other_themes.png" alt="logo" title="{ wallabag_url }" style="width: 96px; height: 96px;" /></td>
<td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{{ wallabag_url }}/themes/material/img/logo-other_themes.png" alt="logo" title="{{ wallabag_url }}" style="width: 96px; height: 96px;" /></td>
<td style="padding: 20px; padding-left: 0;" valign="top" id="cell_desc">
<h1>Wallabag</h1>
<h5>{% trans %}on{% endtrans %} { wallabag_url }</h5>
<h1>wallabag</h1>
<h5>{% trans %}on{% endtrans %} {{ wallabag_url }}</h5>
</td>
</tr>
<tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;">&nbsp;</div></td></tr>
@ -75,10 +86,11 @@
<p><b>{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }}</b></p>
<p>{{ "auth_code.mailer.body.content"|trans({'%code%': code}, 'wallabag_user') }}</p>
<p>{{ "auth_code.mailer.body.signature"|trans({'%support%': support}, 'wallabag_user') }}</p>
<p>{{ "auth_code.mailer.body.first_para"|trans({}, 'wallabag_user') }}</p>
<p>{{ "auth_code.mailer.body.second_para"|trans({}, 'wallabag_user') }} <b>{{ code }}</b></p>
<p>{{ "auth_code.mailer.body.support"|trans({}, 'wallabag_user') }} <a href="{{ support_url }}">{{ support_url }}</a></p>
<p>{{ "auth_code.mailer.body.signature"|trans({}, 'wallabag_user') }}</p>
</td>
</tr>
<tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;">&nbsp;</div></td></tr>
@ -87,8 +99,8 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td valign="top" style="padding: 20px; text-align: center"><a href="{ wallabag_url }">{ wallabag_url }</a></td>
<td valign="top" style="padding: 20px; text-align: center">Powered by <a href="https://www.wallabag.org/">Wallabag</a></td>
<td valign="top" style="padding: 20px; text-align: center"><a href="{{ wallabag_url }}">{{ wallabag_url }}</a></td>
<td valign="top" style="padding: 20px; text-align: center">Powered by <a href="https://www.wallabag.org/">wallabag</a></td>
</tr>
</table>
@ -103,10 +115,3 @@
</body>
</html>
{% endblock %}
{% block body_text %}
{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }}
{{ "auth_code.mailer.body.content"|trans({'%code%': code}, 'wallabag_user') }}
{{ "auth_code.mailer.body.signature"|trans({'%support%': support}, 'wallabag_user') }}
{% endblock %}