diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/_navbar.haml | 4 | ||||
| -rw-r--r-- | views/alerts.haml | 23 |
2 files changed, 4 insertions, 23 deletions
diff --git a/views/_navbar.haml b/views/_navbar.haml index 5df4991..aa2b5f5 100644 --- a/views/_navbar.haml +++ b/views/_navbar.haml @@ -26,5 +26,5 @@ %div{:class => ["flash", klass]} :textile #{flash[klass]} - :javascript - $(document).ready(function () { $('div.flash').delay(1000).fadeOut(2000);}); + - else + %div{:class => ["flash", klass], :style => "display: none"} diff --git a/views/alerts.haml b/views/alerts.haml index aedbc72..54bfff7 100644 --- a/views/alerts.haml +++ b/views/alerts.haml @@ -7,25 +7,6 @@ .notice#alerts_table %p No alerts to display. :javascript - $(document).ready( function() { - $.PeriodicalUpdater({ - url: '/ajax/alerts_table/#{@alert_type}/#{@group_by}', - minTimeout: 10000, - maxTimeout: 30000, - }, function(alerts_table, success, xhr, handle){ - $('#alerts_table').replaceWith(alerts_table); - }); - $.PeriodicalUpdater({ - url: '/ajax/alert_counts', - minTimeout: 10000, - maxTimeout: 30000, - }, function(alert_counts, success, xhr, handle){ - var counts = jQuery.parseJSON( alert_counts ); - $('#count_raised').html(counts[0]+counts[1]+counts[2]); - $('#count_ackd').html(counts[3]); - $('#count_cleared').html(counts[4]); - return false; - }); - - }); + // Do the magic updates.. + setInterval("updateAlertsTable('#{@alert_type}','#{@group_by}');", 30000) |