From 96e4d2b662f47cb760337af88d19c0c045b25ab2 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 6 Oct 2014 17:00:20 -0400
Subject: [PATCH] remove the notification_email_top customization

---
 app/mailers/user_notifications.rb     | 3 ---
 app/models/site_text.rb               | 1 -
 app/views/email/notification.html.erb | 5 -----
 config/locales/server.en.yml          | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index f71ec0d6856..3f4d8015d86 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -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
       }
     )
diff --git a/app/models/site_text.rb b/app/models/site_text.rb
index 994eacca23d..425b4299401 100644
--- a/app/models/site_text.rb
+++ b/app/models/site_text.rb
@@ -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)
diff --git a/app/views/email/notification.html.erb b/app/views/email/notification.html.erb
index 363f2ae46d4..bd9e50ed51d 100644
--- a/app/views/email/notification.html.erb
+++ b/app/views/email/notification.html.erb
@@ -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? %>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e34493ea694..8444605fde2 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -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 &#9632;&#9632;&#9632;&#9632;"