IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: remove table wrapping posts in notification emails

Browse Source
This commit is contained in:
Leo McArdle 2017-05-15 21:24:33 +01:00 committed by Robin Ward
parent 6a3c20561a
commit 59922ce0a4
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/views/email/_post.html.erb
View File

@ -1,31 +1,23 @@
<table class='post-wrapper <%= post.whisper? ? "whisper" : "" %> <%= use_excerpt ? "excerpt" : ""%>'> <div class='post-wrapper <%= post.whisper? ? "whisper" : "" %> <%= use_excerpt ? "excerpt" : ""%>'>
<tbody> <table>
<tr> <tr>
<td class='user-avatar'>
<img src="<%= post.user.small_avatar_url %>" title="<%= post.user.username%>">
</td>
<td> <td>
<table> <%- if show_username_on_post(post) %>
<tr> <a class="username" href="<%=Discourse.base_url%>/u/<%= post.user.username_lower%>" target="_blank"><%= post.user.username %></a>
<td class='user-avatar'> <% end %>
<img src="<%= post.user.small_avatar_url %>" title="<%= post.user.username%>"> <%- if show_name_on_post(post) %>
</td> <a class="user-name" href="<%=Discourse.base_url%>/u/<%= post.user.username_lower%>" target="_blank"><%= post.user.name %></a>
<td> <% end %>
<%- if show_username_on_post(post) %> <%- if post.user.title.present? %>
<a class="username" href="<%=Discourse.base_url%>/u/<%= post.user.username_lower%>" target="_blank"><%= post.user.username %></a> <span class='user-title'><%= post.user.title %></span>
<% end %> <% end %>
<%- if show_name_on_post(post) %> <br>
<a class="user-name" href="<%=Discourse.base_url%>/u/<%= post.user.username_lower%>" target="_blank"><%= post.user.name %></a> <span class='notification-date'><%= l post.created_at, format: :short_no_year %></span>
<% end %>
<%- if post.user.title.present? %>
<span class='user-title'><%= post.user.title %></span>
<% end %>
<br>
<span class='notification-date'><%= l post.created_at, format: :short_no_year %></span>
</td>
</tr>
</table>
</td> </td>
</tr> </tr>
<tr> </table>
<td class='body'><%= format_for_email(post, use_excerpt) %></td> <div class='body'><%= format_for_email(post, use_excerpt) %></div>
</tr> </div>
</tbody>
</table>

4
lib/email/styles.rb
View File

@ -92,8 +92,8 @@ module Email
style('.user-avatar img', nil, width: '45', height: '45') style('.user-avatar img', nil, width: '45', height: '45')
style('hr', 'background-color: #ddd; height: 1px; border: 1px;') style('hr', 'background-color: #ddd; height: 1px; border: 1px;')
style('.rtl', 'direction: rtl;') style('.rtl', 'direction: rtl;')
style('td.body', 'padding-top:5px;', colspan: "2") style('div.body', 'padding-top:5px;')
style('.whisper td.body', 'font-style: italic; color: #9c9c9c;') style('.whisper div.body', 'font-style: italic; color: #9c9c9c;')
style('.lightbox-wrapper .meta', 'display: none') style('.lightbox-wrapper .meta', 'display: none')
correct_first_body_margin correct_first_body_margin
correct_footer_style correct_footer_style