summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/views/layouts/mailer.html.erb4
-rw-r--r--app/views/layouts/mailer.text.erb4
2 files changed, 8 insertions, 0 deletions
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 056196cd3..b100fe75d 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -25,9 +25,13 @@ hr {
</style>
</head>
<body>
+<% if Setting.emails_header.present? -%>
<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span>
+<% end -%>
<%= yield %>
<hr />
+<% if Setting.emails_footer.present? -%>
<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span>
+<% end -%>
</body>
</html>
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
index 4b8c0b4f5..a4c69862b 100644
--- a/app/views/layouts/mailer.text.erb
+++ b/app/views/layouts/mailer.text.erb
@@ -1,4 +1,8 @@
+<% if Setting.emails_header.present? -%>
<%= Setting.emails_header %>
+<% end -%>
<%= yield %>
+<% if Setting.emails_footer.present? -%>
--
<%= Setting.emails_footer %>
+<% end -%>