diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 6efbd33..30157a3 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -13,27 +13,18 @@ a, a:link, a:visited { color: #169;} a:hover, a:active { color: #c61a1a; } a.wiki-anchor { display: none; } fieldset.attachments {border-width: 1px 0 0 0;} -hr { - width: 100%; - height: 1px; - background: #ccc; - border: 0; - margin: 1.2em 0; -} -span.footer { - font-size: 0.8em; - font-style: italic; -} +<% if Setting.emails_style.present? -%><%= Setting.emails_style %><% end -%> <% if Setting.emails_header.present? -%> -<%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %> +
<%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %>
<% end -%> +
<%= yield %> -
+
<% if Setting.emails_footer.present? -%> -<%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %> +
<%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %>
<% end -%> diff --git a/app/views/settings/_notifications.html.erb b/app/views/settings/_notifications.html.erb index e75a201..663b9ff 100644 --- a/app/views/settings/_notifications.html.erb +++ b/app/views/settings/_notifications.html.erb @@ -29,6 +29,10 @@ <%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %> +
<%= l(:setting_emails_style) %> +<%= setting_text_area :emails_style, :label => false, :class => 'wiki-edit', :rows => 5 %> +
+
<%= link_to l(:label_send_test_email), test_email_path, :method => :post %>
diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 9d3f88c..4e12470 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1196,3 +1196,4 @@ ar: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/az.yml b/config/locales/az.yml index 13c3f5e..fd219f1 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -1291,3 +1291,4 @@ az: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 39355d1..48736cf 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1187,3 +1187,4 @@ bg: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/bs.yml b/config/locales/bs.yml index a07496f..c7b5725 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1209,3 +1209,4 @@ bs: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 5a14b58..9995e4d 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1189,3 +1189,4 @@ ca: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/cs.yml b/config/locales/cs.yml index a13c4b3..59b4a21 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1197,3 +1197,4 @@ cs: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/da.yml b/config/locales/da.yml index 3846c0c..57e2002 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1213,3 +1213,4 @@ da: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/de.yml b/config/locales/de.yml index cb1f10f..90d7d5f 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1203,3 +1203,4 @@ de: label_default_values_for_new_users: Standardwerte für neue Benutzer error_ldap_bind_credentials: Invalid LDAP Account/Password mail_body_settings_updated: ! 'The following settings were changed:' + setting_emails_style: Custom styles diff --git a/config/locales/el.yml b/config/locales/el.yml index 3625787..c2dcea6 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1196,3 +1196,4 @@ el: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 11798e9..ee3e8da 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1198,3 +1198,4 @@ en-GB: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/en.yml b/config/locales/en.yml index a2ac479..c7885a6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1181,3 +1181,4 @@ en: description_date_from: Enter start date description_date_to: Enter end date text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.
Once saved, the identifier cannot be changed.' + setting_emails_style: Custom styles diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml index 6884567..c844a51 100644 --- a/config/locales/es-PA.yml +++ b/config/locales/es-PA.yml @@ -1230,3 +1230,4 @@ es-PA: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/es.yml b/config/locales/es.yml index cf4becf..9d33336 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1228,3 +1228,4 @@ es: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/et.yml b/config/locales/et.yml index 5194298..46f71cd 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1200,3 +1200,4 @@ et: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 1126f4e..188699a 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1197,3 +1197,4 @@ eu: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 35634b6..414fbf9 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1197,3 +1197,4 @@ fa: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 0e03b7c..1173e6d 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1217,3 +1217,4 @@ fi: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 52a2af3..e7fd4b4 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1203,3 +1203,4 @@ fr: mail_body_security_notification_notify_disabled: Email address %{value} no longer receives notifications. field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/gl.yml b/config/locales/gl.yml index ea4db2d..8a8f602 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1204,3 +1204,4 @@ gl: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/he.yml b/config/locales/he.yml index df2920c..7b049f6 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1201,3 +1201,4 @@ he: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 1dd1e60..4332528 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1195,3 +1195,4 @@ hr: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 2e4c337..66dc983 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1215,3 +1215,4 @@ receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/id.yml b/config/locales/id.yml index a202bad..33e832e 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1200,3 +1200,4 @@ id: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/it.yml b/config/locales/it.yml index eb11224..49c1b1b 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1191,3 +1191,4 @@ it: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 814e00f..8853cd4 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1209,3 +1209,4 @@ ja: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 7de9a7b..e547913 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1240,3 +1240,4 @@ ko: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/lt.yml b/config/locales/lt.yml index bce3e3c..1a247e8 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1255,3 +1255,4 @@ lt: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 31c16b1..906c482 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1190,3 +1190,4 @@ lv: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 431be09..ea72921 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1196,3 +1196,4 @@ mk: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 82f851d..6ba2af4 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -1197,3 +1197,4 @@ mn: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 5379dc7..1a6ffd7 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1175,3 +1175,4 @@ nl: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/no.yml b/config/locales/no.yml index c19370e..3fa9bf1 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -1186,3 +1186,4 @@ receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/pl.yml b/config/locales/pl.yml index d344c07..9143ccc 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1211,3 +1211,4 @@ pl: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 1bb5db1..f08a6d1 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1215,3 +1215,4 @@ pt-BR: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 3a625b7..3d759ea 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1198,3 +1198,4 @@ pt: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 6c427ed..2187411 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1191,3 +1191,4 @@ ro: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 3c2506b..e16f4b6 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1297,3 +1297,4 @@ ru: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/sk.yml b/config/locales/sk.yml index d3db961..68d3f1d 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1186,3 +1186,4 @@ sk: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 745f54b..b97e741 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1196,3 +1196,4 @@ sl: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 728b856..84af60d 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1192,3 +1192,4 @@ sq: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index 98b5b6c..f42d34d 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -1198,3 +1198,4 @@ sr-YU: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 8719605..7326edd 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1197,3 +1197,4 @@ sr: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 239dcf3..1a15a52 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1229,3 +1229,4 @@ sv: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/th.yml b/config/locales/th.yml index dbbd3d5..a5818ef 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1193,3 +1193,4 @@ th: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 4917bbf..05f6a2e 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1203,3 +1203,4 @@ tr: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 66eff03..72680c7 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1191,3 +1191,4 @@ uk: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 7e8ac73..488c087 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1249,3 +1249,4 @@ vi: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 960446a..e0348ab 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1270,3 +1270,4 @@ receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/locales/zh.yml b/config/locales/zh.yml index ccf04a5..a1906f9 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1191,3 +1191,4 @@ zh: receives notifications. mail_body_settings_updated: ! 'The following settings were changed:' field_remote_ip: IP address + setting_emails_style: Custom styles diff --git a/config/settings.yml b/config/settings.yml index 49e1edc..b23f8c8 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -275,3 +275,14 @@ non_working_week_days: default: - '6' - '7' +emails_style: + default: |- + .header { + text-align: center; + } + .mail.body { + padding: 1rem 2rem; + } + .footer { + border-top: 1px solid #444; font-size: 0.8em; font-style: italic; + }