Refactored contact with ability

app/views/admin/contacts/index.haml

@@ -22,20 +22,20 @@
         %thead
           %tr
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'name', t('name'))
+              = sort_link(@q, 'name', t(:name))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'code', t('code'))
+              = sort_link(@q, 'ident', t(:identity))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'ident', t('identity_code'))
+              = sort_link(@q, 'email', t(:email))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'email', t('email'))
+              = sort_link(@q, 'code', t(:code))
         %tbody
           - @contacts.each do |x|
             %tr
               %td= link_to(x, admin_contact_path(x))
-              %td= x.code
               %td= x.ident
               %td= x.email
+              %td= x.code
 .row
   .col-md-12
     = paginate @contacts

app/views/admin/contacts/partials/_address.haml

@@ -4,25 +4,17 @@
   .panel-body
     - unless @contact.address.nil?
       %dl.dl-horizontal
-        %dt= t('country')
-        %dd= @contact.address.country
+        %dt= t('street')
+        %dd= @contact.street
 
         %dt= t('city')
-        %dd= @contact.address.city
-
-        %dt= t('street')
-        %dd= @contact.address.street
-
-        - if @contact.address.street2
-          %dt= t('street')
-          %dd= @contact.address.street2
-
-        - if @contact.address.street3
-          %dt= t('street')
-          %dd= @contact.address.street3
-
-
+        %dd= @contact.city
 
         %dt= t('zip')
-        %dd= @contact.address.zip
+        %dd= @contact.zip
 
+        %dt= t('state')
+        %dd= @contact.state
+
+        %dt= t('country')
+        %dd= @contact.country

app/views/admin/contacts/partials/_general.haml

@@ -3,30 +3,28 @@
     %h3.panel-title= t('general')
   .panel-body
     %dl.dl-horizontal
-      %dt= t('name')
-      %dd= @contact.name
+      %dt= t(:ident)
+      %dd= @contact.ident + ' [' + @contact.ident_type + ']'
 
-      %dt= t('org_name')
-      %dd= @contact.org_name
+      %br
 
-      %dt= t('code')
-      %dd= @contact.code
-
-      %dt= t('ident')
-      %dd= @contact.ident
-
-      %dt= t('ident_type')
-      %dd= @contact.ident_type
-
-      %dt= t('email')
+      %dt= t(:email)
       %dd= @contact.email
 
-      %dt= t('phone')
+      %dt= t(:phone)
       %dd= @contact.phone
 
+      %dt= t(:org_name)
+      %dd= @contact.org_name
+
       - if @contact.fax
-        %dt= t('fax')
+        %dt= t(:fax)
         %dd= @contact.fax
 
+      %br
+
+      %dt= t(:code)
+      %dd= @contact.code
+
       %dt= t('password')
       %dd= @contact.auth_info

app/views/admin/contacts/show.haml

@@ -1,7 +1,7 @@
 .row
   .col-sm-12
     %h2.text-center-xs
-      = "#{t('contact_details')}"
+      = @contact.name
 %hr
 .row
   .col-md-6= render 'admin/contacts/partials/general'