consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4539 from consul/system_emails_preview

Browse Source 
Fix custom system emails preview
This commit is contained in:
Javi Martín
2021-06-16 12:25:15 +02:00
committed by GitHub
parent c0c7ab5c07 47925fbab1
commit 7f38f61bc1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/admin.scss
View File

@@ -1216,7 +1216,7 @@ table {
// 11. Newsletters
// -----------------
.newsletter-body-content {
.admin .newsletter-body-content {
table,
tbody,

6
app/views/admin/newsletters/show.html.erb
View File

@@ -42,17 +42,17 @@
</div>
<div class="newsletter-body-content">
<%= render file: "app/views/layouts/_mailer_header.html.erb" %>
<%= render "layouts/mailer_header" %>
<table cellpadding="0" cellspacing="0" border="0" style="background: #fff; margin: 0 auto; max-width: 700px; width:100%;">
<tbody>
<tr>
<%= render file: "app/views/mailer/newsletter.html.erb" %>
<%= render template: "mailer/newsletter" %>
</tr>
</tbody>
</table>
<%= render file: "app/views/layouts/_mailer_footer.html.erb" %>
<%= render "layouts/mailer_footer" %>
</div>
<% if @newsletter.draft? && @newsletter.valid_segment_recipient? %>

6
app/views/admin/system_emails/view.html.erb
View File

@@ -21,16 +21,16 @@
<%= t("admin.newsletters.show.body_help_text") %>
</p>
<div class="newsletter-body-content">
<%= render file: "app/views/layouts/_mailer_header.html.erb" %>
<%= render "layouts/mailer_header" %>
<table cellpadding="0" cellspacing="0" border="0" style="background: #fff; margin: 0 auto; max-width: 700px; width:100%;">
<tbody>
<tr>
<%= render file: "app/views/mailer/#{@system_email}.html.erb" %>
<%= render template: "mailer/#{@system_email}" %>
</tr>
</tbody>
</table>
<%= render file: "app/views/layouts/_mailer_footer.html.erb" %>
<%= render "layouts/mailer_footer" %>
</div>
</div>