]> source.dussan.org Git - redmine.git/commitdiff
projects / redmine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0395eb9)
Add a Email Header setting. Useful for adding delimiters to every email.
authorEric Davis <edavis@littlestreamsoftware.com>
Tue, 2 Nov 2010 19:00:36 +0000 (19:00 +0000)
committerEric Davis <edavis@littlestreamsoftware.com>
Tue, 2 Nov 2010 19:00:36 +0000 (19:00 +0000)
  #2852 #6628

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

app/views/layouts/mailer.text.html.erb patch | blob | history
app/views/layouts/mailer.text.plain.erb patch | blob | history
app/views/settings/_notifications.rhtml patch | blob | history
config/locales/en.yml patch | blob | history
config/settings.yml patch | blob | history
test/unit/mailer_test.rb patch | blob | history

diff --git a/app/views/layouts/mailer.text.html.erb b/app/views/layouts/mailer.text.html.erb
index 83d96786410b572d03e9f03c7711667a0fd8e15a..e4860fd5231f75922ac335ad932838bf2e9395c9 100644 (file)
--- 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 1cbcbc236ae5b0618dbf7ab2bf90d591cc749fa4..4b8c0b4f58459fcd936475b970a83240a9e281b1 100644 (file)
--- 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 bf2b9d8715fa67f01286249e0c57c32e2e681188..4cc81c931d0ea1ca24d3160c2b32989c77fa032d 100644 (file)
--- 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 62b8308c7506e872f1f4a1a05f29c173db36bb54..3b4b802583efd23ab54d9cea0ddb2700a7dd6ed8 100644 (file)
--- 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 e5ce1a0f941e34d6d025bdc4300d4189724bee9e..2d32decb3df145f1d2e7dabcfac75d0f3b587844 100644 (file)
--- 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 77bcb36f6547b9b8ad14b45a0cb648c8f83f2c97..e01cc10398c269d631c75a7267f99ccb6f24bbf3 100644 (file)
--- 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
Mirror of redmine code source: https://github.com/redmine/redmine