diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-06-20 19:06:19 +0200 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-06-20 19:06:19 +0200 |
commit | eb0e1cc5c26275ff3e5c341404e8bc558f8312b8 (patch) | |
tree | 71f449ccd6f15422717de3ac24f87d5e888ddd79 /app/views/intruders | |
parent | df6e17e48995f25e72509986f30700d778b179b6 (diff) | |
parent | 3b27a5d45b12f6bac65da2a8e17387bfda42a2f1 (diff) |
Merge branch 'develop'
Diffstat (limited to 'app/views/intruders')
-rw-r--r-- | app/views/intruders/_index_core.html.haml | 2 | ||||
-rw-r--r-- | app/views/intruders/show.html.haml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/views/intruders/_index_core.html.haml b/app/views/intruders/_index_core.html.haml index 1fca601..fa1cf8f 100644 --- a/app/views/intruders/_index_core.html.haml +++ b/app/views/intruders/_index_core.html.haml @@ -2,6 +2,7 @@ %tr %th %th= t('intruders.index.contact_ip') + %th= t('intruders.index.country') %th= t('intruders.index.points') %th= t('intruders.index.ban_last') %th= t('intruders.index.contact_count') @@ -31,6 +32,7 @@ %i.icon-warning-sign %td= intruder.contact_ip + %td= intruder.country %td= intruder.points %td - if intruder.ban_last diff --git a/app/views/intruders/show.html.haml b/app/views/intruders/show.html.haml index df50872..5096941 100644 --- a/app/views/intruders/show.html.haml +++ b/app/views/intruders/show.html.haml @@ -22,6 +22,9 @@ %strong= t('intruders.show.contact_ip') + ":" = @intruder.contact_ip %p + %strong= t('intruders.show.country') + ":" + = @intruder.country +%p %strong= t('intruders.show.contact_port') + ":" = @intruder.contact_port %p |