index view

3 files changed, 33 insertions, 32 deletions

diff --git a/app/views/intruders/_index_core.html.haml b/app/views/intruders/_index_core.html.haml
index 0070c4d..31bbd11 100644
--- a/app/views/intruders/_index_core.html.haml
+++ b/app/views/intruders/_index_core.html.haml
@@ -1,37 +1,38 @@
 %table.table.table-striped
   %tr
-    %th= t('intruders.index.list_type')
-    %th= t('intruders.index.key')
+    %th
+    %th= t('intruders.index.contact_ip')
+    %th= t('intruders.index.contact_port')
     %th= t('intruders.index.points')
     %th= t('intruders.index.bans')
     %th= t('intruders.index.ban_last')
     %th= t('intruders.index.ban_end')
-    %th= t('intruders.index.contact_ip')
-    %th= t('intruders.index.contact_port')
     %th= t('intruders.index.contact_count')
     %th= t('intruders.index.contact_last')
     %th= t('intruders.index.contacts_per_second')
-    %th= t('intruders.index.contacts_per_second_max')
     %th= t('intruders.index.user_agent')
     %th= t('intruders.index.to_user')
-    %th= t('intruders.index.comment')
 
   
   - for intruder in intruders
     %tr
-      %td= intruder.list_type
-      %td= intruder.key
-      %td= intruder.points
-      %td= intruder.bans
-      %td= intruder.ban_last
-      %td= intruder.ban_end
+      %td= intruder.list_type.chars.first
       %td= intruder.contact_ip
       %td= intruder.contact_port
+      %td= intruder.points
+      %td= intruder.bans
+      %td 
+        - if intruder.ban_last
+          = l intruder.ban_last, :format => :short
+      %td
+        - if intruder.ban_end
+          = l intruder.ban_end, :format => :short
+
       %td= intruder.contact_count
-      %td= intruder.contact_last
+      %td
+        - if intruder.contact_last
+          = l intruder.contact_last, :format => :short
       %td= intruder.contacts_per_second
-      %td= intruder.contacts_per_second_max
       %td= intruder.user_agent
       %td= intruder.to_user
-      %td= intruder.comment
-      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => intruder}
\ No newline at end of file
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => intruder}
diff --git a/config/locales/views/intruders/de.yml b/config/locales/views/intruders/de.yml
index 42ece4b..5b67afe 100644
--- a/config/locales/views/intruders/de.yml
+++ b/config/locales/views/intruders/de.yml
@@ -11,16 +11,16 @@ de:
       key: 'Key'
       points: 'Points'
       bans: 'Bans'
-      ban_last: 'Ban last'
+      ban_last: 'Ban'
       ban_end: 'Ban end'
-      contact_ip: 'Contact ip'
-      contact_port: 'Contact port'
-      contact_count: 'Contact count'
-      contact_last: 'Contact last'
-      contacts_per_second: 'Contacts per second'
-      contacts_per_second_max: 'Contacts per second max'
+      contact_ip: 'IP'
+      contact_port: 'Port'
+      contact_count: 'Contact'
+      contact_last: 'Last'
+      contacts_per_second: 'Contacts/s'
+      contacts_per_second_max: 'max. Contacts/s'
       user_agent: 'User agent'
-      to_user: 'To user'
+      to_user: 'To'
       comment: 'Comment'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Intruder'
diff --git a/config/locales/views/intruders/en.yml b/config/locales/views/intruders/en.yml
index 99c2dcb..b9d65f4 100644
--- a/config/locales/views/intruders/en.yml
+++ b/config/locales/views/intruders/en.yml
@@ -11,16 +11,16 @@ en:
       key: 'Key'
       points: 'Points'
       bans: 'Bans'
-      ban_last: 'Ban last'
+      ban_last: 'Ban'
       ban_end: 'Ban end'
-      contact_ip: 'Contact ip'
-      contact_port: 'Contact port'
-      contact_count: 'Contact count'
-      contact_last: 'Contact last'
-      contacts_per_second: 'Contacts per second'
-      contacts_per_second_max: 'Contacts per second max'
+      contact_ip: 'IP'
+      contact_port: 'Port'
+      contact_count: 'Contact'
+      contact_last: 'Last'
+      contacts_per_second: 'Contacts/s'
+      contacts_per_second_max: 'max. Contacts/s'
       user_agent: 'User agent'
-      to_user: 'To user'
+      to_user: 'To'
       comment: 'Comment'
       actions:
         confirm_destroy: 'Are you sure you want to delete this Intruder?'