Add a Email Header setting. Useful for adding delimiters to every email.

#2852 #6628 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4362 e93f8b46-1217-0410-a6f0-8f06a7374b81

Add a Email Header setting. Useful for adding delimiters to every email.
#2852 #6628 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4362 e93f8b46-1217-0410-a6f0-8f06a7374b81
7e359d3d · Eric Davis · 0395eb99 · 7e359d3d · 7e359d3d · 7e359d3d
Commit 7e359d3d authored Nov 02, 2010 by Eric Davis
6 changed files
--- a/app/views/layouts/mailer.text.html.erb
+++ b/app/views/layouts/mailer.text.html.erb
@@ -25,6 +25,7 @@ hr {
 </style>
 </head>
 <body>
+<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header) %></span>
 <%= yield %>
 <hr />
 <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer) %></span>

--- a/app/views/layouts/mailer.text.plain.erb
+++ b/app/views/layouts/mailer.text.plain.erb
+<%= Setting.emails_header %>
 <%= yield %>
 -- 
 <%= Setting.emails_footer %>
--- a/app/views/settings/_notifications.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -21,6 +21,10 @@
 <p><%= check_all_links('notified_events') %></p>
 </fieldset>
+<fieldset class="box"><legend><%= l(:setting_emails_header) %></legend>
+<%= setting_text_area :emails_header, :label => false, :class => 'wiki-edit', :rows => 5 %>
+</fieldset>
 <fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
 <%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %>
 </fieldset>

--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -325,6 +325,7 @@ en:
  setting_issue_list_default_columns: Default columns displayed on the issue list
  setting_repositories_encodings: Repositories encodings
  setting_commit_logs_encoding: Commit messages encoding
+  setting_emails_header: Emails header
  setting_emails_footer: Emails footer
  setting_protocol: Protocol
  setting_per_page_options: Objects per page options

--- a/config/settings.yml
+++ b/config/settings.yml
@@ -186,3 +186,5 @@ rest_api_enabled:
  default: 0
 default_notification_option:
  default: 'only_my_events'
+emails_header:
+  default: ''
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -393,4 +393,21 @@ class MailerTest < ActiveSupport::TestCase
    # should restore perform_deliveries
    assert ActionMailer::Base.perform_deliveries
  end
+  context "layout" do
+    should "include the emails_header" do
+      with_settings(:emails_header => "*Header content*") do
+        assert Mailer.deliver_test(User.find(1))
+        assert_select_email do
+          assert_select ".header" do
+            assert_select "strong", :text => "Header content"
+          end
+        end
+      end
+    end
+  end
 end