summaryrefslogtreecommitdiffstats
path: root/app/views/layouts
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-11-02 19:00:36 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-11-02 19:00:36 +0000
commit7e359d3d7e1364ea92e08f7922036f5ad8ccd81f (patch)
tree9e806621fc40238438193c0847567ca8f4adb83c /app/views/layouts
parent0395eb99decaac54dc8acf6162b3129893341be0 (diff)
downloadredmine-7e359d3d7e1364ea92e08f7922036f5ad8ccd81f.tar.gz
redmine-7e359d3d7e1364ea92e08f7922036f5ad8ccd81f.zip
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
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/mailer.text.html.erb1
-rw-r--r--app/views/layouts/mailer.text.plain.erb1
2 files changed, 2 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 %>