Added ident country code and improved other ident things

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

@@ -1,20 +1,24 @@
 .panel.panel-default
   .panel-heading
-    %h3.panel-title= t('address')
+    %h3.panel-title= t(:address)
   .panel-body
     - unless @contact.address.nil?
       %dl.dl-horizontal
-        %dt= t('street')
+        - if @contact.bic?
+          %dt= t(:org_name)
+          %dd= @contact.org_name
+
+        %dt= t(:street)
         %dd= @contact.street
 
-        %dt= t('city')
+        %dt= t(:city)
         %dd= @contact.city
 
-        %dt= t('zip')
+        %dt= t(:zip)
         %dd= @contact.zip
 
-        %dt= t('state')
+        %dt= t(:state)
         %dd= @contact.state
 
-        %dt= t('country')
+        %dt= t(:country)
         %dd= @contact.country

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

@@ -4,7 +4,7 @@
   .panel-body
     %dl.dl-horizontal
       %dt= t(:ident)
-      %dd= @contact.ident + ' [' + @contact.ident_type + ']'
+      %dd= "#{@contact.ident} #{ident_indicator(@contact)}"
 
       %br
 
@@ -14,9 +14,6 @@
       %dt= t(:phone)
       %dd= @contact.phone
 
-      %dt= t(:org_name)
-      %dd= @contact.org_name
-
       - if @contact.fax
         %dt= t(:fax)
         %dd= @contact.fax