Merge branch 'master' into registry-662

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

app/views/epp/domains/create.xml.builder

@@ -8,7 +8,7 @@ xml.epp_head do
       xml.tag!('domain:creData', 'xmlns:domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd') do
         xml.tag!('domain:name', @domain.name)
         xml.tag!('domain:crDate', @domain.created_at.try(:iso8601))
-        xml.tag!('domain:exDate', @domain.valid_to.try(:iso8601))
+        xml.tag!('domain:exDate', @domain.valid_to.iso8601)
       end
     end
 

app/views/epp/domains/info.xml.builder

@@ -48,7 +48,7 @@ xml.epp_head do
           xml.tag!('domain:upDate', @domain.updated_at.try(:iso8601))
         end
 
-        xml.tag!('domain:exDate', @domain.valid_to.try(:iso8601))
+        xml.tag!('domain:exDate', @domain.valid_to.iso8601)
 
         # TODO Make domain transferrable
         #xml.tag!('domain:trDate', @domain.transferred_at) if @domain.transferred_at

app/views/epp/domains/partials/_transfer.xml.builder

@@ -5,5 +5,5 @@ builder.tag!('domain:trnData', 'xmlns:domain' => 'https://epp.tld.ee/schema/doma
   builder.tag!('domain:reDate', dt.transfer_requested_at.try(:iso8601))
   builder.tag!('domain:acID', dt.old_registrar.code)
   builder.tag!('domain:acDate', dt.transferred_at.try(:iso8601) || dt.wait_until.try(:iso8601))
-  builder.tag!('domain:exDate', dt.domain_valid_to.try(:iso8601))
+  builder.tag!('domain:exDate', dt.domain_valid_to.iso8601)
 end

app/views/epp/domains/renew.xml.builder

@@ -7,7 +7,7 @@ xml.epp_head do
     xml.resData do
       xml.tag!('domain:renData', 'xmlns:domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd') do
         xml.tag!('domain:name', @domain[:name])
-        xml.tag!('domain:exDate', @domain.valid_to.try(:iso8601))
+        xml.tag!('domain:exDate', @domain.valid_to.iso8601)
       end
     end
 

app/views/for_models/whois_discarded.erb

@@ -0,0 +1,8 @@
+Estonia .ee Top Level Domain WHOIS server
+
+Domain:
+name:       <%= json['name'] %>
+status:     <%= json['status'] %>
+
+Estonia .ee Top Level Domain WHOIS server
+More information at http://internet.ee