diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-06-17 10:01:19 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-06-17 10:01:19 +0100 |
| commit | 507d98bf547250551ead1cf6ee74b8bb384bf242 (patch) | |
| tree | dc5471ff0feab5dc7474a625fb07b7bdb64705fb /lib/mauve/notifiers | |
| parent | c50972e379859bffc30f8676192986e28840b107 (diff) | |
* Removed layout for ajax paths
* Changed time_to_s for xmpp template
Diffstat (limited to 'lib/mauve/notifiers')
| -rw-r--r-- | lib/mauve/notifiers/templates/xmpp.txt.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mauve/notifiers/templates/xmpp.txt.erb b/lib/mauve/notifiers/templates/xmpp.txt.erb index 30ff1e6..eafc12b 100644 --- a/lib/mauve/notifiers/templates/xmpp.txt.erb +++ b/lib/mauve/notifiers/templates/xmpp.txt.erb @@ -1,11 +1,11 @@ <%= alert.update_type.upcase %>: <% case alert.update_type when :cleared -%><%= MauveTime.now.to_s_relative(alert.cleared_at.to_time) %><% +%><%= alert.cleared_at.to_s_relative %><% when :acknowleged -%><%= MauveTime.now.to_s_relative(alert.acknowledged_at.to_time) %><% +%><%= alert.acknowledged_at.to_time.to_s_relative %><% else -%><%= MauveTime.now.to_s_relative(alert.raised_at.to_time) %><% +%><%= alert.raised_at.to_s_relative %><% end %>: <%= alert.subject %> <%= alert.summary %><% if alert.source != alert.subject |