From 507d98bf547250551ead1cf6ee74b8bb384bf242 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Fri, 17 Jun 2011 10:01:19 +0100 Subject: * Removed layout for ajax paths * Changed time_to_s for xmpp template --- lib/mauve/notifiers/templates/xmpp.txt.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/mauve/notifiers/templates/xmpp.txt.erb') 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 -- cgit v1.2.1