kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Eric Davis 2010-11-02 19:00:36 +00:00
parent 0395eb99de
commit 7e359d3d7e
6 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/layouts/mailer.text.html.erb
View File

@ -25,6 +25,7 @@ hr {
</style> </style>
</head> </head>
<body> <body>
<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header) %></span>
<%= yield %> <%= yield %>
<hr /> <hr />
<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer) %></span> <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer) %></span>

1
app/views/layouts/mailer.text.plain.erb
View File

@ -1,3 +1,4 @@
<%= Setting.emails_header %>
<%= yield %> <%= yield %>
-- --
<%= Setting.emails_footer %> <%= Setting.emails_footer %>

4
app/views/settings/_notifications.rhtml
View File

@ -21,6 +21,10 @@
<p><%= check_all_links('notified_events') %></p> <p><%= check_all_links('notified_events') %></p>
</fieldset> </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> <fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
<%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %> <%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %>
</fieldset> </fieldset>

1
config/locales/en.yml
View File

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

2
config/settings.yml
View File

@ -186,3 +186,5 @@ rest_api_enabled:
default: 0 default: 0
default_notification_option: default_notification_option:
default: 'only_my_events' default: 'only_my_events'
emails_header:
default: ''

17
test/unit/mailer_test.rb
View File

@ -393,4 +393,21 @@ class MailerTest < ActiveSupport::TestCase
# should restore perform_deliveries # should restore perform_deliveries
assert ActionMailer::Base.perform_deliveries assert ActionMailer::Base.perform_deliveries
end 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 end