github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 15:32:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Name before username in summary email

Browse Source
This commit is contained in:
Neil Lalonde 2016-12-14 17:18:16 -05:00
parent d0ddceb4e4
commit 62ba5ea33f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,10 +143,10 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
</td> </td>
<td style="color:#0a0a0a;padding:0 16px 0 8px;text-align:left;"> <td style="color:#0a0a0a;padding:0 16px 0 8px;text-align:left;">
<% if t.user %> <% if t.user %>
<h6 style="color:inherit;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;word-wrap:normal;"><%= t.user.username -%></h6>
<% if SiteSetting.enable_names? && t.user.name.present? && t.user.name.downcase != t.user.username.downcase %> <% if SiteSetting.enable_names? && t.user.name.present? && t.user.name.downcase != t.user.username.downcase %>
<p style="color:#8f8f8f;line-height:1.3;margin:0 0 16px 0;padding:0;"><%= t.user.name -%></p> <h6 style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= t.user.name -%></h6>
<% end %> <% end %>
<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) -%>
@ -277,10 +277,10 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
</td> </td>
<td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;vertical-align:top;"> <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;vertical-align:top;">
<% if post.user %> <% if post.user %>
<h6 style="color:inherit;font-size:14px;font-weight:400;margin:0;padding:0;text-align:left;word-wrap:normal;"><%= post.user.username -%></h6>
<% if SiteSetting.enable_names? && post.user.name && post.user.name.downcase != post.user.username.downcase %> <% if SiteSetting.enable_names? && post.user.name && post.user.name.downcase != post.user.username.downcase %>
<p style="color:#8f8f8f;font-size:14px;line-height:1.3;margin:0;padding:0;text-align:left;"><%= post.user.name -%></p> <h6 style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= post.user.name -%></h6>
<% end %> <% end %>
<p style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= post.user.username -%></p>
<% end %> <% end %>
</td> </td>
<td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;text-align:right;"> <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;text-align:right;">