Merge branch 'master' into registry-791

app/views/admin/domains/partials/_general.html.erb

@@ -22,9 +22,6 @@
                         class: 'form-control input-sm' %>
             </dd>
 
-            <dt><%= t(:valid_from) %></dt>
-            <dd><%= l(@domain.valid_from) %></dd>
-
             <dt><%= t(:valid_to) %></dt>
             <dd><%= l(@domain.valid_to) %></dd>
 

app/views/admin/domains/partials/_version.haml

@@ -66,12 +66,10 @@
       %p
         = link_to t(:pending_epp), '#', class: 'js-pending'
 
-  %td{class: changing_css_class(version, "period", "period_unit", "valid_from", "valid_to")}
+  %td{class: changing_css_class(version, "period", "period_unit", "valid_to")}
     %p
       = "#{domain.period}#{domain.period_unit}"
       %br
-      = "#{l(domain.valid_from, format: :date)}"
-      %br
       = "#{l(domain.valid_to, format: :date)}"
 
   %td

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