aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/_alerts_table.haml2
-rw-r--r--views/_alerts_table_alert_summary.haml5
-rw-r--r--views/_alerts_table_group.haml2
-rw-r--r--views/_head.haml2
4 files changed, 7 insertions, 4 deletions
diff --git a/views/_alerts_table.haml b/views/_alerts_table.haml
index aa0c437..f413c30 100644
--- a/views/_alerts_table.haml
+++ b/views/_alerts_table.haml
@@ -10,8 +10,8 @@
this.checked = !this.checked;
});
});
- %th#time At
%th#summary Summary
+ %th#time At
= partial("alerts_table_group", :collection => @grouped_alerts)
%tr
%td  
diff --git a/views/_alerts_table_alert_summary.haml b/views/_alerts_table_alert_summary.haml
index 06f1dc2..a06ccb8 100644
--- a/views/_alerts_table_alert_summary.haml
+++ b/views/_alerts_table_alert_summary.haml
@@ -6,5 +6,8 @@
%label{ :for => "alerts[#{alert.id}]" }
%strong= alert.subject
= alert.summary
- %a{ :id => ["a","detail", alert.id], :href => "/alert/#{alert.id}", :onclick => "fetchDetail('#{alert.id}'); return false;"} Details ↓
+ %a{ :id => ["a","detail", alert.id], |
+ :href => "/alert/#{alert.id}", |
+ :onclick => "fetchDetail('#{alert.id}'); return false;"}
+ Details ↓
%td= alert.raised_at.to_s_relative
diff --git a/views/_alerts_table_group.haml b/views/_alerts_table_group.haml
index f3af4b2..8bc73b4 100644
--- a/views/_alerts_table_group.haml
+++ b/views/_alerts_table_group.haml
@@ -2,7 +2,7 @@
- group, alerts = alerts_table_group unless alerts_table_group.nil?
- hilight = cycle(nil,"hilight")
- row_class = [ hilight, alerts.first.raised? && "triggered", alerts.first.acknowledged? && "acknowledged", alerts.first.level]
-=partial("alerts_table_alert_summary", :locals => {:alert => alerts.first, :row_class => row_class })
+=partial("alerts_table_alert_summary", :locals => {:alert => alerts.pop, :row_class => row_class })
- if alerts.length > 1
%tr{ :class => [ hilight, alerts.first.raised? && "triggered", alerts.first.acknowledged? && "acknowledged"]}
%td  
diff --git a/views/_head.haml b/views/_head.haml
index 276680d..981aaf1 100644
--- a/views/_head.haml
+++ b/views/_head.haml
@@ -5,4 +5,4 @@
%link{:rel => "stylesheet", :href => "/stylesheets/mauve.css", :media => "all", :type => "text/css"}/
%link{:rel => "stylesheet", :href => "/stylesheets/mauve-handheld.css", :media => "handheld, only screen and (max-width: 1000px), only screen and (max-device-width: 1000px)", :type => "text/css" }/
%script{:src => '/javascript/jquery/jquery.min.js', :type => 'text/javascript'}
- %script{:src => '/mauve_utils.js', :type => 'text/javascript'}
+ %script{:src => '/javascript/mauve_utils.js', :type => 'text/javascript'}