Merge branch 'master' into registry-662

app/views/admin/contact_versions/index.haml

@@ -57,8 +57,9 @@
         %tbody
           - @versions.each do |version|
             - if version
-            - contact = Contact.new(version.object.to_h)
-            - version.object_changes.to_h.each { |k,v| contact.public_send("#{k}=", v.last) }
+              - attributes = only_present_fields(version, Contact)
+              - contact = Contact.new(attributes)
+              - attach_existing_fields(version, contact)
 
               %tr
                 %td= link_to(contact.name, admin_contact_version_path(version.id))

app/views/admin/contact_versions/show.haml

@@ -1,5 +1,6 @@
-- contact = Contact.new(@version.object.to_h)
-- @version.object_changes.to_h.each { |k,v| contact.public_send("#{k}=", v.last ) }
+- attributes = only_present_fields(@version, Contact)
+- contact = Contact.new(attributes)
+- attach_existing_fields(@version, contact)
 = render 'shared/title', name: contact.name
 
 .row
@@ -41,11 +42,11 @@
 
           %br
 
-          %dt= t(:created)
+          %dt= t(:created_at)
           %dd{class: changing_css_class(@version,"created_at")}
             = l(contact.created_at, format: :short)
 
-          %dt= t(:updated)
+          %dt= t(:updated_at)
           %dd{class: changing_css_class(@version,"updated_at")}
             = l(contact.updated_at, format: :short)
 
@@ -61,7 +62,7 @@
 
           - if contact.street.present?
             %dt= t(:street)
-            %dd{class: changing_css_class(@version,"street")}= contact.street.to_s.gsub("\n", '<br>').html_safe
+            %dd{class: changing_css_class(@version,"street")}= contact.street
 
           - if contact.city.present?
             %dt= t(:city)

app/views/admin/domain_versions/archive.haml

@@ -55,8 +55,9 @@
         %tbody
           - @versions.each do |version|
             - if version
-              - domain = Domain.new(version.object.to_h)
-              - version.object_changes.to_h.each{|k,v| domain.public_send("#{k}=", v.last) }
+              - attributes = only_present_fields(version, Domain)
+              - domain = Domain.new(attributes)
+              - attach_existing_fields(version, domain)
 
               %tr
                 %td= link_to(domain.name, admin_domain_version_path(version.id))

app/views/admin/domain_versions/show.haml

@@ -1,5 +1,6 @@
-- domain = Domain.new(@version.object.to_h)
-- @version.object_changes.to_h.each{|k,v| domain.public_send("#{k}=", v.last) }
+- present_fields = only_present_fields(@version, Domain)
+- domain = Domain.new(present_fields)
+- attach_existing_fields(@version, domain)
 
 - if @version
   - children = HashWithIndifferentAccess.new(@version.children)

app/views/admin/settings/index.haml

@@ -99,6 +99,7 @@
           = render 'setting_row', var: :registry_state
           = render 'setting_row', var: :registry_zip
           = render 'setting_row', var: :registry_country_code
+          = render 'setting_row', var: :registry_whois_disclaimer
 
   .row
     .col-md-12.text-right

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

@@ -22,7 +22,7 @@ xml.epp_head do
           xml.tag!('domain:contact', ac.code, 'type' => 'admin')
         end
 
-        if @nameservers && @nameservers.any?
+        if @nameservers&.any?
           xml.tag!('domain:ns') do
             @nameservers.each do |x|
               xml.tag!('domain:hostAttr') do

app/views/for_models/whois.erb

@@ -1,3 +1,6 @@
+<%- if json['disclaimer'].present? -%>
+<%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
+<%- end -%>
 Estonia .ee Top Level Domain WHOIS server
 
 Domain:
@@ -23,18 +26,18 @@ changed: <%= json['registrant_changed'].to_s.tr('T',' ').sub('+', ' +') %>
 <%- if json['admin_contacts'].present? -%>
 Administrative contact:
 <%- for contact in json['admin_contacts'] -%>
-name:       <%= contact['name'] %>
+name:       Not Disclosed
 email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-changed:    <%= contact['changed'].to_s.tr('T',' ').sub('+', ' +') %>
+changed:    Not Disclosed
 <%- end -%>
 
 <%- end -%>
 <% if json['tech_contacts'].present? %>
 Technical contact:
 <%- for contact in json['tech_contacts'] -%>
-name:       <%= contact['name'] %>
+name:       Not Disclosed
 email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-changed:    <%= contact['changed'].to_s.tr('T',' ').sub('+', ' +') %>
+changed:    Not Disclosed
 <%- end -%>
 
 <%- end -%>

app/views/layouts/registrant/application.haml

@@ -1,54 +0,0 @@
-!!! 5
-%html{lang: I18n.locale.to_s}
-  %head
-    %meta{charset: "utf-8"}/
-    %meta{content: "width=device-width, initial-scale=1", name: "viewport"}/
-    - if content_for? :head_title
-      = yield :head_title
-    - else
-      %title= t(:registrant_head_title)
-    = csrf_meta_tags
-    = stylesheet_link_tag 'registrant-manifest', media: 'all'
-    = favicon_link_tag 'favicon.ico'
-  %body
-    / Fixed navbar
-    %nav.navbar.navbar-default.navbar-fixed-top
-      .container
-        .navbar-header
-          %button.navbar-toggle.collapsed{"aria-controls" => "navbar", "aria-expanded" => "false", "data-target" => "#navbar", "data-toggle" => "collapse", :type => "button"}
-            %span.sr-only Toggle navigation
-            %span.icon-bar
-            %span.icon-bar
-            %span.icon-bar
-          = link_to registrant_root_path, class: 'navbar-brand' do
-            = t(:registrant_head_title)
-            - if unstable_env.present?
-              .text-center
-                %small{style: 'color: #0074B3;'}= unstable_env
-        - if current_user
-          .navbar-collapse.collapse
-            %ul.nav.navbar-nav.public-nav
-              - if can? :view, Depp::Domain
-                - active_class = %w(registrant/domains registrant/check registrant/renew registrant/tranfer registrant/keyrelays).include?(params[:controller]) ? 'active' :nil
-                %li{class: active_class}= link_to t(:domains), registrant_domains_path
-
-              - active_class = %w(registrant/whois).include?(params[:controller]) ? 'active' :nil
-              %li{class: active_class}= link_to t(:whois), registrant_whois_path
-
-            %ul.nav.navbar-nav.navbar-right
-              - if user_signed_in?
-                %li= link_to t(:log_out, user: current_user), '/registrant/logout'
-
-    .container
-      = render 'shared/flash'
-      = yield
-
-    %footer.footer
-      .container
-        .row
-          .col-md-6
-            = image_tag 'eis-logo-et.png'
-          .col-md-6.text-right
-            Version
-            = CURRENT_COMMIT_HASH
-    = javascript_include_tag 'registrant-manifest', async: true

app/views/layouts/registrant/application.html.erb

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="<%= I18n.locale.to_s %>">
+  <head>
+    <meta charset="utf-8"/>
+    <meta content="width=device-width, initial-scale=1" name="viewport"/>
+    <% if content_for? :head_title %>
+      <%= yield :head_title %>
+    <% else %>
+      <title>
+        <%= t(:registrant_head_title) %>
+      </title>
+    <% end %>
+    <%= csrf_meta_tags %>
+    <%= stylesheet_link_tag 'registrant-manifest', media: 'all' %>
+    <%= favicon_link_tag 'favicon.ico' %>
+  </head>
+  <body>
+    <!-- Fixed navbar
+    -->
+    <nav class="navbar navbar-default navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button aria-controls="navbar" aria-expanded="false" class="navbar-toggle collapsed" data-target="#navbar" data-toggle="collapse" type="button">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <%= link_to registrant_root_path, class: 'navbar-brand' do %>
+            <%= t(:registrant_head_title) %>
+            <% if unstable_env.present? %>
+              <div class="text-center">
+                <small style="color: #0074B3;">
+                  <%= unstable_env %>
+                </small>
+              </div>
+            <% end %>
+          <% end %>
+        </div>
+        <% if current_user %>
+          <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav public-nav">
+              <% if can? :view, Depp::Domain %>
+                <% active_class = %w(registrant/domains registrant/check registrant/renew registrant/tranfer registrant/keyrelays).include?(params[:controller]) ? 'active' :nil %>
+                <li class="<%= active_class %>">
+                  <%= link_to t(:domains), registrant_domains_path %>
+                </li>
+              <% end %>
+              <% active_class = %w(registrant/whois).include?(params[:controller]) ? 'active' :nil %>
+              <li class="<%= active_class %>">
+                <%= link_to 'Internet.ee', 'https://internet.ee' %>
+              </li>
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <% if user_signed_in? %>
+                <li>
+                  <%= link_to t(:log_out, user: current_user), '/registrant/logout' %>
+                </li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
+      </div>
+    </nav>
+    <div class="container">
+      <%= render 'shared/flash' %>
+      <%= yield %>
+    </div>
+    <footer class="footer">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-6">
+            <%= image_tag 'eis-logo-et.png' %>
+          </div>
+          <div class="col-md-6 text-right">
+            Version
+            <%= CURRENT_COMMIT_HASH %>
+          </div>
+        </div>
+      </div>
+    </footer>
+    <%= javascript_include_tag 'registrant-manifest', async: true %>
+  </body>
+</html>

app/views/registrant/contacts/partials/_address.haml

@@ -8,7 +8,7 @@
         %dd= @contact.org_name
 
       %dt= t(:street)
-      %dd= @contact.street.to_s.gsub("\n", '<br>').html_safe
+      %dd= @contact.street
 
       %dt= t(:city)
       %dd= @contact.city