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

FIX: Again, try to get a flexible absolute logo_url

Browse Source
This commit is contained in:
Robin Ward
2013-06-05 18:23:43 -04:00
parent 8328aa97fd
commit 4d1e8356b8
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/email/template.html.erb
View File

@@ -7,7 +7,7 @@
<tr> <tr>
<td> <td>
<a href="<%= Discourse.base_url %>"> <a href="<%= Discourse.base_url %>">
<%= image_tag(SiteSetting.logo_url, style: "height: 50px; margin-bottom: 15px; ") %> <img src="<%= logo_url %>" style="height: 50px; margin-bottom: 15px;"></a>
</td> </td>
</tr> </tr>
<tr> <tr>

8
lib/email_renderer.rb
View File

@@ -13,10 +13,16 @@ class EmailRenderer
def html def html
formatted_body = EmailStyles.new(PrettyText.cook(text, environment: 'email')).format formatted_body = EmailStyles.new(PrettyText.cook(text, environment: 'email')).format
logo_url = SiteSetting.logo_url
if logo_url !~ /http(s)?\:\/\//
logo_url = "#{Discourse.base_url}#{logo_url}"
end
ActionView::Base.new(Rails.configuration.paths["app/views"]).render( ActionView::Base.new(Rails.configuration.paths["app/views"]).render(
template: 'email/template', template: 'email/template',
format: :html, format: :html,
locals: { html_body: formatted_body } locals: { html_body: formatted_body,
logo_url: logo_url }
) )
end end