Skip to content

Commit 23e660d

Browse files
OstafinLOstafinL
committed
Fixed email template
1 parent de7d0e4 commit 23e660d

File tree

4 files changed

+108
-102
lines changed

4 files changed

+108
-102
lines changed

‎src/bundle/Resources/views/themes/admin/ui/mail/base_mail_template.html.twig‎

Lines changed: 102 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,114 @@
1-
{%- block subject -%}{%- endblock subject -%}
21
{%- block from -%}{%- endblock from -%}
32

4-
{% block DOCTYPE %}
5-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
6-
{% endblock %}
3+
{%- block body -%}
4+
{% block template_DOCTYPE %}
5+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
6+
{% endblock %}
77

8-
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
9-
{%- block head -%}
10-
<head>
11-
<!--[if mso]>
12-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
13-
<![endif]-->
14-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
15-
<meta name="color-scheme" content="light dark">
16-
<meta name="supported-color-schemes" content="light dark">
17-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
18-
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans:wght@300&display=swap" rel="stylesheet">
19-
<title>{%- block head_title -%}Ibexa DXP{%- endblock head_title -%}</title>
20-
</head>
21-
{%- endblock head -%}
22-
{%- block body -%}
23-
<body style="margin: 0; padding: 0; background: #ffffff">
24-
<table
25-
align="center"
26-
border="0"
27-
cellpadding="0"
28-
cellspacing="0"
29-
role="presentation"
30-
width="585"
31-
style="border: 1px solid #e0e0e8;"
32-
>
33-
<tbody>
34-
{%- block mail_header -%}
35-
{% set content %}
36-
{%- block mail_header_content -%}
37-
{% if header_img_path is defined %}
38-
<img
39-
style="width: 585px; height: 100px;"
40-
src="{{ header_img_path }}"
41-
alt="{%- block mail_header_alt_text -%}Ibexa DXP{%- endblock mail_header_alt_text -%}"
42-
/>
43-
{% else %}
44-
<h2 style="display: tabel-cell; padding: 32px 48px; margin: 0;">
45-
{% block mail_header_alternative_img_content %}Ibexa DXP{% endblock mail_header_alternative_img_content %}
46-
</h2>
47-
{% endif %}
48-
{%- endblock mail_header_content -%}
49-
{% endset %}
8+
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
9+
{%- block template_head -%}
10+
<head>
11+
<!--[if mso]>
12+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
13+
<![endif]-->
14+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
15+
<meta name="color-scheme" content="light dark">
16+
<meta name="supported-color-schemes" content="light dark">
17+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
18+
<title>{%- block subject -%}{%- endblock subject -%}</title>
19+
</head>
20+
{%- endblock template_head -%}
21+
{%- block template_body -%}
22+
<body style="padding: 0; background-color: #ffffff; color: #131c26;">
23+
<table
24+
align="center"
25+
border="0"
26+
cellpadding="0"
27+
cellspacing="0"
28+
role="presentation"
29+
width="585"
30+
style="border: 1px solid #e0e0e8;"
31+
>
32+
<tbody>
33+
{%- block mail_header -%}
34+
{% set content %}
35+
{%- block mail_header_content -%}
36+
{% if header_img_path is defined %}
37+
<img
38+
style="width: 585px; height: 100px;"
39+
src="{{ header_img_path }}"
40+
alt="{%- block mail_header_alt_text -%}Ibexa DXP{%- endblock mail_header_alt_text -%}"
41+
/>
42+
{% else %}
43+
{% set content %}
44+
{% block mail_header_alternative_img_content %}Ibexa DXP{% endblock mail_header_alternative_img_content %}
45+
{% endset %}
5046

51-
{% include '@ibexadesign/ui/mail/components/row.html.twig' with {
52-
content,
53-
style: 'padding: 0;'
54-
} only %}
55-
{%- endblock mail_header -%}
47+
{% include '@ibexadesign/ui/mail/components/row.html.twig' with {
48+
content,
49+
style: 'padding: 32px 48px; font-size: 32px;'
50+
} only %}
51+
{% endif %}
52+
{%- endblock mail_header_content -%}
53+
{% endset %}
5654

57-
{%- block mail_message_title -%}
58-
{% set content %}
59-
{%- block mail_message_title_content -%}{%- endblock mail_message_title_content -%}
60-
{% endset %}
55+
{% include '@ibexadesign/ui/mail/components/row.html.twig' with {
56+
content,
57+
style: 'padding: 0;'
58+
} only %}
59+
{%- endblock mail_header -%}
6160

62-
{% include '@ibexadesign/ui/mail/components/row.html.twig' with {
63-
content,
64-
style: not header_img_path is defined ? 'padding-top: 16px;'
65-
} only %}
66-
{%- endblock mail_message_title -%}
61+
{%- block mail_message_title -%}
62+
{% set content %}
63+
{%- block mail_message_title_content -%}{%- endblock mail_message_title_content -%}
64+
{% endset %}
6765

68-
{%- block mail_message -%}
69-
{% set content %}
70-
{%- block mail_message_content -%}{%- endblock mail_message_content -%}
71-
{% endset %}
66+
{% include '@ibexadesign/ui/mail/components/row.html.twig' with {
67+
content,
68+
style: not header_img_path is defined ? 'padding-top: 16px;'
69+
} only %}
70+
{%- endblock mail_message_title -%}
7271

73-
{% include '@ibexadesign/ui/mail/components/row.html.twig' with {
74-
content,
75-
style: 'padding-bottom: 32px; line-height: 28px;'
76-
} only %}
77-
{%- endblock mail_message -%}
72+
{%- block mail_message -%}
73+
{% set content %}
74+
{%- block mail_message_content -%}{%- endblock mail_message_content -%}
75+
{% endset %}
7876

79-
{%- block mail_actions -%}
80-
{% set content %}
81-
{%- block mail_actions_content -%}{%- endblock mail_actions_content -%}
82-
{% endset %}
77+
{% include '@ibexadesign/ui/mail/components/row.html.twig' with {
78+
content,
79+
style: 'padding-bottom: 32px;'
80+
} only %}
81+
{%- endblock mail_message -%}
8382

84-
{% include '@ibexadesign/ui/mail/components/row.html.twig' with {
85-
content,
86-
style: 'padding-bottom: 48px;'
87-
} only %}
88-
{%- endblock mail_actions -%}
83+
{%- block mail_actions -%}
84+
{% set content %}
85+
{%- block mail_actions_content -%}{%- endblock mail_actions_content -%}
86+
{% endset %}
8987

90-
{%- block mail_footer -%}
91-
{% set line %}
92-
<table cellpadding="0" cellspacing="0" border="0" style="width: 100%; height: 1px; background: #e0e0e0;">
93-
<tr>
94-
<td></td>
95-
</tr>
96-
</table>
97-
{% endset %}
98-
{% set content %}
99-
{%- block mail_footer_content -%}{%- endblock mail_footer_content -%}
100-
{% endset %}
88+
{% include '@ibexadesign/ui/mail/components/row.html.twig' with {
89+
content,
90+
style: 'padding-bottom: 48px;'
91+
} only %}
92+
{%- endblock mail_actions -%}
10193

102-
{% include '@ibexadesign/ui/mail/components/row.html.twig' with { content: line } only %}
103-
{% include '@ibexadesign/ui/mail/components/row.html.twig' with { content } only %}
104-
{%- endblock mail_footer -%}
105-
</tbody>
106-
</table>
107-
</body>
108-
{%- endblock -%}
109-
</html>
94+
{%- block mail_footer -%}
95+
{% set line %}
96+
<table cellpadding="0" cellspacing="0" border="0" style="width: 100%; height: 1px; background-color: #e0e0e0;">
97+
<tr>
98+
<td></td>
99+
</tr>
100+
</table>
101+
{% endset %}
102+
{% set content %}
103+
{%- block mail_footer_content -%}{%- endblock mail_footer_content -%}
104+
{% endset %}
105+
106+
{% include '@ibexadesign/ui/mail/components/row.html.twig' with { content: line } only %}
107+
{% include '@ibexadesign/ui/mail/components/row.html.twig' with { content } only %}
108+
{%- endblock mail_footer -%}
109+
</tbody>
110+
</table>
111+
</body>
112+
{%- endblock template_body -%}
113+
</html>
114+
{%- endblock body -%}

‎src/bundle/Resources/views/themes/admin/ui/mail/components/action_btn.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
text-align: center;
99
text-decoration: none;
1010
vertical-align: middle;
11-
background: #AE1164;
11+
background-color: #ae1164;
1212
border-radius: 10px;'
1313
%}
1414

‎src/bundle/Resources/views/themes/admin/ui/mail/components/row.html.twig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
width: 585px;
44
padding: 0 48px 16px 48px;
55
font-family: \'Noto Sans\', sans-serif;
6-
font-size: 14px;'
6+
font-size: 14px;
7+
color: #131c26;'
78
%}
89

910
<tr>

‎src/bundle/Resources/views/themes/admin/user/invitation/mail.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
{{ 'ibexa.user.invitation.mail.message'|trans()|desc('Join us at:') }}
1515
{%- endblock mail_message_content -%}
1616

17-
{%- block mail_actions_conten -%}
18-
{% include '@ibexadesign/ui/mail/action_btn.html.twig' with {
17+
{%- block mail_actions_content -%}
18+
{% include '@ibexadesign/ui/mail/components/action_btn.html.twig' with {
1919
url: url('ibexa.user.from_invite.register', {
2020
'inviteHash': invite_hash,
2121
'siteaccess': siteaccess
2222
}),
2323
label: 'ibexa.user.invitation.mail.join'|trans()|desc('Join')
2424
} %}
25-
{%- endblock mail_actions_conten -%}
25+
{%- endblock mail_actions_content -%}
2626

2727
{%- block mail_footer -%}{%- endblock mail_footer -%}

0 commit comments

Comments
 (0)