mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 06:49:14 +08:00
remove the notification_email_top customization
This commit is contained in:
parent
ad387a1150
commit
96e4d2b662
|
@ -233,14 +233,11 @@ class UserNotifications < ActionMailer::Base
|
|||
end
|
||||
end
|
||||
|
||||
top = SiteText.text_for(:notification_email_top)
|
||||
|
||||
html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
|
||||
template: 'email/notification',
|
||||
format: :html,
|
||||
locals: { context_posts: context_posts,
|
||||
post: post,
|
||||
top: top ? PrettyText.cook(top).html_safe : nil,
|
||||
classes: RTL.new(user).css_class
|
||||
}
|
||||
)
|
||||
|
|
|
@ -18,7 +18,6 @@ class SiteText < ActiveRecord::Base
|
|||
add_text_type :top, 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 :notification_email_top, allow_blank: true, format: :markdown
|
||||
|
||||
def site_text_type
|
||||
@site_text_type ||= SiteText.find_text_type(text_type)
|
||||
|
|
|
@ -1,10 +1,5 @@
|
|||
<div id='main' class=<%= classes %>>
|
||||
|
||||
<% if top.present? %>
|
||||
<div><%= top %></div>
|
||||
<hr>
|
||||
<% end %>
|
||||
|
||||
<%= render :partial => 'email/post', :locals => {:post => post} %>
|
||||
|
||||
<% if context_posts.present? %>
|
||||
|
|
|
@ -626,9 +626,6 @@ en:
|
|||
bottom:
|
||||
title: "Bottom of the pages"
|
||||
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:
|
||||
censored_words: "Words that will be automatically replaced with ■■■■"
|
||||
|
|
Loading…
Reference in New Issue
Block a user