diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-08-19 10:49:28 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-08-19 10:49:28 +0100 |
| commit | 5fac7af657afccb5ef2dc887b4312e0a9b8f4969 (patch) | |
| tree | 11f8b85db27d6940fb3fdeef6ef6683072510289 | |
| parent | 3622b64a7ba411da478d1a7870876704f2c0f23c (diff) | |
| parent | 334aa01056f199123e81f5bff44dbdb998562fdf (diff) | |
merge
| -rw-r--r-- | static/javascript/mauve_utils.js | 4 | ||||
| -rw-r--r-- | views/_alerts_table.haml | 5 | ||||
| -rw-r--r-- | views/alerts.haml | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/static/javascript/mauve_utils.js b/static/javascript/mauve_utils.js index cd0d52b..38af0cc 100644 --- a/static/javascript/mauve_utils.js +++ b/static/javascript/mauve_utils.js @@ -141,7 +141,7 @@ function updateAlertsTable(alert_type, group_by) { $.ajax( { url: '/ajax/alerts_table/'+alert_type+'/'+group_by, - timeout: 5000, + timeout: 30000, success: function( data ) { if ( "" == data || null == data ) { showError("No data returned by web server when updating alerts table.", "updateAlertsTable"); @@ -169,7 +169,7 @@ function updateAlertsTable(alert_type, group_by) { function updateAlertCounts() { $.ajax( { url: '/ajax/alert_counts', - timeout: 5000, + timeout: 30000, success: function(counts) { if ( "" == counts || null == counts) { showError("No data returned by web server when updating alert counts.", "updateAlertCounts"); diff --git a/views/_alerts_table.haml b/views/_alerts_table.haml index 99a4e13..40b2b1c 100644 --- a/views/_alerts_table.haml +++ b/views/_alerts_table.haml @@ -12,3 +12,8 @@ %th#summary Summary %th#time At = partial("alerts_table_group", :collection => @grouped_alerts) + %tr + %td{ :colspan => 3} + %address + Last updated at + = Time.now diff --git a/views/alerts.haml b/views/alerts.haml index 54bfff7..3018d6c 100644 --- a/views/alerts.haml +++ b/views/alerts.haml @@ -8,5 +8,5 @@ %p No alerts to display. :javascript // Do the magic updates.. - setInterval("updateAlertsTable('#{@alert_type}','#{@group_by}');", 30000) + setInterval("updateAlertsTable('#{@alert_type}','#{@group_by}');", 120000) |