Merge branch 'master' into fix-registrar-url-condition-in-pdf

app/views/admin/account_activities/_search_form.html.erb

@@ -0,0 +1,65 @@
+<div class="row">
+    <div class="col-md-12">
+        <%= search_form_for @q, url: [:admin, :account_activities], html: { style: 'margin-bottom: 0;' } do |f| %>
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="form-group">
+                        <%= f.label t(:registrar_name) %>
+                        <%= f.select :account_registrar_id_in, Registrar.all.map { |x| [x, x.id] }, {}, class: 'form-control js-combobox', placeholder: t(:choose), multiple: true %>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <%= f.label t(:activity_type) %>
+                        <%= f.select :activity_type_in, AccountActivity.types_for_select, {}, class: 'form-control js-combobox', placeholder: t(:choose), multiple: true %>
+                    </div>
+                </div>
+
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <%= f.label t(:description) %>
+                        <%= f.search_field :description_cont, class: 'form-control', placeholder: t(:description), autocomplete: 'off' %>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-md-2">
+                    <div class="form-group">
+                        <%= f.label t(:receipt_date_from) %>
+                        <%= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from) %>
+                    </div>
+                </div>
+
+                <div class="col-md-2">
+                    <div class="form-group">
+                        <%= f.label t(:receipt_date_until) %>
+                        <%= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until) %>
+                    </div>
+                </div>
+
+                <div class="col-md-3">
+                    <div class="form-group">
+                        <%= label_tag t(:results_per_page) %>
+                        <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+                    </div>
+                </div>
+
+                <div class="col-md-5 text-right" style="padding-top: 25px;">
+                    <button class="btn btn-default search">
+                        &nbsp;
+                        <span class="glyphicon glyphicon-search"></span>
+                        &nbsp;
+                    </button>
+                    <%= button_tag t('.download_btn'),
+                                   formaction: admin_account_activities_path(format: 'csv'),
+                                   class: 'btn btn-default' %>
+                    <%= link_to(t('.reset_btn'), admin_account_activities_path, class: 'btn btn-default') %>
+                </div>
+            </div>
+        <% end %>
+    </div>
+</div>

app/views/admin/account_activities/index.haml

@@ -1,44 +1,6 @@
-- content_for :actions do
-  = link_to(t(:export_csv), url_for(params.merge(format: 'csv')), class: 'btn btn-default')
-
 = render 'shared/title', name: t(:account_activities)
+= render 'search_form'
 
-.row
-  .col-md-12
-    = search_form_for @q, url: [:admin, :account_activities], html: { style: 'margin-bottom: 0;' } do |f|
-      .row
-        .col-md-12
-          .form-group
-            = f.label t(:registrar_name)
-            = f.select :account_registrar_id_in, Registrar.all.map { |x| [x, x.id] }, {}, class: 'form-control js-combobox', placeholder: t(:choose), multiple: true
-      .row
-        .col-md-6
-          .form-group
-            = f.label t(:activity_type)
-            = f.select :activity_type_in, AccountActivity.types_for_select, {}, class: 'form-control js-combobox', placeholder: t(:choose), multiple: true
-        .col-md-6
-          .form-group
-            = f.label t(:description)
-            = f.search_field :description_cont, class: 'form-control', placeholder: t(:description), autocomplete: 'off'
-      .row
-        .col-md-3
-          .form-group
-            = f.label t(:receipt_date_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from)
-        .col-md-3
-          .form-group
-            = f.label t(:receipt_date_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until)
-        .col-md-3
-          .form-group
-            = label_tag t(:results_per_page)
-            = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page)
-        .col-md-3{style: 'padding-top: 25px;'}
-          %button.btn.btn-default.search
-             
-            %span.glyphicon.glyphicon-search
-             
-          = link_to(t('.reset_btn'), admin_account_activities_path, class: 'btn btn-default')
 .row
   .col-md-3
   .col-md-3

app/views/admin/api_users/_api_user.html.erb

@@ -0,0 +1,5 @@
+<tr>
+    <td><%= link_to api_user, admin_registrar_api_user_path(api_user.registrar, api_user) %></td>
+    <td><%= link_to api_user.registrar, admin_registrar_path(api_user.registrar) %></td>
+    <td><%= api_user.active %></td>
+</tr>

app/views/admin/api_users/_form.haml

@@ -1,57 +0,0 @@
-= form_for([:admin, @api_user], multipart: true,
-  html: {class: 'form-horizontal', autocomplete: 'off'}) do |f|
-  = render 'shared/full_errors', object: @api_user
-
-  .row
-    .col-md-8
-      .form-group
-        .col-md-4.control-label
-          = f.label :username, nil, class: 'required'
-        .col-md-7
-          = f.text_field :username, required: true, autofocus: true, class: 'form-control'
-      .form-group
-        .col-md-4.control-label
-          = f.label :plain_text_password, nil, class: 'required'
-        .col-md-7
-          = f.text_field :plain_text_password, required: true, class: 'form-control'
-
-      .form-group
-        .col-md-4.control-label
-          = f.label :identity_code
-        .col-md-7
-          = f.text_field(:identity_code, class: 'form-control')
-
-      .form-group
-        .form-group.has-feedback.js-typeahead-container
-          .col-md-4.control-label
-            = f.label :registrar_typeahead, t(:registrar_name), class: 'required'
-          .col-md-7
-            = f.text_field(:registrar_typeahead,
-              class: 'form-control js-registrar-typeahead typeahead required',
-              placeholder: t(:registrar_name), autocomplete: 'off')
-            %span.glyphicon.glyphicon-ok.form-control-feedback.js-typeahead-ok.hidden
-            %span.glyphicon.glyphicon-remove.form-control-feedback.js-typeahead-remove
-            = f.hidden_field(:registrar_id, class: 'js-registrar-id')
-
-      .form-group
-        .col-md-4.control-label
-          = f.label :role, nil, class: 'required'
-        .col-md-7
-          = select_tag 'api_user[roles][]',
-            options_for_select(ApiUser::ROLES.map {|x| [x, x] }, @api_user.roles.try(:first)),
-            class: 'form-control selectize'
-          .checkbox
-            %label{for: 'api_user_active'}
-              = f.check_box(:active)
-              = t('.active')
-
-  %hr
-
-  .row
-    .col-md-8.text-right
-      = button_tag(t(:save), class: 'btn btn-primary')
-
-:javascript
-  window.addEventListener('load', function() {
-    Autocomplete.bindAdminRegistrarSearch();
-  });

app/views/admin/api_users/_form.html.erb

@@ -0,0 +1,58 @@
+<%= form_for([:admin, @api_user.registrar, @api_user], html: { class: 'form-horizontal', autocomplete: 'off' }) do |f| %>
+    <%= render 'form_errors', target: @api_user %>
+
+    <div class="row">
+        <div class="col-md-8">
+            <div class="form-group">
+                <div class="col-md-4 control-label">
+                    <%= f.label :username, nil, class: 'required' %>
+                </div>
+                <div class="col-md-7">
+                    <%= f.text_field :username, required: true, autofocus: true, class: 'form-control' %>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-4 control-label">
+                    <%= f.label :plain_text_password, nil, class: 'required' %>
+                </div>
+                <div class="col-md-7">
+                    <%= f.text_field :plain_text_password, required: true, class: 'form-control' %>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-4 control-label">
+                    <%= f.label :identity_code %>
+                </div>
+                <div class="col-md-7">
+                    <%= f.text_field(:identity_code, class: 'form-control') %>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-4 control-label">
+                    <%= f.label :roles, nil, for: nil, class: 'required' %>
+                </div>
+
+                <div class="col-md-7">
+                    <%= select_tag 'api_user[roles][]', options_for_select(ApiUser::ROLES.map { |x| [x, x] }, @api_user.roles.try(:first)), class: 'form-control selectize' %>
+                    <div class="checkbox">
+                        <label for="api_user_active">
+                            <%= f.check_box(:active) %>
+                            <%= ApiUser.human_attribute_name :active %>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <hr>
+
+    <div class="row">
+        <div class="col-md-8 text-right">
+            <%= button_tag t(".#{f.object.new_record? ? 'create' : 'update'}_btn"), class: 'btn btn-success' %>
+        </div>
+    </div>
+<% end %>

app/views/admin/api_users/edit.haml

@@ -1,5 +0,0 @@
-- content_for :actions do
-  = link_to(t(:back_to_api_user), [:admin, @api_user], class: 'btn btn-default')
-= render 'shared/title', name: "#{t(:edit)}: #{@api_user.username}"
-
-= render 'form'

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

@@ -0,0 +1,14 @@
+<ol class="breadcrumb">
+    <li><%= link_to t('admin.registrars.index.header'), admin_registrars_path %></li>
+    <li><%= link_to @api_user.registrar, admin_registrar_path(@api_user.registrar) %></li>
+    <li><%= t 'admin.registrars.show.api_users.header' %></li>
+    <li><%= link_to @api_user.username, admin_registrar_api_user_path(@api_user.registrar,
+                                                                      @api_user) %></li>
+    <li><%= t '.header' %></li>
+</ol>
+
+<div class="page-header">
+    <h1><%= t '.header' %></h1>
+</div>
+
+<%= render 'form' %>

app/views/admin/api_users/index.haml

@@ -1,25 +0,0 @@
-- content_for :actions do
-  = link_to(t('.new_btn'), new_admin_api_user_path, class: 'btn btn-primary')
-= render 'shared/title', name: t('.title')
-
-.row
-  .col-md-12
-    .table-responsive
-      %table.table.table-hover.table-bordered.table-condensed
-        %thead
-          %tr
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'username')
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t(:registrar_name))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'active', t('.active'))
-        %tbody
-          - @api_users.each do |x|
-            %tr
-              %td= link_to(x, [:admin, x])
-              %td= link_to(x.registrar, [:admin, x.registrar])
-              %td= x.active
-.row
-  .col-md-12
-    = paginate @api_users

app/views/admin/api_users/index.html.erb

@@ -0,0 +1,35 @@
+<div class="page-header">
+    <h1><%= t '.header' %></h1>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <div class="table-responsive">
+            <table class="table table-hover table-bordered table-condensed">
+                <thead>
+                    <tr>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'username') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'registrar_name', Registrar.model_name.human) %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'active', ApiUser.human_attribute_name(:active)) %>
+                        </th>
+                    </tr>
+                </thead>
+
+                <tbody>
+                    <%= render @api_users %>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= paginate @api_users %>
+    </div>
+</div>

app/views/admin/api_users/new.haml

@@ -1,3 +0,0 @@
-= render 'shared/title', name: t('.title')
-
-= render 'form'

app/views/admin/api_users/new.html.erb

@@ -0,0 +1,11 @@
+<ol class="breadcrumb">
+    <li><%= link_to t('admin.registrars.index.header'), admin_registrars_path %></li>
+    <li><%= link_to @api_user.registrar, admin_registrar_path(@api_user.registrar) %></li>
+    <li><%= t '.header' %></li>
+</ol>
+
+<div class="page-header">
+    <h1><%= t '.header' %></h1>
+</div>
+
+<%= render 'form' %>

app/views/admin/api_users/show.haml

@@ -1,61 +0,0 @@
-- content_for :actions do
-  = link_to(t(:edit), edit_admin_api_user_path(@api_user), class: 'btn btn-default')
-  = link_to(t(:delete), admin_api_user_path(@api_user),
-    method: :delete, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger')
-= render 'shared/title', name: @api_user.username
-
-- if @api_user.errors.any?
-  - @api_user.errors.each do |attr, err|
-    = err
-    %br
-- if @api_user.errors.any?
-  %hr
-.row
-  .col-md-12
-    .panel.panel-default
-      .panel-heading
-        %h3.panel-title= t(:general)
-      .panel-body
-        %dl.dl-horizontal
-          %dt= t(:username)
-          %dd= @api_user.username
-
-          %dt= t(:password)
-          %dd= @api_user.plain_text_password
-
-          %dt= t(:registrar_name)
-          %dd= link_to(@api_user.registrar, admin_registrar_path(@api_user.registrar))
-
-          %dt= t(:role)
-          %dd= @api_user.roles.join(', ')
-
-          %dt= t('.active')
-          %dd= @api_user.active
-.row
-  .col-md-12
-    .panel.panel-default
-      .panel-heading.clearfix
-        .pull-left
-          = t(:certificates)
-        .pull-right
-          = link_to(t(:upload_crt),
-            new_admin_api_user_certificate_path(@api_user, crt: true), class: 'btn btn-primary btn-xs')
-          = link_to(t(:upload_csr),
-            new_admin_api_user_certificate_path(@api_user), class: 'btn btn-primary btn-xs')
-
-      .table-responsive
-        %table.table.table-hover.table-bordered.table-condensed
-          %thead
-            %tr
-              %th{class: 'col-xs-10'}= t('.subject')
-              %th{class: 'col-xs-2'}= t(:status)
-          %tbody
-            - @api_user.certificates.each do |x|
-              - if x.csr
-                %tr
-                  %td= link_to(x.parsed_csr.try(:subject), admin_api_user_certificate_path(@api_user, x))
-                  %td= x.status
-              - elsif x.crt
-                %tr
-                  %td= link_to(x.parsed_crt.try(:subject), admin_api_user_certificate_path(@api_user, x))
-                  %td= x.status

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

@@ -0,0 +1,37 @@
+<ol class="breadcrumb">
+    <li><%= link_to t('admin.registrars.index.header'), admin_registrars_path %></li>
+    <li><%= link_to @api_user.registrar, admin_registrar_path(@api_user.registrar) %></li>
+    <li><%= t 'admin.registrars.show.api_users.header' %></li>
+    <li><%= @api_user.username %></li>
+</ol>
+
+<div class="page-header">
+    <div class="row">
+        <div class="col-sm-8">
+            <h1><%= @api_user.username %></h1>
+        </div>
+
+        <div class="col-sm-4 text-right">
+            <%= link_to t('.edit_btn'), edit_admin_registrar_api_user_path(@api_user.registrar,
+                                                                           @api_user),
+                        class: 'btn btn-primary' %>
+            <%= link_to t('.delete_btn'), admin_registrar_api_user_path(@api_user.registrar,
+                                                                        @api_user),
+                        method: :delete,
+                        data: { confirm: t('.delete_btn_confirm') },
+                        class: 'btn btn-default' %>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'admin/api_users/show/details' %>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'admin/api_users/show/certificates' %>
+    </div>
+</div>

app/views/admin/api_users/show/_certificates.html.erb

@@ -0,0 +1,55 @@
+<div class="panel panel-default">
+    <div class="panel-heading clearfix">
+        <div class="pull-left">
+            <%= t(:certificates) %>
+        </div>
+
+        <div class="pull-right">
+            <%= link_to(t(:upload_crt), new_admin_api_user_certificate_path(@api_user, crt: true), class: 'btn btn-primary btn-xs') %>
+            <%= link_to(t(:upload_csr), new_admin_api_user_certificate_path(@api_user), class: 'btn btn-primary btn-xs') %>
+        </div>
+    </div>
+
+    <div class="table-responsive">
+        <table class="table table-hover table-bordered table-condensed">
+            <thead>
+                <tr>
+                    <th class="col-xs-10">
+                        <%= t('.subject') %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= t(:status) %>
+                    </th>
+                </tr>
+            </thead>
+
+            <tbody>
+                <% @api_user.certificates.each do |x| %>
+                    <% if x.csr %>
+                        <tr>
+                            <td>
+                                <%= link_to(x.parsed_csr.try(:subject),
+                                            admin_api_user_certificate_path(@api_user,
+                                                                            x)) %>
+                            </td>
+                            <td>
+                                <%= x.status %>
+                            </td>
+                        </tr>
+                    <% elsif x.crt %>
+                        <tr>
+                            <td>
+                                <%= link_to(x.parsed_crt.try(:subject),
+                                            admin_api_user_certificate_path(@api_user,
+                                                                            x)) %>
+                            </td>
+                            <td>
+                                <%= x.status %>
+                            </td>
+                        </tr>
+                    <% end %>
+                <% end %>
+            </tbody>
+        </table>
+    </div>
+</div>

app/views/admin/api_users/show/_details.html.erb

@@ -0,0 +1,26 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">
+            <%= t '.header' %>
+        </h3>
+    </div>
+
+    <div class="panel-body">
+        <dl class="dl-horizontal">
+            <dt><%= ApiUser.human_attribute_name :username %></dt>
+            <dd><%= @api_user.username %></dd>
+
+            <dt><%= ApiUser.human_attribute_name :plain_text_password %></dt>
+            <dd><%= @api_user.plain_text_password %></dd>
+
+            <dt><%= Registrar.model_name.human %></dt>
+            <dd><%= link_to(@api_user.registrar, admin_registrar_path(@api_user.registrar)) %></dd>
+
+            <dt><%= ApiUser.human_attribute_name :roles %></dt>
+            <dd><%= @api_user.roles.join(', ') %></dd>
+
+            <dt><%= ApiUser.human_attribute_name :active %></dt>
+            <dd><%= @api_user.active %></dd>
+        </dl>
+    </div>
+</div>

app/views/admin/base/_menu.haml

@@ -6,8 +6,6 @@
       %li= link_to t(:contacts), admin_contacts_path
     - if can? :show, Registrar
       %li= link_to t(:registrars), admin_registrars_path
-    - if can? :show, Keyrelay
-      %li= link_to t(:keyrelays), admin_keyrelays_path
     - if can?(:access, :settings_menu)
       %li.dropdown
         %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
@@ -34,10 +32,11 @@
           %li= link_to t('.zones'), admin_zones_path
           %li= link_to t('.blocked_domains'), admin_blocked_domains_path
           %li= link_to t('.reserved_domains'), admin_reserved_domains_path
+          %li= link_to t('.disputed_domains'), admin_disputes_path
           %li= link_to t('.epp_log'), admin_epp_logs_path(created_after: 'today')
           %li= link_to t('.repp_log'), admin_repp_logs_path(created_after: 'today')
           %li= link_to t('.que'), '/admin/que'
 
   %ul.nav.navbar-nav.navbar-right
     %li= link_to t('.sign_out'), destroy_admin_user_session_path, method: :delete,
-    class: 'navbar-link'
+    class: 'navbar-link'

app/views/admin/certificates/show.haml

@@ -20,7 +20,7 @@
       .panel-body
         %dl.dl-horizontal
           %dt= t(:api_user)
-          %dd= link_to(@certificate.api_user, [:admin, @api_user])
+          %dd= link_to(@certificate.api_user, [:admin, @api_user.registrar, @api_user])
 
           %dt= t(:common_name)
           %dd= @certificate.common_name

app/views/admin/contact_versions/show.haml

@@ -106,4 +106,4 @@
               = l(vs.created_at, format: :short)
               = vs.event
       %span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
-        = paginate @versions, theme: :admin
+        = paginate @versions

app/views/admin/contacts/index.haml

@@ -63,6 +63,10 @@
           .form-group
             = label_tag :only_no_country_code, "Ident CC missing"
             = check_box_tag :only_no_country_code, '1',params[:only_no_country_code].eql?('1'), style: 'width:auto;height:auto;float:right'
+        .col-md-3
+          .form-group
+            = label_tag :email_verification_failed, "Email verification failed"
+            = check_box_tag :email_verification_failed, '1',params[:email_verification_failed].eql?('1'), style: 'width:auto;height:auto;float:right'
 
       .row
         .col-md-3{style: 'padding-top: 25px;float:right;'}
@@ -85,7 +89,9 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'ident', t(:ident))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'email', t(:created_at))
+              = sort_link(@q, 'email', t(:email))
+            %th{class: 'col-xs-2'}
+              = sort_link(@q, 'created_at', t(:created_at))
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'registrar_name', t(:registrar_name))
         %tbody
@@ -94,6 +100,7 @@
               %td= link_to(contact, admin_contact_path(contact))
               %td= contact.code
               %td= ident_for(contact)
+              %td= verified_email_span(contact.email_verification)
               %td= l(contact.created_at, format: :short)
               %td
                 - if contact.registrar

app/views/admin/contacts/partials/_domains.haml

@@ -1,5 +1,6 @@
-- domains = contact.all_domains(page: params[:domain_page], per: 20, params: params)
-#contacts.panel.panel-default
+- domains = contact.all_domains(page: params[:domain_page], per: 20,
+                                params: domain_filter_params.to_h)
+.panel.panel-default
   .panel-heading
     .pull-left
       = t(:domains)

app/views/admin/contacts/partials/_general.haml

@@ -17,7 +17,7 @@
       %dd= ident_for(@contact)
 
       %dt= t(:email)
-      %dd= @contact.email
+      %dd= verified_email_span(@contact.email_verification)
 
       %dt= t(:phone)
       %dd= @contact.phone

app/views/admin/contacts/partials/_statuses.haml

@@ -1,21 +0,0 @@
-- panel_class = contact.errors.messages[:statuses] ? 'panel-danger' : 'panel-default'
-#contact_statuses.panel{class: panel_class}
-  .panel-heading.clearfix
-    = t(:statuses)
-  .table-responsive
-    %table.table.table-hover.table-bordered.table-condensed
-      %thead
-        %tr
-          %th{class: 'col-xs-6'}= t(:status)
-          %th{class: 'col-xs-6'}= t(:notes)
-      %tbody
-        - contact.statuses.each do |status|
-          %tr
-            %td= status
-            %td= contact.status_notes[status]
-
-      - if contact.errors.messages[:statuses]
-        %tfoot
-          - @domain.errors.messages[:statuses].each do |s|
-            %tr
-              %td{colspan: 4}= s

app/views/admin/contacts/partials/_statuses.html.erb

@@ -0,0 +1,23 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <%= t '.header' %>
+    </div>
+
+    <table class="table table-hover table-bordered table-condensed">
+        <thead>
+            <tr>
+                <th class="col-xs-6"><%= t(:status) %></th>
+                <th class="col-xs-6"><%= t(:notes) %></th>
+            </tr>
+        </thead>
+
+        <tbody>
+            <% contact.statuses.each do |status| %>
+                <tr>
+                    <td><%= status %></td>
+                    <td><%= contact.status_notes[status] %></td>
+                </tr>
+            <% end %>
+        </tbody>
+    </table>
+</div>

app/views/admin/disputes/_form.html.erb

@@ -0,0 +1,60 @@
+<%= form_for([:admin, @dispute], html: { class: 'form-horizontal' }) do |f| %>
+    <%= render 'shared/full_errors', object: @dispute %>
+
+    <div class="row">
+        <div class="col-md-8">
+            <div class="panel panel-default">
+                <div class="panel-heading clearfix">
+                    <div class="pull-left">
+                        <%= t(:general) %>
+                    </div>
+                </div>
+                <div class="panel-body">
+                    <div>
+                        <p>As per domain law, expiry time is <%= Setting.dispute_period_in_months / 12 %> years ahead from start date.</p>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-md-4 control-label">
+                            <%= f.label :domain_name %>
+                        </div>
+                        <div class="col-md-7">
+                            <%= f.text_field(:domain_name, class: 'form-control', disabled: !f.object.new_record?) %>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-md-4 control-label">
+                            <%= f.label :password %>
+                        </div>
+                        <div class="col-md-7">
+                            <%= f.text_field(:password, placeholder: t(:optional), class: 'form-control') %>
+                            <span class="help-block"><%= t '.password_hint' %></span>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-md-4 control-label">
+                            <%= f.label :starts_at %>
+                        </div>
+                        <div class="col-md-7">
+                            <%= f.text_field(:starts_at, class: 'form-control js-datepicker') %>
+                            <span class="help-block"><%= t '.past_or_today' %></span>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-md-4 control-label">
+                            <%= f.label :comment %>
+                        </div>
+                        <div class="col-md-7">
+                            <%= f.text_field(:comment, placeholder: t(:optional), class: 'form-control') %>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-8 text-right">
+            <%= button_tag(t(:save), class: 'btn btn-primary') %>
+        </div>
+    </div>
+<% end %>

app/views/admin/disputes/edit.haml

@@ -0,0 +1,3 @@
+= render 'shared/title', name: t(:edit_dispute)
+
+= render 'form'

app/views/admin/disputes/index.html.erb

@@ -0,0 +1,175 @@
+<% content_for :actions do %>
+<%= link_to(t('.new_btn'), new_admin_dispute_path, class: 'btn btn-primary') %>
+<% end %>
+<%= render 'shared/title', name: t('.title') %>
+<div class="row">
+    <div class="col-md-12">
+        <%= search_form_for [:admin, @q], html: { style: 'margin-bottom: 0;', class: 'js-form', autocomplete: 'off' } do |f| %>
+        <div class="row">
+            <div class="col-md-3">
+                <div class="form-group">
+                    <%= f.label :domain_name %>
+                    <%= f.search_field :domain_name_matches, value: params[:q][:domain_name_matches], class: 'form-control', placeholder: t(:name) %>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <div class="form-group">
+                    <%= f.label t(:created_at_from) %>
+                    <%= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from) %>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <div class="form-group">
+                    <%= f.label t(:created_at_until) %>
+                    <%= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until) %>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-3">
+                <div class="form-group">
+                    <%= label_tag t(:results_per_page) %>
+                    <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+                </div>
+            </div>
+            <div class="col-md-3" style="padding-top: 25px;">
+                <button class="btn btn-primary">
+                    &nbsp;
+                    <span class="glyphicon glyphicon-search"></span>
+                    &nbsp;
+                </button>
+                <%= link_to(t('.reset_btn'), admin_disputes_path, class: 'btn btn-default') %>
+            </div>
+        </div>
+        <% end %>
+    </div>
+</div>
+<hr />
+<p>Active disputes</p>
+<div class="row">
+    <div class="col-md-12">
+        <div class="table-responsive">
+            <table class="table table-hover table-bordered table-condensed">
+                <thead>
+                    <tr>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'domain_name') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'password') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'starts_at') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'expires_at') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'comment') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= t(:actions) %>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <% @disputes.each do |x| %>
+                    <tr>
+                        <td>
+                            <%= x.domain_name %>
+                        </td>
+                        <td>
+                            <%= x.password %>
+                        </td>
+                        <td>
+                            <%= x.starts_at %>
+                        </td>
+                        <td>
+                            <%= x.expires_at %>
+                        </td>
+                        <td>
+                            <%= x.comment %>
+                        </td>
+                        <td>
+                            <%= link_to t(:edit), edit_admin_dispute_path(id: x.id),
+                                        class: 'btn btn-primary btn-xs' %>
+                            <%= link_to t(:delete), delete_admin_dispute_path(id: x.id),
+                                        data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs' %>
+                        </td>
+                    </tr>
+                    <% end %>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        <%= paginate @disputes %>
+    </div>
+    <div class="col-md-6 text-right">
+        <div class="pagination">
+            <%= t(:result_count, count: @disputes.total_count) %>
+        </div>
+    </div>
+</div>
+<hr />
+<p>Expired / Closed disputes</p>
+<div class="row">
+    <div class="col-md-12">
+        <div class="table-responsive">
+            <table class="table table-hover table-bordered table-condensed">
+                <thead>
+                    <tr>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'domain_name') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'initiator') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'starts_at') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'closed') %>
+                        </th>
+                        <th class="col-xs-2">
+                            <%= sort_link(@q, 'comment') %>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <% @closed_disputes.each do |x| %>
+                    <tr>
+                        <td>
+                            <%= x.domain_name %>
+                        </td>
+                        <td>
+                            <%= x.initiator %>
+                        </td>
+                        <td>
+                            <%= x.starts_at %>
+                        </td>
+                        <td>
+                            <%= x.closed %>
+                        </td>
+                        <td>
+                            <%= x.comment %>
+                        </td>
+                    </tr>
+                    <% end %>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        <%= paginate @closed_disputes, param_name: :closed_page %>
+    </div>
+    <div class="col-md-6 text-right">
+        <div class="pagination">
+            <%= t(:result_count, count: @closed_disputes.total_count) %>
+        </div>
+    </div>
+</div>

app/views/admin/disputes/new.haml

@@ -0,0 +1,3 @@
+= render 'shared/title', name: t(:add_disputed_domain)
+
+= render 'form'

app/views/admin/domain_versions/show.haml

@@ -129,4 +129,4 @@
               = l(vs.created_at, format: :short)
               = vs.event
       %span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
-        = paginate @versions, theme: :admin
+        = paginate @versions

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

@@ -1,6 +1,6 @@
 <tr>
     <td><%= link_to domain, admin_domain_path(domain) %></td>
-    <td><%= link_to domain.registrant, admin_registrant_path(domain.registrant) %></td>
+    <td><%= link_to domain.registrant, admin_contact_path(domain.registrant) %></td>
     <td><%= l domain.expire_time %></td>
     <td><%= link_to domain.registrar, admin_registrar_path(domain.registrar) %></td>
 </tr>

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

@@ -10,6 +10,17 @@
 
             <%= form_tag admin_domain_force_delete_path(domain), id: 'domain-force-delete-form',
                          class: 'modal-body form-horizontal' do %>
+                <div class="form-group force-delete-type">
+                    <div class="col-md-9">
+                        <div class="checkbox">
+                            <label>
+                                <%= check_box_tag 'soft_delete', 1, true %>
+                                <%= t '.use_soft_delete' %>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <div class="col-md-9">
                         <div class="checkbox">

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

@@ -1,4 +1,5 @@
-- panel_class = @domain.errors.messages[:admin_contacts] ? 'panel-danger' : 'panel-default'
+- admin_contacts_invalid = @domain.errors.include?(:admin_contacts)
+- panel_class = admin_contacts_invalid ? 'panel-danger' : 'panel-default'
 .panel{class: panel_class}
   .panel-heading.clearfix
     = t('.title')
@@ -15,7 +16,7 @@
             %td= link_to(ac, admin_contact_path(ac))
             %td= ac.code
             %td= ac.email
-      - if @domain.errors.messages[:admin_contacts]
+      - if admin_contacts_invalid
         %tfoot
           - @domain.errors.messages[:admin_contacts].each do |x|
             %tr

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

@@ -1,5 +1,4 @@
-- panel_class = @domain.errors.messages[:dnskeys] ? 'panel-danger' : 'panel-default'
-#dnskeys.panel{class: panel_class}
+.panel.panel-default
   .panel-heading.clearfix
     = t(:dnskeys)
   .table-responsive
@@ -17,9 +16,3 @@
             %td= x.protocol
             %td= x.alg
             %td= x.public_key
-      - if @domain.errors.messages[:dnskeys]
-        %tfoot
-          - @domain.errors.messages[:dnskeys].each do |x|
-            %tr
-              %td{colspan: 4}= x
-

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

@@ -1,20 +0,0 @@
-.panel{class: 'panel-default'}
-  .panel-heading.clearfix
-    = t(:keyrelays)
-  .table-responsive
-    %table.table.table-hover.table-bordered.table-condensed
-      %thead
-        %tr
-          %th{class: 'col-xs-4'}= t(:uploaded_at)
-          %th{class: 'col-xs-3'}= t(:expiry)
-          %th{class: 'col-xs-2'}= t(:requester)
-          %th{class: 'col-xs-2'}= t(:accepter)
-          %th{class: 'col-xs-1'}= t(:status)
-      %tbody
-        - @domain.keyrelays.includes([:requester, :accepter]).order(pa_date: :desc).each do |x|
-          %tr
-            %td= link_to(x.pa_date, [:admin, x])
-            %td= x.expiry
-            %td= link_to(x.requester, [:admin, x.requester])
-            %td= link_to(x.accepter, [:admin, x.accepter])
-            %td= x.status

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

@@ -1,5 +1,4 @@
-- panel_class = @domain.errors.messages[:nameservers] ? 'panel-danger' : 'panel-default'
-#nameservers.panel{class: panel_class}
+.panel.panel-default
   .panel-heading.clearfix
     = t(:nameservers)
   .table-responsive
@@ -15,9 +14,3 @@
             %td= x
             %td= x.ipv4
             %td= x.ipv6
-      - if @domain.errors.messages[:nameservers]
-        %tfoot
-          - @domain.errors.messages[:nameservers].each do |x|
-            %tr
-              %td{colspan: 3}= x
-

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

@@ -4,7 +4,7 @@
   .panel-body
     %dl.dl-horizontal
       %dt= t(:name)
-      %dd= link_to(@domain.registrant, [:admin, @domain.registrant])
+      %dd= link_to @domain.registrant, admin_contact_path(@domain.registrant)
 
       %dt= t(:id)
       %dd= @domain.registrant.code

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

@@ -1,5 +1,6 @@
-- panel_class = @domain.errors.messages[:tech_contacts] ? 'panel-danger' : 'panel-default'
-#tech_contacts.panel{class: panel_class}
+- tech_contacts_invalid = @domain.errors.include?(:tech_contacts)
+- panel_class = tech_contacts_invalid ? 'panel-danger' : 'panel-default'
+.panel{class: panel_class}
   .panel-heading.clearfix
     = t('.title')
   .table-responsive
@@ -15,7 +16,7 @@
             %td= link_to(tc, admin_contact_path(tc))
             %td= tc.code
             %td= tc.email
-      - if @domain.errors.messages[:tech_contacts]
+      - if tech_contacts_invalid
         %tfoot
           - @domain.errors.messages[:tech_contacts].each do |x|
             %tr

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

@@ -57,12 +57,6 @@
     </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:

app/views/admin/epp_logs/index.haml

@@ -8,10 +8,10 @@
         .col-md-3
           .form-group
             = f.label :request_command
-            = f.select :request_command_eq, [[t(:choose),''], 'hello', 'login', 'logout', 'info', 'create', 'update', 'delete', 'check', 'renew', 'transfer', 'poll', 'keyrelay'], {}, class: 'form-control selectize', placeholder: t(:choose)
+            = f.select :request_command_eq, [[t(:choose),''], 'hello', 'login', 'logout', 'info', 'create', 'update', 'delete', 'check', 'renew', 'transfer', 'poll'], {}, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
-            - opts  = [[t(:choose),''], 'contact', 'domain', 'poll', 'keyrelay']
+            - opts  = [[t(:choose),''], 'contact', 'domain', 'poll']
             - opts += [params[:q][:request_object_cont]] if params[:q].present? && params[:q][:request_object_cont].present?
             = f.label :request_object
             = f.select :request_object_cont, opts, {}, class: 'form-control selectize_create', placeholder: t(:choose)

app/views/admin/invoices/show.haml

@@ -21,3 +21,5 @@
   .col-md-6= render 'registrar/invoices/partials/buyer'
 .row
   .col-md-12= render 'registrar/invoices/partials/items'
+.row
+  .col-md-12= render 'registrar/invoices/partials/payment_orders'

app/views/admin/keyrelays/index.haml

@@ -1,42 +0,0 @@
-= render 'shared/title', name: t(:keyrelays)
-
-.row
-  .col-md-12
-    = search_form_for [:admin, @q], html: { class: 'form-horizontal' } do |f|
-      .col-md-11
-        .form-group
-          = f.search_field :domain_name_cont, class: 'form-control', placeholder: t(:domain_name)
-      .col-md-1.text-right.text-center-xs
-        .form-group
-          %button.btn.btn-primary
-             
-            %span.glyphicon.glyphicon-search
-             
-%hr
-.row
-  .col-md-12
-    .table-responsive
-      %table.table.table-hover.table-bordered.table-condensed
-        %thead
-          %tr
-            %th{class: 'col-xs-4'}
-              = sort_link(@q, 'pa_date', t(:uploaded_at))
-            %th{class: 'col-xs-3'}
-              = t(:expiry)
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'requester_name', t(:requester))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'accepter_name', t(:accepter))
-            %th{class: 'col-xs-1'}
-              = t(:status)
-        %tbody
-          - @keyrelays.each do |x|
-            %tr
-              %td= link_to(x.pa_date, [:admin, x])
-              %td= x.expiry
-              %td= link_to(x.requester, [:admin, x.requester])
-              %td= link_to(x.accepter, [:admin, x.accepter])
-              %td= x.status
-.row
-  .col-md-12
-    = paginate @keyrelays

app/views/admin/keyrelays/show.haml

@@ -1,61 +0,0 @@
-= render 'shared/title', name: t(:keyrelay_details)
-
-.row
-  .col-md-12
-    .panel.panel-default
-      .panel-heading
-        %h3.panel-title= t(:keyrelay)
-      .panel-body{style: 'word-wrap: break-word;'}
-        %dl.dl-horizontal
-          %dt= t(:uploaded_at)
-          %dd= @keyrelay.pa_date
-
-          %dt= t(:domain)
-          %dd= link_to(@keyrelay.domain, [:admin, @keyrelay.domain])
-
-          %dt= t(:status)
-          %dd= @keyrelay.status
-
-          %dt= t(:flag)
-          %dd= @keyrelay.key_data_flags
-
-          %dt= t(:protocol)
-          %dd= @keyrelay.key_data_protocol
-
-          %dt= t(:algorithm)
-          %dd= @keyrelay.key_data_alg
-
-          %dt= t(:public_key)
-          %dd= @keyrelay.key_data_public_key
-
-          %dt= t(:authinfo_pw)
-          %dd= @keyrelay.auth_info_pw
-
-          %dt= t(:expiry_relative)
-          %dd= @keyrelay.expiry_relative
-
-          %dt= t(:expiry_absolute)
-          %dd= @keyrelay.expiry_absolute
-
-          %dt= t(:requester)
-          %dd= link_to(@keyrelay.requester, [:admin, @keyrelay.requester])
-
-          %dt= t(:accepter)
-          %dd= link_to(@keyrelay.accepter, [:admin, @keyrelay.accepter])
-
-.row
-  .col-md-12
-    .panel.panel-default
-      .panel-heading.clearfix
-        = t(:legal_documents)
-      .table-responsive
-        %table.table.table-hover.table-bordered.table-condensed
-          %thead
-            %tr
-              %th{class: 'col-xs-8'}= t(:created_at)
-              %th{class: 'col-xs-4'}= t(:type)
-          %tbody
-            - @keyrelay.legal_documents.each do |x|
-              %tr
-                %td= link_to(x.created_at, [:admin, x])
-                %td= x.document_type

app/views/admin/registrars/_form.html.erb

@@ -91,6 +91,24 @@
                             <%= f.check_box :test_registrar, class: 'form-control' %>
                         </div>
                     </div>
+
+                    <div class="form-group">
+                        <div class="col-md-4 control-label">
+                            <%= f.label t('.legaldoc_optout') %>
+                        </div>
+                        <div class="col-md-7">
+                            <%= f.check_box :legaldoc_optout, class: 'form-control' %>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="col-md-4 control-label">
+                            <%= f.label t('.legaldoc_optout_comment') %>
+                        </div>
+                        <div class="col-md-7">
+                            <%= f.text_area :legaldoc_optout_comment, class: 'form-control', rows: 3 %>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>

app/views/admin/registrars/index.html.erb

@@ -28,6 +28,9 @@
                     <th class="col-xs-4">
                         <%= t(:test_registrar) %>
                     </th>
+                    <th class="col-xs-4">
+                        <%= t(:emails) %>
+                    </th>
                 </tr>
                 </thead>
                 <tbody>
@@ -45,6 +48,12 @@
                         <td>
                             <%= "#{x.test_registrar}" %>
                         </td>
+                        <td>
+                            <%= verified_email_span(x.email_verification) %>
+                            <% if x[:billing_email].present? %>
+                                <%= verified_email_span(x.billing_email_verification) %>
+                            <% end %>
+                        </td>
                     </tr>
                 <% end %>
                 </tbody>

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

@@ -39,7 +39,7 @@
 
 <div class="row">
     <div class="col-md-12">
-        <%= render 'admin/registrars/show/users', registrar: @registrar %>
+        <%= render 'admin/registrars/show/api_users', registrar: @registrar %>
     </div>
 </div>
 

app/views/admin/registrars/show/_api_users.html.erb

@@ -12,10 +12,10 @@
         </thead>
 
         <tbody>
-            <% registrar.api_users.each do |user| %>
+            <% registrar.api_users.each do |api_user| %>
                 <tr>
-                    <td><%= link_to(user, [:admin, user]) %></td>
-                    <td><%= user.active %></td>
+                    <td><%= link_to api_user, admin_registrar_api_user_path(api_user.registrar, api_user) %></td>
+                    <td><%= api_user.active %></td>
                 </tr>
             <% end %>
         </tbody>

app/views/admin/registrars/show/_billing.html.erb

@@ -15,7 +15,9 @@
             <dd><%= registrar.accounting_customer_code %></dd>
 
             <dt><%= Registrar.human_attribute_name :billing_email %></dt>
-            <dd><%= registrar.billing_email %></dd>
+            <dd>
+                <%= verified_email_span(registrar.billing_email_verification) %>
+            </dd>
 
             <dt><%= Registrar.human_attribute_name :reference_no %></dt>
             <dd><%= registrar.reference_no %></dd>
@@ -24,4 +26,4 @@
             <dd><%= registrar.iban %></dd>
         </dl>
     </div>
-</div>
+</div>

app/views/admin/registrars/show/_contacts.html.erb

@@ -15,7 +15,9 @@
             <dd><%= @registrar.phone %></dd>
 
             <dt><%= Registrar.human_attribute_name :email %></dt>
-            <dd><%= @registrar.email %></dd>
+            <dd>
+                <%= verified_email_span(@registrar.email_verification) %>
+            </dd>
         </dl>
     </div>
-</div>
+</div>

app/views/admin/sessions/new.html.erb

@@ -16,14 +16,8 @@
                              required: true,
                              class: 'form-control' %>
 
-        <% if devise_mapping.rememberable? -%>
-            <div class="checkbox">
-                <label><%= f.check_box :remember_me %> <%= t '.remember_checkbox' %> %></label>
-            </div>
-        <% end -%>
-
         <%= f.submit t('.sign_in_btn'), class: 'btn btn-lg btn-primary btn-block' %>
     <% end %>
 </div>
 
-<%= render 'links' %>
+<%= render 'links' %>

app/views/admin/settings/index.haml

@@ -22,6 +22,7 @@
           = render 'setting_row', var: :ns_min_count
           = render 'setting_row', var: :ns_max_count
           = render 'setting_row', var: :expire_pending_confirmation
+          = render 'setting_row', var: :legal_document_is_mandatory
 
   .panel.panel-default
     .panel-heading
@@ -48,7 +49,7 @@
           = render 'setting_row', var: :request_confrimation_on_registrant_change_enabled
           = render 'setting_row', var: :request_confirmation_on_domain_deletion_enabled
           = render 'setting_row', var: :address_processing
-
+          = render 'setting_row', var: :dispute_period_in_months
           %tr
             %td.col-md-6= label_tag :default_language
             %td.col-md-6

app/views/epp/contacts/_disclosure_policy.xml.builder

@@ -1,9 +0,0 @@
-if @disclosure_policy
-  @disclosure_policy.each do |k,v|
-    xml.tag!('contact:disclose', 'flag' => k) do
-      v.each do |attr|
-        xml.tag!("contact:#{attr}")
-      end
-    end
-  end
-end

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

@@ -65,17 +65,11 @@ xml.epp_head do
           xml.tag!('contact:upID', upID) if upID.present? # optional upID
           xml.tag!('contact:upDate', @contact.updated_at.try(:iso8601))
         end
-        # xml.tag!('contact:trDate', '123') if false
         if can? :view_password, @contact, @password
           xml.tag!('contact:authInfo') do
-           xml.tag!('contact:pw', @contact.auth_info)
-          end
-        else
-          xml.tag!('contact:authInfo') do
-          xml.tag!('contact:pw', 'No access')
+            xml.tag!('contact:pw', @contact.auth_info)
           end
         end
-        # xml << render('/epp/contacts/disclosure_policy')
       end
     end
     if can? :view_full_info, @contact, @password

app/views/epp/poll/poll_keyrelay.xml.builder

@@ -1,49 +0,0 @@
-xml.instruct!(:xml, standalone: 'no')
-xml.epp(
-  'xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd',
-  'xmlns:secDNS' => 'urn:ietf:params:xml:ns:secDNS-1.1',
-  'xmlns:domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd',
-  'xmlns:keyrelay' => 'urn:ietf:params:xml:ns:keyrelay-1.0'
-) do
-  xml.response do
-    xml.result('code' => '1301') do
-      xml.msg 'Command completed successfully; ack to dequeue'
-    end
-
-    xml.tag!('msgQ', 'count' => current_user.unread_notifications.count, 'id' => @notification.id) do
-      xml.qDate @notification.created_at.try(:iso8601)
-      xml.msg @notification.text
-    end
-
-    xml.resData do
-      xml.tag!('keyrelay:response') do
-        xml.tag!('keyrelay:panData') do
-          xml.tag!('keyrelay:name', @object.domain_name)
-          xml.tag!('keyrelay:paDate', @object.pa_date.try(:iso8601))
-
-          xml.tag!('keyrelay:keyData') do
-            xml.tag!('secDNS:flags',  @object.key_data_flags)
-            xml.tag!('secDNS:protocol',  @object.key_data_protocol)
-            xml.tag!('secDNS:alg',  @object.key_data_alg)
-            xml.tag!('secDNS:pubKey',  @object.key_data_public_key)
-          end
-
-
-          xml.tag!('keyrelay:authInfo') do
-            xml.tag!('domain:pw',  @object.auth_info_pw)
-          end
-
-          xml.tag!('keyrelay:expiry') do
-            xml.tag!('keyrelay:relative',  @object.expiry_relative)
-            xml.tag!('keyrelay:absolute',  @object.expiry_absolute)
-          end
-
-          xml.tag!('keyrelay:reID', @object.requester)
-          xml.tag!('keyrelay:acID', @object.accepter)
-        end
-      end
-    end
-
-    render('epp/shared/trID', builder: xml)
-  end
-end

app/views/epp/sessions/greeting.xml.builder

@@ -8,7 +8,6 @@ xml.epp_head do
       xml.objURI 'https://epp.tld.ee/schema/domain-eis-1.0.xsd'
       xml.objURI 'https://epp.tld.ee/schema/contact-ee-1.1.xsd'
       xml.objURI 'urn:ietf:params:xml:ns:host-1.0'
-      xml.objURI 'urn:ietf:params:xml:ns:keyrelay-1.0'
       xml.svcExtension do
         xml.extURI 'urn:ietf:params:xml:ns:secDNS-1.1'
         xml.extURI 'https://epp.tld.ee/schema/eis-1.0.xsd'

app/views/kaminari/admin/_first_page.html.haml

@@ -1,11 +0,0 @@
--#  Link to the "First" page
--#  available local variables
--#    url:           url to the first page
--#    current_page:  a page object for the currently displayed page
--#    total_pages:   total number of pages
--#    per_page:      number of items to fetch per page
--#    remote:        data-remote
-%span.first
-  - param_name = current_page.instance_variable_get("@options")[:param_name] || Kaminari.config.param_name
-  - urlik = url_for( params.merge(param_name => 1, :only_path => true))
-  = link_to_unless current_page.first?, t('views.pagination.first').html_safe, urlik, :remote => remote

app/views/kaminari/admin/_gap.html.haml

@@ -1,8 +0,0 @@
--#  Non-link tag that stands for skipped pages...
--#  available local variables
--#    current_page:  a page object for the currently displayed page
--#    total_pages:   total number of pages
--#    per_page:      number of items to fetch per page
--#    remote:        data-remote
-%span.page.gap
-  = t('views.pagination.truncate').html_safe

app/views/kaminari/admin/_last_page.html.haml

@@ -1,9 +0,0 @@
--#  Link to the "Last" page
--#  available local variables
--#    url:           url to the last page
--#    current_page:  a page object for the currently displayed page
--#    total_pages:   total number of pages
--#    per_page:      number of items to fetch per page
--#    remote:        data-remote
-%span.last
-  = link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote

app/views/kaminari/admin/_next_page.html.haml

@@ -1,9 +0,0 @@
--#  Link to the "Next" page
--#  available local variables
--#    url:           url to the next page
--#    current_page:  a page object for the currently displayed page
--#    total_pages:   total number of pages
--#    per_page:      number of items to fetch per page
--#    remote:        data-remote
-%span.next
-  = link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote

app/views/kaminari/admin/_page.html.haml

@@ -1,12 +0,0 @@
--#  Link showing page number
--#  available local variables
--#    page:          a page object for "this" page
--#    url:           url to this page
--#    current_page:  a page object for the currently displayed page
--#    total_pages:   total number of pages
--#    per_page:      number of items to fetch per page
--#    remote:        data-remote
-%span{:class => "page#{' current' if page.current?}"}
-  - param_name = current_page.instance_variable_get("@options")[:param_name] || Kaminari.config.param_name
-  - urlik = url_for( params.merge(param_name => page.to_i, :only_path => true))
-  = link_to_unless page.current?, page, urlik, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}

app/views/kaminari/admin/_paginator.html.haml

@@ -1,18 +0,0 @@
--#  The container tag
--#  available local variables
--#    current_page:  a page object for the currently displayed page
--#    total_pages:   total number of pages
--#    per_page:      number of items to fetch per page
--#    remote:        data-remote
--#    paginator:     the paginator that renders the pagination tags inside
-= paginator.render do
-  %nav.pagination
-    = first_page_tag unless current_page.first?
-    = prev_page_tag unless current_page.first?
-    - each_page do |page|
-      - if page.left_outer? || page.right_outer? || page.inside_window?
-        = page_tag page
-      - elsif !page.was_truncated?
-        = gap_tag
-    = next_page_tag unless current_page.last?
-    = last_page_tag unless current_page.last?

app/views/kaminari/admin/_prev_page.html.haml

@@ -1,11 +0,0 @@
--#  Link to the "Previous" page
--#  available local variables
--#    url:           url to the previous page
--#    current_page:  a page object for the currently displayed page
--#    total_pages:   total number of pages
--#    per_page:      number of items to fetch per page
--#    remote:        data-remote
-%span.prev
-  - param_name = current_page.instance_variable_get("@options")[:param_name] || Kaminari.config.param_name
-  - urlik = url_for( params.merge(param_name => current_page.to_i - 1, :only_path => true))
-  = link_to_unless current_page.first?, t('views.pagination.previous').html_safe, urlik, :rel => 'prev', :remote => remote

app/views/layouts/admin/base.haml

@@ -32,5 +32,5 @@
 
       .footer.text-right
         Version
-        = CURRENT_COMMIT_HASH
+        = current_commit_link
     = javascript_include_tag 'admin-manifest', async: true

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

@@ -41,7 +41,7 @@
                     <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 %>
+                                <% active_class = %w(registrant/domains registrant/check registrant/renew registrant/tranfer).include?(params[:controller]) ? 'active' :nil %>
                                 <li class="<%= active_class %>">
                                     <%= link_to t(:domains), registrant_domains_path %>
                                 </li>
@@ -76,7 +76,7 @@
                     </div>
                     <div class="col-md-6 text-right">
                         Version
-                        <%= CURRENT_COMMIT_HASH %>
+                        <%= current_commit_link %>
                     </div>
                 </div>
             </div>

app/views/layouts/registrar/base.html.erb

@@ -54,7 +54,7 @@
                     </div>
                     <div class="col-md-6 text-right">
                         Version
-                        <%= CURRENT_COMMIT_HASH %>
+                        <%= current_commit_link %>
                     </div>
                 </div>
             </div>

app/views/layouts/registrar/sessions.html.erb

@@ -44,7 +44,7 @@
                 </div>
                 <div class="col-md-6 text-right">
                     Version
-                    <%= CURRENT_COMMIT_HASH %>
+                    <%= current_commit_link %>
                 </div>
             </div>
         </div>

app/views/mailers/domain_delete_mailer/forced/legal_person.html.erb

@@ -2,11 +2,11 @@
 
 <p>Eesti Interneti Sihtasutusele on saanud teatavaks, et juriidiline isik registrikoodiga <%= @registrant.reg_no %> on äriregistrist kustutatud.</p>
 
-<p>Kuna äriregistrist kustutatud juriidiline isik ei saa olla domeeni registreerijaks, algas domeeni <%= @domain.name %> suhtes <%= @redemption_grace_period %> päevane kustutusmenetlus. Menetluse käigus on domeen internetis kättesaadav.</p>
+<p>Kuna äriregistrist kustutatud juriidiline isik ei saa olla domeeni registreerijaks, algas domeeni <%= @domain.name %> suhtes <%= @delete_period_length %> päevane kustutusmenetlus. Menetluse käigus on domeen <%= @expire_warning_period %> esimest päeva internetis kättesaadav.</p>
 
 <p>Domeeni suhtes õigust omaval isikul on võimalus esitada domeeni <%= @domain.name %> registripidajale <%= @registrar.name %> domeeni üleandmise taotlus koos seda tõendava dokumendiga.</p>
 
-<p>Kui üleandmine ei ole <%= @redemption_grace_period %> päeva jooksul toimunud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile <a href="https://auction.internet.ee">.ee oksjonikeskkonda</a>. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe <a href="https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused">siit</a>.</p>
+<p>Kui üleandmine ei ole <%= @delete_period_length %> päeva jooksul toimunud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile <a href="https://auction.internet.ee">.ee oksjonikeskkonda</a>. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe <a href="https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused">siit</a>.</p>
 
 <p>Lisaküsimuste korral võtke palun ühendust oma registripidajaga:</p>
 <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
@@ -19,11 +19,11 @@
 
 <p>Estonian Internet Foundation has learned that the legal person with registry code <%= @registrant.reg_no %> has been deleted from the Business Registry.</p>
 
-<p>As a terminated legal person cannot be the registrant of a domain, a <%= @redemption_grace_period %>-day deletion process has started for the <%= @domain.name %> domain. The domain will remain available on the Internet during the deletion process.</p>
+<p>As a terminated legal person cannot be the registrant of a domain, a <%= @delete_period_length %>-day deletion process has started for the <%= @domain.name %> domain. For the first <%= @expire_warning_period %> days the domain will remain available on the Internet during the deletion process.</p>
 
 <p>The registrant holding a right to the domain name <%= @domain.name %> can submit a domain name transfer application to the registrar <%= @registrar.name %> with legal documentation.</p>
 
-<p>If the transfer is not made within <%= @redemption_grace_period %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the <a href="https://auction.internet.ee">.ee auction portal</a>. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">auction results</a>.</p>
+<p>If the transfer is not made within <%= @delete_period_length %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the <a href="https://auction.internet.ee">.ee auction portal</a>. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">auction results</a>.</p>
 
 <p>Should you have additional questions, please contact your registrar:</p>
 <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
@@ -35,13 +35,13 @@
 
 <p>Целевому учреждению Eesti Internet (EIS) стало известно, что юридическое лицо с регистрационным кодом <%= @registrant.reg_no %> удалено из коммерческого реестра.</p>
 
-<p>Поскольку удаленное из коммерческого регистра юридическое лицо не может являться регистрантом домена, начат <%= @redemption_grace_period %>-дневный процесс удаления домена <%= @domain.name %>. До завершения процесса домен доступен в Интернете.</p>
+<p>Поскольку удаленное из коммерческого регистра юридическое лицо не может являться регистрантом домена, начат <%= @delete_period_length %>-дневный процесс удаления домена <%= @domain.name %>. Домен доступен в интернете на протяжении <%= @expire_warning_period %> дней после начала процесса удаления.</p>
 
-<p>Лицо, обладающее правом на домен, может подать регистратору <%= @registrar.name %> домена <%= @domain.name %> ходатайство о передаче домена, представив вместе с ходатайством подтверждающие документы. Документы должны быть представлены регистратору в течение <%= @redemption_grace_period %> дней.</p>
+<p>Лицо, обладающее правом на домен, может подать регистратору <%= @registrar.name %> домена <%= @domain.name %> ходатайство о передаче домена, представив вместе с ходатайством подтверждающие документы. Документы должны быть представлены регистратору в течение <%= @delete_period_length %> дней.</p>
 
-<p>Если передача не состоится в течение <%= @redemption_grace_period %> дней, <%= @domain.force_delete_date %> домен <%= @domain.name %> отправится на доменный аукцион в <a href="https://auction.internet.ee">аукционной среде .ee</a>. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». Читайте о других возможных <a href="https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione">результатах аукциона</a>.</p>
+<p>Если передача не состоится в течение <%= @delete_period_length %> дней, <%= @domain.force_delete_date %> домен <%= @domain.name %> отправится на доменный аукцион в <a href="https://auction.internet.ee">аукционной среде .ee</a>. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». Читайте о других возможных <a href="https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione">результатах аукциона</a>.</p>
 
 <p>В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:
 <%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %></p>
 
-<%= render 'mailers/shared/signatures/signature.ru.html' %>
+<%= render 'mailers/shared/signatures/signature.ru.html' %>

app/views/mailers/domain_delete_mailer/forced/legal_person.text.erb

@@ -2,11 +2,11 @@ Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt
 
 Eesti Interneti Sihtasutusele on saanud teatavaks, et juriidiline isik registrikoodiga <%= @registrant.reg_no %> on äriregistrist kustutatud.
 
-Kuna äriregistrist kustutatud juriidiline isik ei saa olla domeeni registreerijaks, algas domeeni <%= @domain.name %> suhtes <%= @redemption_grace_period %> päevane kustutusmenetlus. Menetluse käigus on domeen internetis kättesaadav.
+Kuna äriregistrist kustutatud juriidiline isik ei saa olla domeeni registreerijaks, algas domeeni <%= @domain.name %> suhtes <%= @delete_period_length %> päevane kustutusmenetlus. Menetluse käigus on domeen <%= @expire_warning_period %> esimest päeva internetis kättesaadav.
 
 Domeeni suhtes õigust omaval isikul on võimalus esitada domeeni <%= @domain.name %> registripidajale <%= @registrar.name %> domeeni üleandmise taotlus koos seda tõendava dokumendiga.
 
-Kui üleandmine ei ole <%= @redemption_grace_period %> päeva jooksul toimunud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile .ee oksjonikeskkonda https://auction.internet.ee. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused.
+Kui üleandmine ei ole <%= @delete_period_length %> päeva jooksul toimunud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile .ee oksjonikeskkonda https://auction.internet.ee. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused.
 
 Lisaküsimuste korral võtke palun ühendust oma registripidajaga:
 <%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
@@ -19,11 +19,11 @@ Dear registrant/administrative contact of .ee domain,
 
 Estonian Internet Foundation has learned that the legal person with registry code <%= @registrant.reg_no %> has been deleted from the Business Registry.
 
-As a terminated legal person cannot be the registrant of a domain, a <%= @redemption_grace_period %>-day deletion process has started for the <%= @domain.name %> domain. The domain will remain available on the Internet during the deletion process.
+As a terminated legal person cannot be the registrant of a domain, a <%= @delete_period_length %>-day deletion process has started for the <%= @domain.name %> domain. For the first <%= @expire_warning_period %> days the domain will remain available on the Internet during the deletion process.
 
 The registrant holding a right to the domain name <%= @domain.name %> can submit a domain name transfer application to the registrar <%= @registrar.name %> with legal documentation.
 
-If the transfer is not made within <%= @redemption_grace_period %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the .ee auction portal https://auction.internet.ee. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential auction results at https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment.
+If the transfer is not made within <%= @delete_period_length %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the .ee auction portal https://auction.internet.ee. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential auction results at https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment.
 
 Should you have additional questions, please contact your registrar:
 <%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
@@ -36,13 +36,13 @@ Should you have additional questions, please contact your registrar:
 
 Целевому учреждению Eesti Internet (EIS) стало известно, что юридическое лицо с регистрационным кодом <%= @registrant.reg_no %> удалено из коммерческого реестра.
 
-Поскольку удаленное из коммерческого регистра юридическое лицо не может являться регистрантом домена, начат <%= @redemption_grace_period %>-дневный процесс удаления домена <%= @domain.name %>. До завершения процесса домен доступен в Интернете.
+Поскольку удаленное из коммерческого регистра юридическое лицо не может являться регистрантом домена, начат <%= @delete_period_length %>-дневный процесс удаления домена <%= @domain.name %>. Домен доступен в интернете на протяжении <%= @expire_warning_period %> дней после начала процесса удаления.</p>
 
-Лицо, обладающее правом на домен, может подать регистратору <%= @registrar.name %> домена <%= @domain.name %> ходатайство о передаче домена, представив вместе с ходатайством подтверждающие документы. Документы должны быть представлены регистратору в течение <%= @redemption_grace_period %> дней.
+Лицо, обладающее правом на домен, может подать регистратору <%= @registrar.name %> домена <%= @domain.name %> ходатайство о передаче домена, представив вместе с ходатайством подтверждающие документы. Документы должны быть представлены регистратору в течение <%= @delete_period_length %> дней.
 
-Если передача не состоится в течение <%= @redemption_grace_period %> дней, <%= @domain.force_delete_date %> домен <%= @domain.name %> отправится на доменный аукцион в аукционной среде .ee https://auction.internet.ee. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». О других возможных результатах аукциона читайте по ссылке https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione.
+Если передача не состоится в течение <%= @delete_period_length %>дней, <%= @domain.force_delete_date %> домен <%= @domain.name %> отправится на доменный аукцион в аукционной среде .ee https://auction.internet.ee. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». О других возможных результатах аукциона читайте по ссылке https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione.
 
 В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:
 <%= render 'mailers/shared/registrar/registrar.ru.text', registrar: @registrar %>
 
-<%= render 'mailers/shared/signatures/signature.ru.text' %>
+<%= render 'mailers/shared/signatures/signature.ru.text' %>

app/views/mailers/domain_delete_mailer/forced/private_person.html.erb

@@ -2,11 +2,11 @@
 
 <p>Eesti Interneti Sihtasutusele (EIS) on saanud teatavaks, et füüsiline isik isikukoodiga <%= @registrant.id_code %> on surnud ja sellest on möödunud vähemalt 6 kuud.</p>
 
-<p>Kuna surnud isik ei saa olla domeeni registreerijaks, algas domeeni <%= @domain.name %> suhtes <%= @redemption_grace_period %> päevane kustutusmenetlus. Menetluse käigus on domeen internetis kättesaadav.</p>
+<p>Kuna surnud isik ei saa olla domeeni registreerijaks, algas domeeni <%= @domain.name %> suhtes <%= @delete_period_length %> päevane kustutusmenetlus. Menetluse käigus on domeen <%= @expire_warning_period %> esimest päeva internetis kättesaadav.</p></p>
 
-<p>Domeeni suhtes õigust omaval isikul on võimalus esitada domeeni <%= @domain.name %> registripidajale <%= @registrar.name %> domeeni üleandmise taotlus, millele tuleb lisada pärimisõiguse tõend. Dokumentatsioon tuleb esitada registripidajale <%= @redemption_grace_period %> päeva jooksul.</p>
+<p>Domeeni suhtes õigust omaval isikul on võimalus esitada domeeni <%= @domain.name %> registripidajale <%= @registrar.name %> domeeni üleandmise taotlus, millele tuleb lisada pärimisõiguse tõend. Dokumentatsioon tuleb esitada registripidajale <%= @delete_period_length %> päeva jooksul.</p>
 
-<p>Kui üleandmine ei ole <%= @redemption_grace_period %> päeva jooksul toimunud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile <a href="https://auction.internet.ee">.ee oksjonikeskkonda</a>. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe <a href="https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused">siit</a>.</p>
+<p>Kui üleandmine ei ole <%= @delete_period_length %> päeva jooksul toimunud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile <a href="https://auction.internet.ee">.ee oksjonikeskkonda</a>. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe <a href="https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused">siit</a>.</p>
 
 <p>Lisaküsimuste korral võtke palun ühendust oma registripidajaga:</p>
 <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
@@ -19,11 +19,11 @@
 
 <p>Estonian Internet Foundation (EIF) has learned that the natural person with identification code <%= @registrant.id_code %> has been deceased more than 6 months.</p>
 
-<p>The registrant holding a right to the domain name <%= @domain.name %> can submit a domain name transfer application to the registrar <%= @registrar.name %>.The application must be submitted together with succession evidence certifying the acquisition of the domain. The relevant documents should be submitted to the registrar within <%= @redemption_grace_period %> days.</p>
+<p>The registrant holding a right to the domain name <%= @domain.name %> can submit a domain name transfer application to the registrar <%= @registrar.name %>.The application must be submitted together with succession evidence certifying the acquisition of the domain. The relevant documents should be submitted to the registrar within <%= @delete_period_length %> days.</p>
 
-<p>As a deceased natural person can not be the registrant of a domain, a <%= @redemption_grace_period %>-day deletion process of <%= @domain.name %> domain has started.  The domain will remain available on the Internet during the deletion process.</p>
+<p>As a deceased natural person can not be the registrant of a domain, a <%= @delete_period_length %>-day deletion process of <%= @domain.name %> domain has started. For the first <%= @expire_warning_period %> days the domain will remain available on the Internet during the deletion process. </p>
 
-<p>If the transfer is not made within <%= @redemption_grace_period %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the <a href="https://auction.internet.ee">.ee auction environment</a>. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">auction results</a>.</p>
+<p>If the transfer is not made within <%= @delete_period_length %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the <a href="https://auction.internet.ee">.ee auction environment</a>. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">auction results</a>.</p>
 
 <p>Should you have additional questions, please contact your registrar:</p>
 <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
@@ -36,13 +36,13 @@
 
 <p>Целевому учреждению Eesti Internet (EIS) стало известно, что физическое лицо с личным кодом <%= @registrant.id_code %> умерло, и с момента смерти прошло не менее 6 месяцев.</p>
 
-<p>Поскольку умершее лицо не может являться регистрантом домена, начат <%= @redemption_grace_period %>-дневный процесс удаления домена <%= @domain.name %>. До завершения процесса домен доступен в Интернете.</p>
+<p>Поскольку умершее лицо не может являться регистрантом домена, начат <%= @delete_period_length %>-дневный процесс удаления домена <%= @domain.name %>. Домен доступен в интернете на протяжении <%= @expire_warning_period %> дней после начала процесса удаления.</p>
 
-<p>Лицо, обладающее правом на домен, может подать регистратору <%= @registrar.name %> домена <%= @domain.name %> ходатайство о передаче, представив справку о праве наследования. Документы должны быть представлены регистратору в течение <%= @redemption_grace_period %> дней.</p>
+<p>Лицо, обладающее правом на домен, может подать регистратору <%= @registrar.name %> домена <%= @domain.name %> ходатайство о передаче, представив справку о праве наследования. Документы должны быть представлены регистратору в течение <%= @delete_period_length %> дней.</p>
 
-<p>Если передача не состоится в течение <%= @redemption_grace_period %> дней, <%= @domain.force_delete_date %> домен <%= @domain.name %> отправится на доменный аукцион в <a href="https://auction.internet.ee">аукционной среде .ee</a>. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». Читайте о других возможных <a href="https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione">результатах аукциона</a>.</p>
+<p>Если передача не состоится в течение <%= @delete_period_length %> дней, <%= @domain.force_delete_date %> домен <%= @domain.name %> отправится на доменный аукцион в <a href="https://auction.internet.ee">аукционной среде .ee</a>. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». Читайте о других возможных <a href="https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione">результатах аукциона</a>.</p>
 
 <p>В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:</p>
 <%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %>
 
-<%= render 'mailers/shared/signatures/signature.ru.html' %>
+<%= render 'mailers/shared/signatures/signature.ru.html' %>

app/views/mailers/domain_delete_mailer/forced/private_person.text.erb

@@ -2,11 +2,11 @@ Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt
 
 Eesti Interneti Sihtasutusele (EIS) on saanud teatavaks, et füüsiline isik isikukoodiga <%= @registrant.id_code %> on surnud ja sellest on möödunud vähemalt 6 kuud.
 
-Kuna surnud isik ei saa olla domeeni registreerijaks, algas domeeni <%= @domain.name %> suhtes <%= @redemption_grace_period %> päevane kustutusmenetlus. Menetluse käigus on domeen internetis kättesaadav.
+Kuna surnud isik ei saa olla domeeni registreerijaks, algas domeeni <%= @domain.name %> suhtes <%= @delete_period_length %> päevane kustutusmenetlus. Menetluse käigus on domeen <%= @expire_warning_period %> esimest päeva internetis kättesaadav.
 
-Domeeni suhtes õigust omaval isikul on võimalus esitada domeeni <%= @domain.name %> registripidajale <%= @registrar.name %> domeeni üleandmise taotlus, millele tuleb lisada pärimisõiguse tõend. Dokumentatsioon tuleb esitada registripidajale <%= @redemption_grace_period %> päeva jooksul.
+Domeeni suhtes õigust omaval isikul on võimalus esitada domeeni <%= @domain.name %> registripidajale <%= @registrar.name %> domeeni üleandmise taotlus, millele tuleb lisada pärimisõiguse tõend. Dokumentatsioon tuleb esitada registripidajale <%= @delete_period_length %> päeva jooksul.
 
-Kui üleandmine ei ole <%= @redemption_grace_period %> päeva jooksul toimunud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile .ee oksjonikeskkonda https://auction.internet.ee. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused.
+Kui üleandmine ei ole <%= @delete_period_length %> päeva jooksul toimunud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile .ee oksjonikeskkonda https://auction.internet.ee. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused.
 
 Lisaküsimuste korral võtke palun ühendust oma registripidajaga:
 <%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
@@ -19,11 +19,11 @@ Dear registrant/administrative contact of <%= @domain.name %> domain
 
 Estonian Internet Foundation (EIF) has learned that the natural person with identification code <%= @registrant.id_code %> has been deceased more than 6 months.
 
-The registrant holding a right to the domain name <%= @domain.name %> can submit a domain name transfer application to the registrar <%= @registrar.name %>.The application must be submitted together with succession evidence certifying the acquisition of the domain. The relevant documents should be submitted to the registrar within <%= @redemption_grace_period %> days.
+The registrant holding a right to the domain name <%= @domain.name %> can submit a domain name transfer application to the registrar <%= @registrar.name %>.The application must be submitted together with succession evidence certifying the acquisition of the domain. The relevant documents should be submitted to the registrar within <%= @delete_period_length %> days.
 
-As a deceased natural person can not be the registrant of a domain, a <%= @redemption_grace_period %>-day deletion process of <%= @domain.name %> domain has started.  The domain will remain available on the Internet during the deletion process.
+As a deceased natural person can not be the registrant of a domain, a <%= @delete_period_length %>-day deletion process of <%= @domain.name %> domain has started. For the first <%= @expire_warning_period %> days the domain will remain available on the Internet during the deletion process.
 
-If the transfer is not made within <%= @redemption_grace_period %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the .ee auction environment at https://auction.internet.ee. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential auction results at https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment.
+If the transfer is not made within <%= @delete_period_length %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the .ee auction environment at https://auction.internet.ee. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential auction results at https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment.
 
 Should you have additional questions, please contact your registrar:
 <%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
@@ -36,13 +36,13 @@ Should you have additional questions, please contact your registrar:
 
 Целевому учреждению Eesti Internet (EIS) стало известно, что физическое лицо с личным кодом <%= @registrant.id_code %> умерло, и с момента смерти прошло не менее 6 месяцев.
 
-Поскольку умершее лицо не может являться регистрантом домена, начат <%= @redemption_grace_period %>-дневный процесс удаления домена <%= @domain.name %>. До завершения процесса домен доступен в Интернете.
+Поскольку умершее лицо не может являться регистрантом домена, начат <%= @delete_period_length %>-дневный процесс удаления домена <%= @domain.name %>. Домен доступен в интернете на протяжении <%= @expire_warning_period %> дней после начала процесса удаления.
 
-Лицо, обладающее правом на домен, может подать регистратору <%= @registrar.name %> домена <%= @domain.name %> ходатайство о передаче, представив справку о праве наследования. Документы должны быть представлены регистратору в течение <%= @redemption_grace_period %> дней.
+Лицо, обладающее правом на домен, может подать регистратору <%= @registrar.name %> домена <%= @domain.name %> ходатайство о передаче, представив справку о праве наследования. Документы должны быть представлены регистратору в течение <%= @delete_period_length %> дней.
 
-Если передача не состоится в течение <%= @redemption_grace_period %> дней, <%= @domain.force_delete_date %> домен <%= @domain.name %> отправится на доменный аукцион в аукционной среде .ee https://auction.internet.ee. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». О других возможных результатах аукциона читайте по ссылке https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione.
+Если передача не состоится в течение <%= @delete_period_length %>дней, <%= @domain.force_delete_date %> домен <%= @domain.name %> отправится на доменный аукцион в аукционной среде .ee https://auction.internet.ee. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». О других возможных результатах аукциона читайте по ссылке https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione.
 
 В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:
 <%= render 'mailers/shared/registrar/registrar.ru.text', registrar: @registrar %>
 
-<%= render 'mailers/shared/signatures/signature.ru.text' %>
+<%= render 'mailers/shared/signatures/signature.ru.text' %>

app/views/mailers/domain_expire_mailer/expired.html.erb

@@ -2,9 +2,11 @@
 
 <p>Lugupeetud .ee domeeni registreerija/halduskontakt</p>
 
-<p>Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Domeen <%= @domain.name %> on <%= @domain.delete_date %> domeenioksjonil .ee <a href="https://oksjon.internet.ee">oksjonikeskkonnas</a>. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe <a href="https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused">siit</a>.</p>
+<p>Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Registreeringu pikendamiseks pöörduge palun oma registripidaja poole.</p>
 
-<p>Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja poole:</p>
+<p><%= @domain.name %> pikendamata jätmisel domeen kustub ja läheb <%= @domain.delete_date %> oksjonile .ee oksjonikeskkonda. Domeenioksjonite kohta loe lähemalt <a href="https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused">siit</a>.</p>
+
+<p>Domeeni <%= @domain.name %> registripidaja:</p>
 <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
 
 <p>Ülevaate kõikidest endaga seotud domeenidest saate <a href="https://registrant.internet.ee/registrant/">registreerija portaalist</a>.</p>
@@ -17,9 +19,11 @@
 
 <p>Dear registrant/administrative contact of .ee domain,</p>
 
-<p>The domain name <%= @domain.name %> has expired and since <%= @domain.on_hold_date %> is no longer available on the Internet. The domain <%= @domain.name %> will be available for domain auction on <%= @domain.delete_date %> in the .ee <a href="https://auction.internet.ee">auction portal</a>. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">auction results</a>.</p>
+<p>The domain name <%= @domain.name %> has expired and since <%= @domain.on_hold_date %> is no longer available on the Internet. To renew your domain registration, please contact your registrar.</p>
 
-<p>To renew your domain registration, please contact your registrar:</p>
+<p>If you do not renew the <%= @domain.name %> domain registration, it is deleted and put on auction to .ee domain auction environment at <%= @domain.delete_date %>. Read more about .ee domain auctions <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">here</a>.</p>
+
+<p>Registrar of the <%= @domain.name %>:</p>
 <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
 
 <p>You can find an overview of all your domains at the <a href="https://registrant.internet.ee/registrant/">registrant's portal</a>.</p>
@@ -32,11 +36,13 @@
 
 <p>Уважаемый регистрант/административный контакт домена .ee</p>
 
-<p>Срок действия доменного имени <%= @domain.name %> истек, и с <%= @domain.on_hold_date %> оно больше не доступно в интернете. <%= @domain.delete_date %> домен <%= @domain.name %> будет представлен на доменном аукционе в <a href="https://oksjon.internet.ee">аукционной среде .ee</a>. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». Читайте о других возможных <a href="https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione">результатах аукциона</a>.</p>
+<p>Срок действия доменного имени <%= @domain.name %> истек, и с <%= @domain.on_hold_date %> оно больше не доступно в интернете. Для продления регистрации домена обратитесь пожалуйста к своему регистратору.</p>
 
-<p>Для продления регистрации домена обратитесь, пожалуйста, к своему регистратору:</p>
+<p>Если доменное имя не продлено, домен <%= @domain.name %> будет удален и <%= @domain.delete_date %> идет на аукцион в .ee среду аукциона. О других возможных результатах аукциона читайте <a href="https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione">здесь</a>.</p>
+
+<p>Pегистратор домена <%= @domain.name %>:</p>
 <%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %>
 
 <p>Обзор всех связанных с вами доменов можете получить на <a href="https://registrant.internet.ee/registrant/">портале регистратора.</a></p>
 
-<%= render 'mailers/shared/signatures/signature.ru.html' %>
+<%= render 'mailers/shared/signatures/signature.ru.html' %>

app/views/mailers/domain_expire_mailer/expired.text.erb

@@ -2,9 +2,11 @@ Domeen <%= @domain.name %> on aegunud
 
 Lugupeetud .ee domeeni registreerija/halduskontakt
 
-Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Domeen <%= @domain.name %> on <%= @domain.delete_date %> domeenioksjonil .ee https://oksjon.internet.ee. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe siit https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused.
+Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Registreeringu pikendamiseks pöörduge palun oma registripidaja poole.
 
-Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja poole:
+<%= @domain.name %> pikendamata jätmisel domeen kustub ja läheb <%= @domain.delete_date %> oksjonile .ee oksjonikeskkonda. Domeenioksjonite kohta loe lähemalt siit https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused.
+
+Domeeni <%= @domain.name %> registripidaja:
 <%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
 
 Ülevaate kõikidest endaga seotud domeenidest saate registreerija portaalist https://registrant.internet.ee/registrant/.
@@ -17,9 +19,11 @@ Domain <%= @domain.name %> has expired
 
 Dear registrant/administrative contact of .ee domain,
 
-The domain name <%= @domain.name %> has expired and since <%= @domain.on_hold_date %> is no longer available on the Internet. The domain <%= @domain.name %> will be available for domain auction on <%= @domain.delete_date %> in the .ee auction portal at https://auction.internet.ee. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential auction results at https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment.
+The domain name <%= @domain.name %> has expired and since <%= @domain.on_hold_date %> is no longer available on the Internet. To renew your domain registration, please contact your registrar.
 
-To renew your domain registration, please contact your registrar:
+If you do not renew the <%= @domain.name %> domain registration, it is deleted and put on auction to .ee domain auction environment at <%= @domain.delete_date %>. Read more about other potential auction results at https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment.
+
+Registrar of the <%= @domain.name %>:
 <%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
 
 You can find an overview of all your domains at the registrant's portal https://registrant.internet.ee/registrant/.
@@ -32,11 +36,13 @@ You can find an overview of all your domains at the registrant's portal https://
 
 Уважаемый регистрант/административный контакт домена .ee
 
-Срок действия доменного имени <%= @domain.name %> истек, и с <%= @domain.on_hold_date %> оно больше не доступно в интернете. <%= @domain.delete_date %> домен <%= @domain.name %> будет представлен на доменном аукционе в аукционной среде .ee https://oksjon.internet.ee. Если в течение 24 часов в отношении домена <%= @domain.name %> не поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». О других возможных результатах аукциона читайте по ссылке https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione.
+Срок действия доменного имени <%= @domain.name %> истек, и с <%= @domain.on_hold_date %> оно больше не доступно в интернете. Для продления регистрации домена обратитесь пожалуйста к своему регистратору.
 
-Для продления регистрации домена обратитесь, пожалуйста, к своему регистратору:
+Если доменное имя не продлено, домен <%= @domain.name %> будет удален и <%= @domain.delete_date %> идет на аукцион в .ee среду аукциона. О других возможных результатах аукциона читайте здесь https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione.
+
+Pегистратор домена <%= @domain.name %>:
 <%= render 'mailers/shared/registrar/registrar.ru.text', registrar: @registrar %>
 
 Обзор всех связанных с вами доменов можете получить на портале регистратора https://registrant.internet.ee/registrant/
 
-<%= render 'mailers/shared/signatures/signature.ru.text' %>
+<%= render 'mailers/shared/signatures/signature.ru.text' %>

app/views/registrant/contacts/show/_domains.html.erb

@@ -1,4 +1,5 @@
-<% domains = contact.all_domains(page: params[:domain_page], per: 20, params: params) %>
+<% domains = contact.all_domains(page: params[:domain_page], per: 20,
+                                 params: domain_filter_params.to_h, requester: @requester_contact) %>
 
 <div class="panel panel-default">
     <div class="panel-heading">
@@ -50,4 +51,4 @@
     <div class="panel-footer">
         <%= paginate domains, param_name: :domain_page %>
     </div>
-</div>
+</div>

app/views/registrant/domains/download_list.haml

@@ -1,28 +0,0 @@
-!!!
-%html
-  %head
-    %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
-      %title Contacts
-  %body
-  .col-md-12
-    .table-responsive
-      %table.table.table-hover.table-bordered.table-condensed
-        %thead
-          %tr
-            %th{class: 'col-xs-2'}
-              =t(:name)
-            %th{class: 'col-xs-2'}
-              =t('.registrant')
-            %th{class: 'col-xs-2'}
-              =t(:valid_to)
-            %th{class: 'col-xs-2'}
-              =t(:registrar_name)
-        %tbody
-          - @domains.result.each do |x|
-            %tr
-              %td= x.name
-              %td= x.registrant
-              %td= l(x.valid_to, format: :short)
-              %td= x.registrar
-            .row
-    .col-md-6

app/views/registrant/domains/index.html.erb

@@ -18,6 +18,13 @@
                         <%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
                     </div>
                 </div>
+
+                <div class="col-md-3">
+                    <div class="form-group">
+                        <%= label_tag t(:results_per_page) %>
+                        <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+                    </div>
+                </div>
             </div>
             <div class="row">
                 <div class="col-md-3">
@@ -32,43 +39,27 @@
                         <%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until) %>
                     </div>
                 </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <%= label_tag t(:results_per_page) %>
-                        <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
-                    </div>
-                </div>
+            </div>
 
-                <div class="col-md-3 actions">
-                    <button class="btn btn-primary">
+            <div class="row">
+                <div class="col-md-12 text-right">
+                    <button class="btn btn-primary search">
                         &nbsp;
                         <span class="glyphicon glyphicon-search"></span>
                         &nbsp;
                     </button>
-                    <%= link_to(t('.reset_btn'), registrant_domains_path, class: 'btn btn-default') %>
+                    <%= button_tag t('.download_pdf_btn'),
+                                   formaction: registrant_domains_path(format: :pdf),
+                                   name: nil,
+                                   class: 'btn btn-default' %>
+                    <%= button_tag t('.download_csv_btn'),
+                                   formaction: registrant_domains_path(format: :csv),
+                                   name: nil,
+                                   class: 'btn btn-default' %>
+                    <%= link_to t('.reset_btn'), registrant_domains_path,
+                                class: 'btn btn-default' %>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-md-3">
-                    <div class="btn-group" role="group">
-                        <button aria-expanded="false" aria-haspopup="true" class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
-                            Download
-                            <span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <%= link_to 'PDF', download_list_registrant_domains_path(q: params[:q], format: "pdf") %>
-                            </li>
-                            <li>
-                                <%= link_to 'CSV', download_list_registrant_domains_path(q: params[:q], format: "csv") %>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-                <div class="col-md-3"></div>
-                <div class="col-md-3"></div>
-                <div class="col-md-3"></div>
-            </div>
         <% end %>
     </div>
 </div>

app/views/registrant/domains/list_pdf.html.erb

@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<body>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="table-responsive">
+                <table class="table table-hover table-bordered table-condensed">
+                    <thead>
+                        <tr>
+                            <th class="col-xs-2"><%= Domain.human_attribute_name :name %></th>
+                            <th class="col-xs-2"><%= Registrant.model_name.human %></th>
+                            <th class="col-xs-2"><%= Domain.human_attribute_name :valid_to %></th>
+                            <th class="col-xs-2"><%= Registrar.model_name.human %></th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        <% @domains.each do |domain| %>
+                            <tr>
+                                <td><%= domain.name %></td>
+                                <td><%= domain.registrant %></td>
+                                <td><%= l(domain.valid_to, format: :short) %></td>
+                                <td><%= domain.registrar %></td>
+                            </tr>
+                        <% end %>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

app/views/registrant/domains/partials/_dnskeys.haml

@@ -1,5 +1,4 @@
-- panel_class = @domain.errors.messages[:dnskeys] ? 'panel-danger' : 'panel-default'
-#dnskeys.panel{class: panel_class}
+.panel.panel-default
   .panel-heading.clearfix
     = t(:dnskeys)
   .table-responsive
@@ -17,9 +16,3 @@
             %td= x.protocol
             %td= x.alg
             %td= x.public_key
-      - if @domain.errors.messages[:dnskeys]
-        %tfoot
-          - @domain.errors.messages[:dnskeys].each do |x|
-            %tr
-              %td{colspan: 4}= x
-

app/views/registrant/domains/partials/_keyrelays.haml

@@ -1,20 +0,0 @@
-.panel{class: 'panel-default'}
-  .panel-heading.clearfix
-    = t(:keyrelays)
-  .table-responsive
-    %table.table.table-hover.table-bordered.table-condensed
-      %thead
-        %tr
-          %th{class: 'col-xs-4'}= t(:uploaded_at)
-          %th{class: 'col-xs-3'}= t(:expiry)
-          %th{class: 'col-xs-2'}= t(:requester)
-          %th{class: 'col-xs-2'}= t(:accepter)
-          %th{class: 'col-xs-1'}= t(:status)
-      %tbody
-        - @domain.keyrelays.includes([:requester, :accepter]).order(pa_date: :desc).each do |x|
-          %tr
-            %td= link_to(x.pa_date, [:registrar, x])
-            %td= x.expiry
-            %td= link_to(x.requester, [:registrar, x.requester])
-            %td= link_to(x.accepter, [:registrar, x.accepter])
-            %td= x.status

app/views/registrant/domains/partials/_nameservers.haml

@@ -1,5 +1,4 @@
-- panel_class = @domain.errors.messages[:nameservers] ? 'panel-danger' : 'panel-default'
-#nameservers.panel{class: panel_class}
+.panel.panel-default
   .panel-heading.clearfix
     = t(:nameservers)
   .table-responsive
@@ -15,9 +14,3 @@
             %td= x
             %td= x.ipv4
             %td= x.ipv6
-      - if @domain.errors.messages[:nameservers]
-        %tfoot
-          - @domain.errors.messages[:nameservers].each do |x|
-            %tr
-              %td{colspan: 3}= x
-

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

@@ -50,9 +50,3 @@
         <%= render 'registrant/domains/partials/dnskeys' %>
     </div>
 </div>
-
-<div class="row">
-    <div class="col-md-12">
-        <%= render 'registrant/domains/partials/keyrelays' %>
-    </div>
-</div>

app/views/registrar/account_activities/_search_form.html.erb

@@ -0,0 +1,49 @@
+<div class="row">
+    <div class="col-md-12">
+        <%= search_form_for @q, url: [:registrar, :account_activities], html: { style: 'margin-bottom: 0;' } do |f| %>
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <%= f.label t(:activity_type) %>
+                        <%= f.select :activity_type_in, AccountActivity.types_for_select, {}, class: 'form-control js-combobox', placeholder: t(:choose), multiple: true %>
+                    </div>
+                </div>
+
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <%= f.label t(:description) %>
+                        <%= f.search_field :description_cont, class: 'form-control', placeholder: t(:description), autocomplete: 'off' %>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-md-3">
+                    <div class="form-group">
+                        <%= f.label t(:receipt_date_from) %>
+                        <%= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from) %>
+                    </div>
+                </div>
+
+                <div class="col-md-3">
+                    <div class="form-group">
+                        <%= f.label t(:receipt_date_until) %>
+                        <%= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until) %>
+                    </div>
+                </div>
+
+                <div class="col-md-6" style="padding-top: 25px;">
+                    <button class="btn btn-default">
+                        &nbsp;
+                        <span class="glyphicon glyphicon-search"></span>
+                        &nbsp;
+                    </button>
+                    <%= button_tag t('.download_btn'),
+                                   formaction: registrar_account_activities_path(format: 'csv'),
+                                   class: 'btn btn-default' %>
+                    <%= link_to(t('.reset_btn'), registrar_account_activities_path, class: 'btn btn-default') %>
+                </div>
+            </div>
+        <% end %>
+    </div>
+</div>

app/views/registrar/account_activities/index.haml

@@ -1,61 +0,0 @@
-- content_for :actions do
-  = link_to(t(:back_to_billing), registrar_invoices_path, class: 'btn btn-default')
-  = link_to(t(:export_csv), url_for(params.merge(format: 'csv')), class: 'btn btn-default')
-
-= render 'shared/title', name: t(:account_activity)
-
-.row
-  .col-md-12
-    = search_form_for @q, url: [:registrar, :account_activities], html: { style: 'margin-bottom: 0;' } do |f|
-      .row
-        .col-md-6
-          .form-group
-            = f.label t(:activity_type)
-            = f.select :activity_type_in, AccountActivity.types_for_select, {}, class: 'form-control js-combobox', placeholder: t(:choose), multiple: true
-        .col-md-6
-          .form-group
-            = f.label t(:description)
-            = f.search_field :description_cont, class: 'form-control', placeholder: t(:description), autocomplete: 'off'
-      .row
-        .col-md-3
-          .form-group
-            = f.label t(:receipt_date_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from)
-        .col-md-3
-          .form-group
-            = f.label t(:receipt_date_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until)
-        .col-md-6{style: 'padding-top: 25px;'}
-          %button.btn.btn-default
-             
-            %span.glyphicon.glyphicon-search
-             
-          = link_to(t('.reset_btn'), registrar_account_activities_path, class: 'btn btn-default')
-%hr
-
-.row
-  .col-md-12
-    .table-responsive
-      %table.table.table-hover.table-condensed
-        %thead
-          %tr
-            %th{class: 'col-xs-5'}
-              = sort_link(@q, 'description')
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'activity_type')
-            %th{class: 'col-xs-3'}
-              = sort_link(@q, 'created_at', AccountActivity.human_attribute_name(:created_at))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'sum')
-        %tbody
-          - @account_activities.each do |x|
-            %tr
-              %td= x.description.present? ? x.description : '-'
-              %td= x.activity_type ? t(x.activity_type) : ''
-              %td= l(x.created_at)
-              - c = x.sum > 0.0 ? 'text-success' : 'text-danger'
-              - s = x.sum > 0.0 ? "+#{x.sum} #{x.currency}" : "#{x.sum} #{x.currency}"
-              %td{class: c}= s
-.row
-  .col-md-12
-    = paginate @account_activities

app/views/registrar/account_activities/index.html.erb

@@ -0,0 +1,60 @@
+<% content_for :actions do %>
+    <%= link_to(t(:back_to_billing), registrar_invoices_path, class: 'btn btn-default') %>
+<% end %>
+
+<%= render 'shared/title', name: t(:account_activity) %>
+
+<%= render 'search_form' %>
+
+<hr/>
+
+<div class="row">
+    <div class="col-md-12">
+        <div class="table-responsive">
+            <table class="table table-hover table-condensed">
+                <thead>
+                <tr>
+                    <th class="col-xs-5">
+                        <%= sort_link(@q, 'description') %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= sort_link(@q, 'activity_type') %>
+                    </th>
+                    <th class="col-xs-3">
+                        <%= sort_link(@q, 'created_at', AccountActivity.human_attribute_name(:created_at)) %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= sort_link(@q, 'sum') %>
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                <% @account_activities.each do |x| %>
+                    <tr>
+                        <td>
+                            <%= x.description.present? ? x.description : '-' %>
+                        </td>
+                        <td>
+                            <%= x.activity_type ? t(x.activity_type) : '' %>
+                        </td>
+                        <td>
+                            <%= l(x.created_at) %>
+                        </td>
+                        <% c = x.sum > 0.0 ? 'text-success' : 'text-danger' %>
+                        <% s = x.sum > 0.0 ? "+#{x.sum} #{x.currency}" : "#{x.sum} #{x.currency}" %>
+                        <td class="<%= c %>">
+                            <%= s %>
+                        </td>
+                    </tr>
+                <% end %>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <%= paginate @account_activities %>
+    </div>
+</div>

app/views/registrar/base/_navbar.haml

@@ -1,7 +1,7 @@
 .navbar-collapse.collapse
   %ul.nav.navbar-nav
     - if can? :view, Depp::Domain
-      - active_class = %w(registrar/domains registrar/check registrar/renew registrar/tranfer registrar/keyrelays).include?(params[:controller]) ? 'active' :nil
+      - active_class = %w(registrar/domains registrar/check registrar/renew registrar/tranfer).include?(params[:controller]) ? 'active' :nil
       %li{class: active_class}= link_to t(:domains), registrar_domains_path
 
     - if can? :view, Depp::Contact

app/views/registrar/contacts/_search_form.html.erb

@@ -0,0 +1,117 @@
+<%= search_form_for [:registrar, @q], html: { style: 'margin-bottom: 0;', class: 'js-form', autocomplete: 'off' } do |f| %>
+    <div class="row">
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= f.label :name %>
+                <%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name) %>
+            </div>
+        </div>
+
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= f.label t(:id) %>
+                <%= f.search_field :code_eq, class: 'form-control', placeholder: t(:id) %>
+            </div>
+        </div>
+
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= f.label t(:ident) %>
+                <%= f.search_field :ident_matches, class: 'form-control', placeholder: t(:ident) %>
+            </div>
+        </div>
+
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= label_tag t(:ident_type) %>
+                <%= select_tag '[q][ident_type_eq]', options_for_select(ident_types, params[:q][:ident_type_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' } %>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= f.label t(:email) %>
+                <%= f.search_field :email_matches, class: 'form-control', placeholder: t(:email) %>
+            </div>
+        </div>
+
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= label_tag t(:country) %>
+                <%= select_tag '[q][country_code_eq]', SortedCountry.all_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' } %>
+            </div>
+        </div>
+
+        <div class="col-md-6">
+            <div class="form-group">
+                <%= label_tag t(:contact_type) %>
+                <%= select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact'], ['registrant', 'registrant']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' } %>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= f.label t(:registrar_name) %>
+                <%= f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose) %>
+            </div>
+        </div>
+
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= f.label t(:created_at_from) %>
+                <%= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from) %>
+            </div>
+        </div>
+
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= f.label t(:created_at_until) %>
+                <%= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until) %>
+            </div>
+        </div>
+
+        <div class="col-md-3">
+            <div class="form-group">
+                <%= f.label t(:updated_at) %>
+                <%= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control js-datepicker', placeholder: t(:updated_at) %>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-5">
+            <div class="form-group">
+                <%= label_tag t(:status) %>
+                <%= select_tag :statuses_contains, options_for_select(Contact::STATUSES, params[:statuses_contains]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' } %>
+            </div>
+        </div>
+
+        <div class="col-md-2">
+            <div class="form-group">
+                <%= label_tag t(:results_per_page) %>
+                <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+            </div>
+        </div>
+
+        <div class="col-md-5 text-right" style="padding-top: 25px;">
+            <button class="btn btn-primary">
+                &nbsp;
+                <span class="glyphicon glyphicon-search"></span>
+                &nbsp;
+            </button>
+            <%= button_tag t('.download_pdf_btn'),
+                           formaction: registrar_contacts_path(format: :pdf),
+                           name: nil,
+                           class: 'btn btn-default' %>
+            <%= button_tag t('.download_csv_btn'),
+                           formaction: registrar_contacts_path(format: :csv),
+                           name: nil,
+                           class: 'btn btn-default' %>
+            <%= link_to(t('.reset_btn'), registrar_contacts_path, class: 'btn btn-default') %>
+        </div>
+    </div>
+<% end %>

app/views/registrar/contacts/download_list.haml

@@ -1,30 +0,0 @@
-!!!
-%html
-  %head
-    %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
-      %title Contacts
-  %body
-  .row
-    .col-md-12
-      .table-responsive
-        %table.table.table-hover.table-bordered.table-condensed
-          %thead
-            %tr
-              %th{class: 'col-xs-2'}
-                =t(:name)
-              %th{class: 'col-xs-2'}
-                =t(:id)
-              %th{class: 'col-xs-2'}
-                =t(:ident)
-              %th{class: 'col-xs-2'}
-                =t(:created_at)
-              %th{class: 'col-xs-2'}
-                =t(:registrar_name)
-          %tbody
-            - @contacts.each do |contact|
-              %tr
-                %td= contact
-                %td= contact.code
-                %td= ident_for(contact)
-                %td= l(contact.created_at, format: :short)
-                %td= contact.registrar

app/views/registrar/contacts/index.haml

@@ -1,120 +0,0 @@
-- content_for :actions do
-  = link_to(t(:new), new_registrar_contact_path, class: 'btn btn-primary')
-= render 'shared/title', name: t(:contacts)
-
-.row
-  .col-md-12
-    = search_form_for [:registrar, @q], html: { style: 'margin-bottom: 0;', class: 'js-form', autocomplete: 'off' } do |f|
-      .row
-        .col-md-3
-          .form-group
-            = f.label :name
-            = f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name)
-        .col-md-3
-          .form-group
-            = f.label t(:id)
-            = f.search_field :code_eq, class: 'form-control', placeholder: t(:id)
-        .col-md-3
-          .form-group
-            = f.label t(:ident)
-            = f.search_field :ident_matches, class: 'form-control', placeholder: t(:ident)
-        .col-md-3
-          .form-group
-            = label_tag t(:ident_type)
-            = select_tag '[q][ident_type_eq]', options_for_select(ident_types, params[:q][:ident_type_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
-      .row
-        .col-md-3
-          .form-group
-            = f.label t(:email)
-            = f.search_field :email_matches, class: 'form-control', placeholder: t(:email)
-        .col-md-3
-          .form-group
-            = label_tag t(:country)
-            = select_tag '[q][country_code_eq]', SortedCountry.all_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
-        .col-md-6
-          .form-group
-            = label_tag t(:contact_type)
-            = select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact'], ['registrant', 'registrant']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
-      .row
-        .col-md-3
-          .form-group
-            = f.label t(:registrar_name)
-            = f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose)
-        .col-md-3
-          .form-group
-            = f.label t(:created_at_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
-        .col-md-3
-          .form-group
-            = f.label t(:created_at_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
-        .col-md-3
-          .form-group
-            = f.label t(:updated_at)
-            = f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control js-datepicker', placeholder: t(:updated_at)
-      .row
-        .col-md-6
-          .form-group
-            = label_tag t(:status)
-            = select_tag :statuses_contains, options_for_select(Contact::STATUSES, params[:statuses_contains]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
-        .col-md-3
-          .form-group
-            = label_tag t(:results_per_page)
-            = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page)
-        .col-md-3{style: 'padding-top: 25px;'}
-          %button.btn.btn-primary
-             
-            %span.glyphicon.glyphicon-search
-             
-          = link_to(t('.reset_btn'), registrar_contacts_path, class: 'btn btn-default')
-      .row
-        .col-md-3
-          .btn-group{:role => "group"}
-            %button.btn.btn-default.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button"}
-              Download
-              %span.caret
-            %ul.dropdown-menu
-              %li= link_to 'PDF', download_list_registrar_contacts_path(q: params[:q], format: "pdf")
-              %li= link_to 'CSV', download_list_registrar_contacts_path(q: params[:q], format: "csv")
-        .col-md-3
-        .col-md-3
-        .col-md-3
-
-%hr
-.row
-  .col-md-12
-    .table-responsive
-      %table.table.table-hover.table-bordered.table-condensed.contacts
-        %thead
-          %tr
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'name', t(:name))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'code', t(:id))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'ident', t(:ident))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'email', t(:created_at))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t(:registrar_name))
-            %th{class: 'col-xs-2'}= t(:actions)
-        %tbody
-          - @contacts.each do |contact|
-            %tr
-              %td= link_to(contact.name, registrar_contact_path(id: contact.code))
-              %td= contact.code
-              %td= ident_for(contact)
-              %td= l(contact.created_at, format: :short)
-              %td
-                - if contact.registrar
-                  = contact.registrar
-              %td
-                = link_to(t(:edit), edit_registrar_contact_path(contact.code), class: 'btn btn-primary btn-xs')
-                = link_to(t(:delete), delete_registrar_contact_path(contact.code), class: 'btn btn-default btn-xs')
-
-.row
-  .col-md-6
-    = paginate @contacts
-  .col-md-6.text-right
-    .pagination
-      = t(:result_count, count: @contacts.total_count)

app/views/registrar/contacts/index.html.erb

@@ -0,0 +1,77 @@
+<% content_for :actions do %>
+    <%= link_to(t(:new), new_registrar_contact_path, class: 'btn btn-primary') %>
+<% end %>
+<%= render 'shared/title', name: t(:contacts) %>
+<div class="row">
+    <div class="col-md-12">
+        <%= render 'search_form' %>
+    </div>
+</div>
+<hr/>
+<div class="row">
+    <div class="col-md-12">
+        <div class="table-responsive">
+            <table class="table table-hover table-bordered table-condensed contacts">
+                <thead>
+                <tr>
+                    <th class="col-xs-2">
+                        <%= sort_link(@q, 'name', t(:name)) %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= sort_link(@q, 'code', t(:id)) %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= sort_link(@q, 'ident', t(:ident)) %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= sort_link(@q, 'email', t(:created_at)) %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= sort_link(@q, 'registrar_name', t(:registrar_name)) %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= t(:actions) %>
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                <% @contacts.each do |contact| %>
+                    <tr>
+                        <td>
+                            <%= link_to(contact.name, registrar_contact_path(id: contact.code)) %>
+                        </td>
+                        <td>
+                            <%= contact.code %>
+                        </td>
+                        <td>
+                            <%= ident_for(contact) %>
+                        </td>
+                        <td>
+                            <%= l(contact.created_at, format: :short) %>
+                        </td>
+                        <td>
+                            <% if contact.registrar %>
+                                <%= contact.registrar %>
+                            <% end %>
+                        </td>
+                        <td>
+                            <%= link_to(t(:edit), edit_registrar_contact_path(contact.code), class: 'btn btn-primary btn-xs') %>
+                            <%= link_to(t(:delete), delete_registrar_contact_path(contact.code), class: 'btn btn-default btn-xs') %>
+                        </td>
+                    </tr>
+                <% end %>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        <%= paginate @contacts %>
+    </div>
+    <div class="col-md-6 text-right">
+        <div class="pagination">
+            <%= t(:result_count, count: @contacts.total_count) %>
+        </div>
+    </div>
+</div>

app/views/registrar/contacts/list_pdf.html.erb

@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<body>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="table-responsive">
+                <table class="table table-hover table-bordered table-condensed">
+                    <thead>
+                        <tr>
+                            <th class="col-xs-2"><%= Contact.human_attribute_name :name %></th>
+                            <th class="col-xs-2"><%= Contact.human_attribute_name :code %></th>
+                            <th class="col-xs-2"><%= Contact.human_attribute_name :ident %></th>
+                            <th class="col-xs-2"><%= Contact.human_attribute_name :created_at %></th>
+                            <th class="col-xs-2"><%= Registrar.model_name.human %></th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        <% @contacts.each do |contact| %>
+                            <tr>
+                                <td><%= contact %></td>
+                                <td><%= contact.code %></td>
+                                <td><%= ident_for(contact) %></td>
+                                <td><%= l(contact.created_at, format: :short) %></td>
+                                <td><%= contact.registrar %></td>
+                            </tr>
+                        <% end %>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

app/views/registrar/contacts/partials/_domains.haml

@@ -1,5 +1,6 @@
-- domains = contact.all_domains(page: params[:domain_page], per: 20, params: params)
-#contacts.panel.panel-default
+- domains = contact.all_domains(page: params[:domain_page], per: 20,
+                                params: domain_filter_params.to_h)
+.panel.panel-default
   .panel-heading
     .pull-left
       = t(:domains)

app/views/registrar/domains/_form.haml

@@ -1,4 +1,5 @@
 - path = (params[:domain_name]) ? update_registrar_domains_path : registrar_domains_path
+- legaldoc_mandatory = params[:domain_name].blank? && current_registrar_user.legaldoc_mandatory?
 = form_tag(path, class: 'form-horizontal', multipart: true) do
   .row
     .col-md-8
@@ -14,7 +15,7 @@
         .panel-body
           .form-group
             .col-md-3.control-label
-              - c, fr = 'required', true if params[:domain_name].blank?
+              - c, fr = 'required', true if legaldoc_mandatory
               = label_tag 'domain[legal_document]', t(:legal_document), class: c
               %p.help-block= t(:legal_document_max_size)
             .col-md-7

app/views/registrar/domains/_search_form.html.erb

@@ -3,7 +3,7 @@
         <div class="col-md-3">
             <div class="form-group">
                 <%= f.label :name, for: nil %>
-                <%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control',
+                <%= f.search_field :name_matches, value: search_params[:name_matches], class: 'form-control',
                                    placeholder: t(:name) %>
             </div>
         </div>
@@ -44,7 +44,7 @@
         <div class="col-md-3">
             <div class="form-group">
                 <%= f.label :valid_to_from, for: nil %>
-                <%= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq],
+                <%= f.search_field :valid_to_gteq, value: search_params[:valid_to_gteq],
                                    class: 'form-control js-datepicker',
                                    placeholder: t(:valid_to_from) %>
             </div>
@@ -53,7 +53,7 @@
         <div class="col-md-3">
             <div class="form-group">
                 <%= f.label :valid_to_until, for: nil %>
-                <%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq],
+                <%= f.search_field :valid_to_lteq, value: search_params[:valid_to_lteq],
                                    class: 'form-control js-datepicker',
                                    placeholder: t(:valid_to_until) %>
             </div>
@@ -74,14 +74,14 @@
             </div>
         </div>
 
-        <div class="col-md-offset-6 col-md-4 text-right">
+        <div class="col-md-10 text-right">
             <button class="btn btn-primary search">
                 &nbsp;
                 <span class="glyphicon glyphicon-search"></span>
                 &nbsp;
             </button>
-            <%= button_tag t('.download_btn'), class: 'btn btn-primary export-domains-csv-btn',
-                           formaction: registrar_domains_path(format: 'csv') %>
+            <%= button_tag t('.download_btn'), formaction: registrar_domains_path(format: 'csv'),
+                           class: 'btn btn-default' %>
             <%= link_to t('.reset_btn'), registrar_domains_path, class: 'btn btn-default' %>
         </div>
     </div>

app/views/registrar/domains/delete.haml

@@ -10,14 +10,14 @@
           .col-md-4.control-label
             = label_tag 'domain[verified]', t(:verified)
           .col-md-6
-            = check_box_tag 'domain[verified]', '1', params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);"
+            = check_box_tag 'domain[verified]', '1', params[:verified].eql?('1'), onclick: ("return (confirm('#{t(:verified_confirm)}') ? true : false);" if current_registrar_user.legaldoc_mandatory?)
 
         .form-group
           .col-md-4.control-label
-            = label_tag 'domain[legal_document]', t(:legal_document), class: 'required'
+            = label_tag 'domain[legal_document]', t(:legal_document)
             %p.help-block= t(:legal_document_max_size)
           .col-md-6
-            = file_field_tag 'domain[legal_document]', required: true
+            = file_field_tag 'domain[legal_document]'
             = hidden_field_tag 'domain[name]', params[:domain_name]
   %hr
   .row

app/views/registrar/domains/form/_general.haml

@@ -31,7 +31,7 @@
         .col-md-7
           = check_box_tag 'domain[verified]', '1', @domain_params[:verified].eql?('1'), onclick: "return (confirm('#{t(:verified_confirm)}') ? true : false);"
 
-    - unless params[:domain_name]
+    - if !params[:domain_name] || @dispute.present?
       .form-group
         .col-md-3.control-label
           = label_tag :domain_reserved_pw, t(:reserved_pw)

app/views/registrar/domains/info.html.erb

@@ -6,6 +6,10 @@
                     class: 'btn btn-default') %>
         <%= link_to(t(:delete), delete_registrar_domains_path(domain_name: params[:domain_name]),
                     class: 'btn btn-default') %>
+        <% if @client_holded %>
+            <%= link_to(t(:remove_client_hold), remove_hold_registrar_domains_path(domain_name: params[:domain_name]),
+                    class: 'btn btn-default') %>
+        <% end %>
     <% else %>
         <%= link_to t('.transfer_btn'), new_registrar_domain_transfer_path(domain_name: params[:domain_name]),
                     class: 'btn btn-default' %>

app/views/registrar/domains/partials/_contacts.haml

@@ -1,4 +1,4 @@
-#tech_contacts.panel.panel-default
+.panel.panel-default
   .panel-heading.clearfix
     %h3.panel-title= t(:contacts)
   .table-responsive
@@ -14,4 +14,4 @@
           %tr
             %td= x['type']
             %td= registrant.name
-            %td= x.text
+            %td= x.text

app/views/registrar/domains/partials/_nameservers.haml

@@ -1,4 +1,4 @@
-#nameservers.panel.panel-default
+.panel.panel-default
   .panel-heading.clearfix
     %h3.panel-title= t(:nameservers)
   .table-responsive

app/views/registrar/invoices/partials/_banklinks.haml

@@ -3,5 +3,5 @@
 
 - locals[:payment_channels].each do |meth|
   - meth = meth.strip
-  = link_to registrar_payment_with_path(meth, invoice_id: params[:id]) do
+  = link_to registrar_payment_with_path(meth, invoice_id: params[:id]), id: meth do
     = image_tag("#{meth}.png")

app/views/registrar/invoices/partials/_payment_orders.haml

@@ -0,0 +1,19 @@
+%h4= "Payment Orders"
+%hr
+.table-responsive
+  %table.table.table-hover.table-condensed
+    %thead
+      %tr
+        %th{class: 'col-xs-1'}= "#"
+        %th{class: 'col-xs-1'}= "Channel"
+        %th{class: 'col-xs-2'}= "Status"
+        %th{class: 'col-xs-3'}= "Initiated"
+        %th{class: 'col-xs-4'}= "Notes"
+    %tbody
+      - @invoice.payment_orders.each do |payment_order|
+        %tr
+          %td= payment_order.id
+          %td= payment_order.channel
+          %td= payment_order.status
+          %td= payment_order.created_at
+          %td= payment_order.notes

app/views/registrar/invoices/show.haml

@@ -17,4 +17,4 @@
 
 - if @invoice.payable?
   .row.semifooter
-    .col-md-6-offset-6.text-right= render 'registrar/invoices/partials/banklinks', locals: { payment_channels: PaymentOrders::PAYMENT_METHODS }
+    .col-md-6-offset-6.text-right= render 'registrar/invoices/partials/banklinks', locals: { payment_channels: PaymentOrder::CUSTOMER_PAYMENT_METHODS }

app/views/registrar/keyrelays/show.haml

@@ -1,64 +0,0 @@
-= render 'shared/title', name: t(:keyrelay)
-
-.row
-  .col-md-8
-    = form_tag registrar_keyrelay_path, class: 'form-horizontal', method: :post, multipart: true do
-      .form-group
-        .col-md-3.control-label
-          = label_tag :domain_name, t(:domain_name), class: 'required'
-        .col-md-7
-          = text_field_tag :domain_name, params[:domain_name],
-            class: 'form-control', autocomplete: 'off', required: true
-
-      .form-group
-        .col-md-3.control-label
-          = label_tag :password, t(:password), class: 'required'
-        .col-md-7
-          = text_field_tag :password, params[:password],
-            class: 'form-control', autocomplete: 'off', required: true
-
-      .form-group
-        .col-md-3.control-label
-          = label_tag :expiry, t(:expiry), class: 'required'
-        .col-md-7
-          = text_field_tag :expiry, params[:expiry],
-            class: 'form-control', autocomplete: 'off', required: true
-
-      .form-group
-        .col-md-3.control-label
-          = label_tag :key_data_flags, t(:flag), class: 'required'
-        .col-md-7
-          = select_tag :key_data_flags,
-            options_for_select(Depp::Dnskey::FLAGS, params['key_data_flags']), {class: 'form-control'}
-
-      .form-group
-        .col-md-3.control-label
-          = label_tag :key_data_protocol, t(:protocol), class: 'required'
-        .col-md-7
-          = select_tag :key_data_protocol,
-            options_for_select(Depp::Dnskey::PROTOCOLS, params['key_data_protocol']),
-            {class: 'form-control'}
-
-      .form-group
-        .col-md-3.control-label
-          = label_tag :key_data_alg, t(:algorithm), class: 'required'
-        .col-md-7
-          = select_tag :key_data_alg,
-            options_for_select(Depp::Dnskey::ALGORITHMS, params['key_data_alg']), {class: 'form-control'}
-
-      .form-group
-        .col-md-3.control-label
-          = label_tag :key_data_public_key, t(:public_key), class: 'required'
-        .col-md-7
-          = text_field_tag :key_data_public_key, params['key_data_public_key'],
-            class: 'form-control', required: true
-
-      .form-group
-        .col-md-3.control-label
-          = label_tag :legal_document, t(:legal_document)
-        .col-md-7
-          = file_field_tag :legal_document
-
-      .form-group
-        .col-md-10.text-right
-          %button.btn.btn-warning= t(:upload_key)