diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
commit | 5d8ce5f4775ac8bc5f523964e6e36f63ff3c4683 (patch) | |
tree | 49ed889b1d10cda98c475f3453abff1b97afb4e7 /app/views/intruders/show.html.haml | |
parent | c9066760fd1f5f2f892ce2be5cf2a83bb5210246 (diff) | |
parent | 55784bcffc0678ce6102c0b81447434a8030ebd2 (diff) |
Merge branch 'develop'5.1-beta5
Diffstat (limited to 'app/views/intruders/show.html.haml')
-rw-r--r-- | app/views/intruders/show.html.haml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/views/intruders/show.html.haml b/app/views/intruders/show.html.haml index 4941e89..df50872 100644 --- a/app/views/intruders/show.html.haml +++ b/app/views/intruders/show.html.haml @@ -46,7 +46,13 @@ %strong= t('intruders.show.comment') + ":" = @intruder.comment -%p - %pre= @intruder.whois - = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @intruder } + +- if ! @whois.blank? + %p + %pre= @whois + +- elsif ! @intruder.contact_ip.blank? && Object.const_defined?('Whois') + %a.btn.btn-small.btn-success{ :href => intruder_path(@intruder, :whois => @intruder.contact_ip) } + %i.icon-info-sign.icon-white + = 'Whois' |