1 files changed, 20 insertions, 15 deletions
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 849cd136..69d23160 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
@@ -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>
+                            <h1>wallabag</h1>
-                            <h5>{% trans %}on{% endtrans %} { wallabag_url }</h5>
+                            <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.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.signature"|trans({'%support%': support}, 'wallabag_user') }}</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"><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">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 %}

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 849cd136..69d23160 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
@@ -2,6 +2,17 @@
2	{{ "auth_code.mailer.subject"\|trans({}, 'wallabag_user') }}	2	{{ "auth_code.mailer.subject"\|trans({}, 'wallabag_user') }}
3	{% endblock %}	3	{% endblock %}
4		4
		5	{% block body_text %}
		6	{{ "auth_code.mailer.body.hello"\|trans({'%user%': user}, 'wallabag_user') }}
		7
		8	{{ "auth_code.mailer.body.first_para"\|trans({}, 'wallabag_user') }}
		9	{{ "auth_code.mailer.body.second_para"\|trans({}, 'wallabag_user') }} {{ code }}
		10
		11	{{ "auth_code.mailer.body.support"\|trans({}, 'wallabag_user') }} {{ support_url }}
		12
		13	{{ "auth_code.mailer.body.signature"\|trans({}, 'wallabag_user') }}
		14	{% endblock %}
		15
5	{% block body_html %}	16	{% block body_html %}
6	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">	17	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
7		18
@@ -63,10 +74,10 @@
63		74
64	<table cellpadding="0" cellspacing="0" border="0" align="center" id="card">	75	<table cellpadding="0" cellspacing="0" border="0" align="center" id="card">
65	<tr>	76	<tr>
66	<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>	77	<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>
67	<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">
68	<h1>Wallabag</h1>	79	<h1>wallabag</h1>
69	<h5>{% trans %}on{% endtrans %} { wallabag_url }</h5>	80	<h5>{% trans %}on{% endtrans %} {{ wallabag_url }}</h5>
70	</td>	81	</td>
71	</tr>	82	</tr>
72	<tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;"> </div></td></tr>	83	<tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;"> </div></td></tr>
@@ -75,10 +86,11 @@
75		86
76	<p><b>{{ "auth_code.mailer.body.hello"\|trans({'%user%': user}, 'wallabag_user') }}</b></p>	87	<p><b>{{ "auth_code.mailer.body.hello"\|trans({'%user%': user}, 'wallabag_user') }}</b></p>
77		88
78	<p>{{ "auth_code.mailer.body.content"\|trans({'%code%': code}, 'wallabag_user') }}</p>	89	<p>{{ "auth_code.mailer.body.first_para"\|trans({}, 'wallabag_user') }}</p>
79		90	<p>{{ "auth_code.mailer.body.second_para"\|trans({}, 'wallabag_user') }} <b>{{ code }}</b></p>
80	<p>{{ "auth_code.mailer.body.signature"\|trans({'%support%': support}, 'wallabag_user') }}</p>
81		91
		92	<p>{{ "auth_code.mailer.body.support"\|trans({}, 'wallabag_user') }} <a href="{{ support_url }}">{{ support_url }}</a></p>
		93	<p>{{ "auth_code.mailer.body.signature"\|trans({}, 'wallabag_user') }}</p>
82	</td>	94	</td>
83	</tr>	95	</tr>
84	<tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;"> </div></td></tr>	96	<tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;"> </div></td></tr>
@@ -87,8 +99,8 @@
87		99
88	<table cellpadding="0" cellspacing="0" border="0" width="100%">	100	<table cellpadding="0" cellspacing="0" border="0" width="100%">
89	<tr>	101	<tr>
90	<td valign="top" style="padding: 20px; text-align: center"><a href="{ wallabag_url }">{ wallabag_url }</a></td>	102	<td valign="top" style="padding: 20px; text-align: center"><a href="{{ wallabag_url }}">{{ wallabag_url }}</a></td>
91	<td valign="top" style="padding: 20px; text-align: center">Powered by <a href="https://www.wallabag.org/">Wallabag</a></td>	103	<td valign="top" style="padding: 20px; text-align: center">Powered by <a href="https://www.wallabag.org/">wallabag</a></td>
92	</tr>	104	</tr>
93	</table>	105	</table>
94		106
@@ -103,10 +115,3 @@
103	</body>	115	</body>
104	</html>	116	</html>
105	{% endblock %}	117	{% endblock %}
106
107	{% block body_text %}
108	{{ "auth_code.mailer.body.hello"\|trans({'%user%': user}, 'wallabag_user') }}
109
110	{{ "auth_code.mailer.body.content"\|trans({'%code%': code}, 'wallabag_user') }}
111	{{ "auth_code.mailer.body.signature"\|trans({'%support%': support}, 'wallabag_user') }}
112	{% endblock %}