diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-06-15 21:19:06 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-06-15 21:19:06 +0100 |
| commit | 3af526a34a0d53cde184134b68f2c241efe92483 (patch) | |
| tree | 8710265616ab6bef3967781f4e84f376bec4079e /views | |
| parent | 13c75e73812927359ca8a1d606ed33bd6a75eea5 (diff) | |
* Alert detail now has default message.
* It is now interpreted as textile.
Diffstat (limited to 'views')
| -rw-r--r-- | views/_alerts_table_alert_detail.haml | 3 | ||||
| -rw-r--r-- | views/alert.haml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/views/_alerts_table_alert_detail.haml b/views/_alerts_table_alert_detail.haml index 73185c6..b5ada45 100644 --- a/views/_alerts_table_alert_detail.haml +++ b/views/_alerts_table_alert_detail.haml @@ -2,7 +2,8 @@ %td %td{:colspan => 2} .detail - = alert.detail + :textile + #{alert.detail} %address - if alert.raised? or alert.acknowledged? Raised at #{alert.raised_at.to_s_human} • diff --git a/views/alert.haml b/views/alert.haml index 41de29a..0486770 100644 --- a/views/alert.haml +++ b/views/alert.haml @@ -17,7 +17,9 @@ %td= @alert.source %tr %th{:title => "HTML fragment describing the alert in more detail, no limit on length."} Detail - %td= @alert.detail + %td + :textile + #{@alert.detail} %tr %th{:title => "ID set by the source of the alert."} Alert ID %td= @alert.alert_id |