Merge pull request #806 from internetee/registry-792

Registry 792

app/models/concerns/domain/deletable.rb

@@ -5,6 +5,11 @@ module Concerns::Domain::Deletable
     alias_attribute :delete_time, :delete_at
   end
 
+  def discard
+    statuses << DomainStatus::DELETE_CANDIDATE
+    save
+  end
+
   def discarded?
     statuses.include?(DomainStatus::DELETE_CANDIDATE)
   end

app/presenters/domain_presenter.rb

@@ -6,6 +6,17 @@ class DomainPresenter
     @view = view
   end
 
+  def name_with_status
+    html = domain.name
+
+    if domain.discarded?
+      label = view.content_tag(:span, 'deleteCandidate', class: 'label label-warning')
+      html += " #{label}"
+    end
+
+    html.html_safe
+  end
+
   def expire_time
     view.l(domain.expire_time)
   end

app/views/admin/domains/show.haml

@@ -1,24 +0,0 @@
-- content_for :actions do
-  = link_to(t(:edit_statuses), edit_admin_domain_path(@domain), class: 'btn btn-primary')
-  = link_to(t(:history), admin_domain_domain_versions_path(@domain.id), method: :get, class: 'btn btn-primary')
-
-= render 'shared/title', name: @domain.name
-
-.row
-  .col-md-6= render 'admin/domains/partials/general'
-  .col-md-6= render 'admin/domains/partials/owner'
-.row
-  .col-md-12= render 'admin/domains/partials/tech_contacts'
-.row
-  .col-md-12= render 'admin/domains/partials/admin_contacts'
-.row
-  .col-md-12= render 'admin/domains/partials/statuses'
-.row
-  .col-md-12= render 'admin/domains/partials/nameservers'
-.row
-  .col-md-12= render 'admin/domains/partials/dnskeys'
-.row
-  .col-md-12= render 'admin/domains/partials/keyrelays'
-.row
-  .col-md-12
-    = render 'admin/domains/partials/legal_documents', legal_documents: @domain.legal_documents

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

@@ -0,0 +1,71 @@
+<% domain = DomainPresenter.new(domain: @domain, view: self) %>
+
+<ol class="breadcrumb">
+    <li><%= link_to t('admin.domains.index.header'), admin_domains_path %></li>
+</ol>
+
+<div class="page-header">
+    <div class="row">
+        <div class="col-sm-8">
+            <h1><%= domain.name_with_status %></h1>
+        </div>
+
+        <div class="col-sm-4 text-right">
+            <%= link_to t('.edit_btn'), edit_admin_domain_path(@domain), class: 'btn btn-primary' %>
+            <%= link_to t('.history_btn'), admin_domain_domain_versions_path(@domain),
+                        class: 'btn btn-primary' %>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-6">
+        <%= render 'admin/domains/partials/general' %>
+    </div>
+    <div class="col-md-6">
+        <%= render 'admin/domains/partials/owner' %>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'admin/domains/partials/tech_contacts' %>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'admin/domains/partials/admin_contacts' %>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'admin/domains/partials/statuses' %>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'admin/domains/partials/nameservers' %>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'admin/domains/partials/dnskeys' %>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'admin/domains/partials/keyrelays' %>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'admin/domains/partials/legal_documents', legal_documents:
+            @domain.legal_documents %>
+    </div>
+</div>

app/views/admin/domains/zonefile.haml

@@ -1,8 +0,0 @@
-- content_for :actions do
-  = link_to(t(:back_to_domain), admin_domain_path(@domain), class: 'btn btn-default')
-= render 'shared/title', name: t(:zonefile)
-
-.row
-  .col-md-12
-    = preserve do
-      %pre= @zonefile