From b333bc41469e60db971716d6428a23671e8e18a9 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Tue, 10 Mar 2015 16:55:01 +0200
Subject: [PATCH] Updated regisntrar and updated index views

---
 app/views/admin/contacts/index.haml           |  6 +++++
 .../admin/contacts/partials/_general.haml     | 26 +++++++++++++++++--
 app/views/admin/domains/index.haml            |  6 ++---
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml
index 3f437d62d..afc2bba35 100644
--- a/app/views/admin/contacts/index.haml
+++ b/app/views/admin/contacts/index.haml
@@ -29,6 +29,8 @@
               = sort_link(@q, 'email', t(:email))
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'code', t(:code))
+            %th{class: 'col-xs-2'}
+              = sort_link(@q, 'registrar_name', t(:registrar))
         %tbody
           - @contacts.each do |contact|
             %tr
@@ -36,6 +38,10 @@
               %td= "#{contact.ident} #{ident_indicator(contact)}"
               %td= contact.email
               %td= contact.code
+              %td
+                - if contact.registrar
+                  = link_to(contact.registrar, admin_registrar_path(contact.registrar)) 
+
 .row
   .col-md-12
     = paginate @contacts
diff --git a/app/views/admin/contacts/partials/_general.haml b/app/views/admin/contacts/partials/_general.haml
index 2911ab783..76da258fc 100644
--- a/app/views/admin/contacts/partials/_general.haml
+++ b/app/views/admin/contacts/partials/_general.haml
@@ -1,6 +1,6 @@
 .panel.panel-default
   .panel-heading
-    %h3.panel-title= t('general')
+    %h3.panel-title= t(:general)
   .panel-body
     %dl.dl-horizontal
       %dt= t(:ident)
@@ -23,5 +23,27 @@
       %dt= t(:code)
       %dd= @contact.code
 
-      %dt= t('password')
+      %dt= t(:password)
       %dd= @contact.auth_info
+
+      %br
+
+      %dt= t(:created)
+      %dd
+        = l(@contact.created_at, format: :short)
+        by
+        = @contact.creator
+
+      %dt= t(:updated)
+      %dd
+        = l(@contact.updated_at, format: :short)
+        by
+        = @contact.updator
+
+
+      %dt= t(:registrar)
+      %dd 
+        - if @contact.registrar.present?
+          = link_to(@contact.registrar, admin_registrar_path(@contact.registrar)) 
+
+
diff --git a/app/views/admin/domains/index.haml b/app/views/admin/domains/index.haml
index 1db0f28da..3fa754201 100644
--- a/app/views/admin/domains/index.haml
+++ b/app/views/admin/domains/index.haml
@@ -23,19 +23,19 @@
           %tr
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'name')
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t('registrar'))
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'owner_contact_name', t('owner'))
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'valid_to', t('valid_to'))
+            %th{class: 'col-xs-2'}
+              = sort_link(@q, 'registrar_name', t('registrar'))
         %tbody
           - @domains.each do |x|
             %tr
               %td= link_to(x, admin_domain_path(x))
-              %td= link_to(x.registrar, admin_registrar_path(x.registrar)) if x.registrar
               %td= link_to(x.owner_contact, [:admin, x.owner_contact])
               %td= l(x.valid_to, format: :short)
+              %td= link_to(x.registrar, admin_registrar_path(x.registrar)) if x.registrar
 .row
   .col-md-12
     = paginate @domains