diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-07-20 16:16:14 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-07-20 16:16:14 +0100 |
| commit | 3185e5d746abda1b7f42ecdbd74ec14359fda3bc (patch) | |
| tree | e74ee3a587d62fdf68f79093af2202188aed3bc5 /lib/mauve/notifiers/templates/xmpp.txt.erb | |
| parent | 4ffe222986d4e3565a1f189325d77b33f90dfa15 (diff) | |
| parent | d3a3cfef9650b08f62db62bd7e86b673f9d77d0b (diff) | |
merge
Diffstat (limited to 'lib/mauve/notifiers/templates/xmpp.txt.erb')
| -rw-r--r-- | lib/mauve/notifiers/templates/xmpp.txt.erb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mauve/notifiers/templates/xmpp.txt.erb b/lib/mauve/notifiers/templates/xmpp.txt.erb index 837fd67..a73f41f 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 when "cleared" %><%= alert.cleared_at.to_s_relative %><% when "acknowledged" -%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by %><% +%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by %> until <%= alert.will_unacknowledge_at.to_s_human %><% else %><%= alert.raised_at.to_s_relative %><% end @@ -11,10 +11,10 @@ end if alert.source != alert.subject %> -- from <%= alert.source %><% end -%>.<% +%>. <%=WebInterface.url_for(alert)%><% if was_suppressed and not is_suppressed -%> Normal service has resumed.<% +%> (Normal service has resumed.)<% elsif is_suppressed and not was_suppressed -%> Further alerts suppressed until things calm down.<% +%> (Further alerts suppressed until things calm down.)<% end %> |