github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-10 15:50:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: some blank topics and posts in summary email because they're images

Browse Source
This commit is contained in:
Neil Lalonde 2016-12-19 16:21:31 -05:00
parent 74956694e5
commit 3256620d5d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/user_notifications_helper.rb
View File

@ -48,9 +48,9 @@ module UserNotificationsHelper
doc.css('div').first doc.css('div').first
end end
def email_excerpt(html, posts_count=nil) def email_excerpt(html_arg, posts_count=nil)
# only include 1st paragraph when more than 1 posts # only include 1st paragraph when more than 1 posts
html = first_paragraph_from(html).to_s if posts_count.nil? || posts_count > 1 html = (posts_count.nil? || posts_count > 1) ? (first_paragraph_from(html_arg)||html_arg).to_s : html_arg
PrettyText.format_for_email(html).html_safe PrettyText.format_for_email(html).html_safe
end end

6
app/views/user_notifications/digest.html.erb
View File

@ -149,7 +149,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
<p style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= t.user.username -%></p> <p style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= t.user.username -%></p>
<% end %> <% end %>
</td> </td>
<%- if show_image_with_url(t.image_url) -%> <%- if show_image_with_url(t.image_url) && t.featured_link.nil? -%>
<td style="margin:0;padding:0 16px 0 8px;text-align:right;" align="right"> <td style="margin:0;padding:0 16px 0 8px;text-align:right;" align="right">
<img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-align:right;text-decoration:none;"> <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-align:right;text-decoration:none;">
</td> </td>
@ -162,7 +162,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
<table style="border-bottom:1px solid #f3f3f3;padding:0;text-align:left;vertical-align:top;width:100%"> <table style="border-bottom:1px solid #f3f3f3;padding:0;text-align:left;vertical-align:top;width:100%">
<tbody> <tbody>
<tr> <tr>
<td style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;text-align:left;width:100%;font-weight:normal;"> <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;text-align:left;width:100%;font-weight:normal;">
<%= email_excerpt(t.first_post.cooked) %> <%= email_excerpt(t.first_post.cooked) %>
</td> </td>
</tr> </tr>
@ -252,7 +252,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
<table style="width:100%;background:#fefefe;border-spacing:0;padding:0;text-align:left;vertical-align:top;"> <table style="width:100%;background:#fefefe;border-spacing:0;padding:0;text-align:left;vertical-align:top;">
<tbody> <tbody>
<tr> <tr>
<td style="color:#0a0a0a;font-size:14px;font-weight:200;padding:16px;text-align:left;width:100%;"> <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;font-weight:200;padding:16px;text-align:left;width:100%;">
<%= email_excerpt(post.cooked) %> <%= email_excerpt(post.cooked) %>
</td> </td>
</tr> </tr>

2
lib/email/styles.rb
View File

@ -152,6 +152,7 @@ module Email
end end
def format_html def format_html
# lowest priority first
style('.with-accent-colors', "background-color: #{SiteSetting.email_accent_bg_color}; color: #{SiteSetting.email_accent_fg_color};") style('.with-accent-colors', "background-color: #{SiteSetting.email_accent_bg_color}; color: #{SiteSetting.email_accent_fg_color};")
style('h4', 'color: #222;') style('h4', 'color: #222;')
style('h3', 'margin: 15px 0 20px 0;') style('h3', 'margin: 15px 0 20px 0;')
@ -161,6 +162,7 @@ module Email
style('li', 'padding-bottom: 10px') style('li', 'padding-bottom: 10px')
style('div.footer', 'color:#666; font-size:95%; text-align:center; padding-top:15px;') style('div.footer', 'color:#666; font-size:95%; text-align:center; padding-top:15px;')
style('span.post-count', 'margin: 0 5px; color: #777;') style('span.post-count', 'margin: 0 5px; color: #777;')
style('.post-excerpt img', "max-width: 50%; max-height: 400px;")
style('pre', 'word-wrap: break-word; max-width: 694px;') style('pre', 'word-wrap: break-word; max-width: 694px;')
style('code', 'background-color: #f1f1ff; padding: 2px 5px;') style('code', 'background-color: #f1f1ff; padding: 2px 5px;')
style('pre code', 'display: block; background-color: #f1f1ff; padding: 5px;') style('pre code', 'display: block; background-color: #f1f1ff; padding: 5px;')