diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2012-05-01 16:11:51 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2012-05-01 16:11:51 +0100 |
| commit | 9caa15360effe79b84197fd68fc22996b64e35aa (patch) | |
| tree | 5b49819eb94bbd80d90d6fbf1d86be895e6e20ef /views | |
| parent | 2e5b3be3a89e54a986608c37d1093e17356b7e5c (diff) | |
Updated views to be neater with respect to notice/errors and in the case when no
alerts are found in a table.
Diffstat (limited to 'views')
| -rw-r--r-- | views/_alerts_table.haml | 9 | ||||
| -rw-r--r-- | views/_history.haml | 10 | ||||
| -rw-r--r-- | views/alerts.haml | 12 |
3 files changed, 18 insertions, 13 deletions
diff --git a/views/_alerts_table.haml b/views/_alerts_table.haml index 40b2b1c..ed759be 100644 --- a/views/_alerts_table.haml +++ b/views/_alerts_table.haml @@ -11,7 +11,14 @@ }); %th#summary Summary %th#time At - = partial("alerts_table_group", :collection => @grouped_alerts) + - if @grouped_alerts.length > 0 + = partial("alerts_table_group", :collection => @grouped_alerts) + - else + %tr{:class => %w(notice)} + %td + %td{:style => "text-align: center;"} + = "No #{@alert_type} alerts found!" + %td %tr %td{ :colspan => 3} %address diff --git a/views/_history.haml b/views/_history.haml index 03d02d7..cfeec51 100644 --- a/views/_history.haml +++ b/views/_history.haml @@ -4,12 +4,14 @@ %p = history.created_at.strftime("%R") - history.alerts.each do |alert| - %a{ :href => url_for(alert) } + %a{ :href => self.class.url_for(alert) } = alert.id - %strong - = alert.subject + %strong + = alert.subject = alert.summary - if alert.source != alert.subject - = "-- from #{alert.source} + = "(from #{alert.source})" = history.event + - if history.user + = "by #{history.user}" - @today = history.created_at diff --git a/views/alerts.haml b/views/alerts.haml index 896b5a3..88cb82c 100644 --- a/views/alerts.haml +++ b/views/alerts.haml @@ -1,11 +1,7 @@ -- if @grouped_alerts.length > 0 - %form#alerts{:method => :post, :action => '/alerts/acknowledge'} - = partial('alerts_table') - %h2 Actions - %p= partial('acknowledge_input') -- else - .notice#alerts_table - %p No alerts to display. +%form#alerts{:method => :post, :action => '/alerts/acknowledge'} + = partial('alerts_table') + %h2 Actions + %p= partial('acknowledge_input') :javascript // Do the magic updates.. setTimeout("updateAlertsTable('#{@alert_type}','#{@group_by}');", 120000) |