Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove the notification_email_top customization

This commit is contained in:
Neil Lalonde 2014-10-06 17:00:20 -04:00
parent ad387a1150
commit 96e4d2b662
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/mailers/user_notifications.rb
View File

@ -233,14 +233,11 @@ class UserNotifications < ActionMailer::Base
end end
end end
top = SiteText.text_for(:notification_email_top)
html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render( html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
template: 'email/notification', template: 'email/notification',
format: :html, format: :html,
locals: { context_posts: context_posts, locals: { context_posts: context_posts,
post: post, post: post,
top: top ? PrettyText.cook(top).html_safe : nil,
classes: RTL.new(user).css_class classes: RTL.new(user).css_class
} }
) )

1
app/models/site_text.rb
View File

@ -18,7 +18,6 @@ class SiteText < ActiveRecord::Base
add_text_type :top, allow_blank: true, format: :html add_text_type :top, allow_blank: true, format: :html
add_text_type :bottom, allow_blank: true, format: :html add_text_type :bottom, allow_blank: true, format: :html
add_text_type :head, allow_blank: true, format: :html add_text_type :head, allow_blank: true, format: :html
add_text_type :notification_email_top, allow_blank: true, format: :markdown
def site_text_type def site_text_type
@site_text_type ||= SiteText.find_text_type(text_type) @site_text_type ||= SiteText.find_text_type(text_type)

5
app/views/email/notification.html.erb
View File

@ -1,10 +1,5 @@
<div id='main' class=<%= classes %>> <div id='main' class=<%= classes %>>
<% if top.present? %>
<div><%= top %></div>
<hr>
<% end %>
<%= render :partial => 'email/post', :locals => {:post => post} %> <%= render :partial => 'email/post', :locals => {:post => post} %>
<% if context_posts.present? %> <% if context_posts.present? %>

3
config/locales/server.en.yml
View File

@ -626,9 +626,6 @@ en:
bottom: bottom:
title: "Bottom of the pages" title: "Bottom of the pages"
description: "HTML that will be added at the bottom of every page." description: "HTML that will be added at the bottom of every page."
notification_email_top:
title: "Notification Email Top"
description: "A message that will be displayed at the top of all notification emails."
site_settings: site_settings:
censored_words: "Words that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;" censored_words: "Words that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;"