From e140af144e987ff7f6d767f2dc48b9cf685803fd Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Wed, 13 Jul 2011 16:02:50 +0100 Subject: Big commit * Added manpages for all binaries * Added log-reopening for mauvealert-server, and logrotate snippet * mauveserver now adds a user on install, and runs as that user * Big logging tidy-up * Alert subjects are only overwritten by the source, when the subject in the databse is empty * Removed various attr_writer methods that were being redifined * Added a notes box to the acknowledge form, but this doesn't work yet --- views/_acknowledge_input.haml | 5 ++++- views/alert.haml | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'views') diff --git a/views/_acknowledge_input.haml b/views/_acknowledge_input.haml index b6fc24b..82f3044 100644 --- a/views/_acknowledge_input.haml +++ b/views/_acknowledge_input.haml @@ -7,7 +7,10 @@ Acknowledge these alerts for %option{ :value => "wallclock" } wall-clock hours %span#ack_until_text -%input#ack_until{ :value => '', :type => :hidden, :name => 'ack_until' } +%input#ack_until{ :value => '', :type => :hidden, :name => 'ack_until' } +%br +with the note +%input#note{ :name => 'note', :type => "text"} %input{ :type => 'submit', :value => 'Go!' } :javascript // Change of value in the hours box diff --git a/views/alert.haml b/views/alert.haml index 7e7503f..d4e274f 100644 --- a/views/alert.haml +++ b/views/alert.haml @@ -47,7 +47,7 @@ %th Notifications sent out %td %ul - - @alert.changes.each do |change| + - @alert.changes.first(10).each do |change| - if change.was_relevant? %li %strong= change.level @@ -59,8 +59,8 @@ %tr %th History %td - %ul - - @alert.histories.each do |history| + %ul#histories + - @alert.histories.first(10).each do |history| %li = history.event at -- cgit v1.2.1