Revert "297 email address validation truemail"

app/views/admin/contacts/index.haml

@@ -63,10 +63,6 @@
           .form-group
             = label_tag :only_no_country_code, "Ident CC missing"
             = check_box_tag :only_no_country_code, '1',params[:only_no_country_code].eql?('1'), style: 'width:auto;height:auto;float:right'
-        .col-md-3
-          .form-group
-            = label_tag :email_verification_failed, "Email verification failed"
-            = check_box_tag :email_verification_failed, '1',params[:email_verification_failed].eql?('1'), style: 'width:auto;height:auto;float:right'
 
       .row
         .col-md-3{style: 'padding-top: 25px;float:right;'}
@@ -89,9 +85,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'ident', t(:ident))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'email', t(:email))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'created_at', t(:created_at))
+              = sort_link(@q, 'email', t(:created_at))
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'registrar_name', t(:registrar_name))
         %tbody
@@ -100,7 +94,6 @@
               %td= link_to(contact, admin_contact_path(contact))
               %td= contact.code
               %td= ident_for(contact)
-              %td= verified_email_span(contact.email_verification)
               %td= l(contact.created_at, format: :short)
               %td
                 - if contact.registrar

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

@@ -17,7 +17,7 @@
       %dd= ident_for(@contact)
 
       %dt= t(:email)
-      %dd= verified_email_span(@contact.email_verification)
+      %dd= @contact.email
 
       %dt= t(:phone)
       %dd= @contact.phone

app/views/admin/registrars/index.html.erb

@@ -28,9 +28,6 @@
                     <th class="col-xs-4">
                         <%= t(:test_registrar) %>
                     </th>
-                    <th class="col-xs-4">
-                        <%= t(:emails) %>
-                    </th>
                 </tr>
                 </thead>
                 <tbody>
@@ -48,12 +45,6 @@
                         <td>
                             <%= "#{x.test_registrar}" %>
                         </td>
-                        <td>
-                            <%= verified_email_span(x.email_verification) %>
-                            <% if x[:billing_email].present? %>
-                                <%= verified_email_span(x.billing_email_verification) %>
-                            <% end %>
-                        </td>
                     </tr>
                 <% end %>
                 </tbody>

app/views/admin/registrars/show/_billing.html.erb

@@ -15,9 +15,7 @@
             <dd><%= registrar.accounting_customer_code %></dd>
 
             <dt><%= Registrar.human_attribute_name :billing_email %></dt>
-            <dd>
-                <%= verified_email_span(registrar.billing_email_verification) %>
-            </dd>
+            <dd><%= registrar.billing_email %></dd>
 
             <dt><%= Registrar.human_attribute_name :reference_no %></dt>
             <dd><%= registrar.reference_no %></dd>
@@ -26,4 +24,4 @@
             <dd><%= registrar.iban %></dd>
         </dl>
     </div>
-</div>
+</div>

app/views/admin/registrars/show/_contacts.html.erb

@@ -15,9 +15,7 @@
             <dd><%= @registrar.phone %></dd>
 
             <dt><%= Registrar.human_attribute_name :email %></dt>
-            <dd>
-                <%= verified_email_span(@registrar.email_verification) %>
-            </dd>
+            <dd><%= @registrar.email %></dd>
         </dl>
     </div>
-</div>
+</div>