Merge branch 'registry-791' into registry-790

# Conflicts:
#	app/views/admin/domains/edit.html.erb
#	config/locales/admin/domains.en.yml

app/models/concerns/domain/force_delete.rb

@@ -16,7 +16,9 @@ module Concerns::Domain::ForceDelete
   end
 
   def cancel_force_delete
-    raise 'Domain must be discarded before cancelling force delete procedure' unless discarded?
+    if discarded?
+      raise StandardError, 'Force delete procedure cannot be cancelled while a domain is discarded'
+    end
 
     restore_statuses_before_force_delete
     remove_force_delete_statuses

app/presenters/domain_presenter.rb

@@ -58,12 +58,17 @@ class DomainPresenter
                          target: '.domain-edit-force-delete-dialog',
                        }
       )
-    else
+    elsif !domain.discarded?
       view.link_to(view.t('admin.domains.force_delete_toggle_btn.cancel'),
                    view.admin_domain_force_delete_path(domain),
                    method: :delete,
                    data: { confirm: view.t('admin.domains.force_delete_toggle_btn.cancel_confirm') },
                    class: 'btn btn-primary')
+    else
+      view.content_tag(:button, view.t('admin.domains.force_delete_toggle_btn.cancel'),
+                       class: 'btn btn-default ',
+                       title: view.t('admin.domains.force_delete_toggle_btn.unable_to_cancel'),
+                       disabled: true)
     end
   end
 

app/views/admin/domains/edit.html.erb

@@ -7,11 +7,11 @@
 
 <div class="page-header">
     <div class="row">
-        <div class="col-sm-3">
-            <h1>Edit: <%= domain.name %></h1>
+        <div class="col-sm-4">
+            <h1><%= t '.header', domain: domain.name %></h1>
         </div>
 
-        <div class="col-sm-9 text-right">
+        <div class="col-sm-8 text-right">
             <%= link_to t('.add_new_status_btn'), '#', class: 'btn btn-primary js-add-status' %>
             <%= domain.keep_btn %>
             <%= domain.force_delete_toggle_btn %>
@@ -20,4 +20,4 @@
 </div>
 
 <%= render 'form' %>
-<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %>
+<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %>