diff options
Diffstat (limited to 'lib/mauve/notifiers')
-rw-r--r-- | lib/mauve/notifiers/templates/email.html.erb | 2 | ||||
-rw-r--r-- | lib/mauve/notifiers/templates/email.txt.erb | 2 | ||||
-rw-r--r-- | lib/mauve/notifiers/templates/xmpp.txt.erb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/mauve/notifiers/templates/email.html.erb b/lib/mauve/notifiers/templates/email.html.erb index 46b2ebc..929237a 100644 --- a/lib/mauve/notifiers/templates/email.html.erb +++ b/lib/mauve/notifiers/templates/email.html.erb @@ -17,6 +17,6 @@ end %>.</p> <hr /> <h2>Detail</h2> -<div><%=alert.detail %></div> +<div><%= RedCloth.new(alert.detail).to_html %></div> <hr /> <address>--<br />Love mauve<br />xxx.</address></body></html> diff --git a/lib/mauve/notifiers/templates/email.txt.erb b/lib/mauve/notifiers/templates/email.txt.erb index 5db9bd6..7f4f081 100644 --- a/lib/mauve/notifiers/templates/email.txt.erb +++ b/lib/mauve/notifiers/templates/email.txt.erb @@ -15,7 +15,7 @@ end -- Detail ------------------------------------------------------------ -<%= Sanitize.clean(alert.detail) %> +<%= Alert.remove_html(alert.detail) %> ----------------------------------------------------------------------- diff --git a/lib/mauve/notifiers/templates/xmpp.txt.erb b/lib/mauve/notifiers/templates/xmpp.txt.erb index 282f370..c123038 100644 --- a/lib/mauve/notifiers/templates/xmpp.txt.erb +++ b/lib/mauve/notifiers/templates/xmpp.txt.erb @@ -3,7 +3,7 @@ case alert.update_type.to_sym when :cleared %><%= alert.cleared_at.to_s_relative %><% when :acknowleged -%><%= alert.acknowledged_at.to_s_relative %><% +%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by %><% else %><%= alert.raised_at.to_s_relative %><% end |