diff --git a/app/views/admin/newsletters/show.html.erb b/app/views/admin/newsletters/show.html.erb index 55cc6aabe..1a3e3c96b 100644 --- a/app/views/admin/newsletters/show.html.erb +++ b/app/views/admin/newsletters/show.html.erb @@ -38,7 +38,17 @@ <%= t("admin.newsletters.show.body_help_text") %>

- <%= render file: "app/views/mailer/newsletter.html.erb", layout: '/app/views/layouts/mailer.html.erb' %> + <%= render file: "app/views/layouts/_mailer_header.html.erb" %> + + + + + <%= render file: "app/views/mailer/newsletter.html.erb" %> + + +
+ + <%= render file: "app/views/layouts/_mailer_footer.html.erb" %>
diff --git a/app/views/layouts/_mailer_footer.html.erb b/app/views/layouts/_mailer_footer.html.erb new file mode 100644 index 000000000..b2a3ea388 --- /dev/null +++ b/app/views/layouts/_mailer_footer.html.erb @@ -0,0 +1,13 @@ + + + + + + +
+

+ <%= setting['org_name'] %>

+ +

+ <%= t('mailers.no_reply') %>

+
diff --git a/app/views/layouts/_mailer_header.html.erb b/app/views/layouts/_mailer_header.html.erb new file mode 100644 index 000000000..29fc798df --- /dev/null +++ b/app/views/layouts/_mailer_header.html.erb @@ -0,0 +1,15 @@ + + + + +
+ + + + +
+ + <%= image_tag('logo_email.png', style: "border: 0; display: block; width: 100%;max-width: 370px", alt: setting['org_name']) %> + +
+
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index f90b8e39d..9431845dd 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -7,38 +7,16 @@ + <%= render "layouts/mailer_header" %> + - - - - - <%= yield %> - -
- - - - -
- - <%= image_tag('logo_email.png', style: "border: 0; display: block; width: 100%;max-width: 370px", alt: setting['org_name']) %> - -
-
- - - - - + + <%= yield %> +
-

- <%= setting['org_name'] %>

- -

- <%= t('mailers.no_reply') %>

- -
+ + <%= render "layouts/mailer_footer" %>