diff options
| -rw-r--r-- | app/views/layouts/mailer.text.html.erb | 1 | ||||
| -rw-r--r-- | app/views/layouts/mailer.text.plain.erb | 1 | ||||
| -rw-r--r-- | app/views/settings/_notifications.rhtml | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/settings.yml | 2 | ||||
| -rw-r--r-- | test/unit/mailer_test.rb | 17 |
6 files changed, 26 insertions, 0 deletions
diff --git a/app/views/layouts/mailer.text.html.erb b/app/views/layouts/mailer.text.html.erb index 83d967864..e4860fd52 100644 --- 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> diff --git a/app/views/layouts/mailer.text.plain.erb b/app/views/layouts/mailer.text.plain.erb index 1cbcbc236..4b8c0b4f5 100644 --- a/app/views/layouts/mailer.text.plain.erb +++ b/app/views/layouts/mailer.text.plain.erb @@ -1,3 +1,4 @@ +<%= Setting.emails_header %> <%= yield %> -- <%= Setting.emails_footer %> diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml index bf2b9d871..4cc81c931 100644 --- 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> diff --git a/config/locales/en.yml b/config/locales/en.yml index 62b8308c7..3b4b80258 100644 --- 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 diff --git a/config/settings.yml b/config/settings.yml index e5ce1a0f9..2d32decb3 100644 --- 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: '' diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index 77bcb36f6..e01cc1039 100644 --- 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 |