- <%= render 'shared/flash' %>
+ <%= render 'flash_messages' %>
<% if depp_controller? %>
<%= render 'registrar/shared/epp_results' %>
<% end %>
diff --git a/app/views/layouts/registrar/sessions.haml b/app/views/layouts/registrar/sessions.haml
deleted file mode 100644
index 49c71ab2c..000000000
--- a/app/views/layouts/registrar/sessions.haml
+++ /dev/null
@@ -1,45 +0,0 @@
-!!! 5
-%html{lang: I18n.locale.to_s}
- %head
- %meta{charset: "utf-8"}/
- %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}/
- %meta{content: "width=device-width, initial-scale=1", name: "viewport"}/
- - if content_for? :head_title
- = yield :head_title
- - else
- %title= t(:registrar_head_title)
- = csrf_meta_tags
- = stylesheet_link_tag 'registrar-manifest', media: 'all'
- = javascript_include_tag 'registrar-manifest'
- = favicon_link_tag 'favicon.ico'
- %body
- %nav.navbar.navbar-default.navbar-fixed-top
- .container
- .navbar-header
- %button.navbar-toggle.collapsed{"aria-controls" => "navbar", "aria-expanded" => "false", "data-target" => "#navbar", "data-toggle" => "collapse", :type => "button"}
- %span.sr-only Toggle navigation
- %span.icon-bar
- %span.icon-bar
- %span.icon-bar
- = link_to registrar_root_path, class: 'navbar-brand', id: 'registrar-home-btn' do
- = t(:registrar_head_title)
- - if unstable_env.present?
- .text-center
- %small{style: 'color: #0074B3;'}= unstable_env
- - if current_user
- = render 'navbar'
-
- .container
- = render 'shared/flash'
- - if depp_controller?
- = render 'registrar/shared/epp_results'
- = yield
-
- %footer.footer
- .container
- .row
- .col-md-6
- = image_tag 'eis-logo-et.png'
- .col-md-6.text-right
- Version
- = CURRENT_COMMIT_HASH
diff --git a/app/views/layouts/registrar/sessions.html.erb b/app/views/layouts/registrar/sessions.html.erb
new file mode 100644
index 000000000..904388155
--- /dev/null
+++ b/app/views/layouts/registrar/sessions.html.erb
@@ -0,0 +1,54 @@
+
+
+
+
+ <% if content_for? :head_title %>
+ <%= yield :head_title %>
+ <% else %>
+
+ <%= t(:registrar_head_title) %>
+
+ <% end %>
+ <%= csrf_meta_tags %>
+ <%= stylesheet_link_tag 'registrar-manifest', media: 'all' %>
+ <%= javascript_include_tag 'registrar-manifest' %>
+
+
+
+
+
+ <%= render 'flash_messages' %>
+ <%= yield %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/registrant/contacts/partials/_address.haml b/app/views/registrant/contacts/partials/_address.haml
index 9c0f548e3..fe57bd393 100644
--- a/app/views/registrant/contacts/partials/_address.haml
+++ b/app/views/registrant/contacts/partials/_address.haml
@@ -8,7 +8,7 @@
%dd= @contact.org_name
%dt= t(:street)
- %dd= @contact.street.to_s.gsub("\n", '
').html_safe
+ %dd= @contact.street
%dt= t(:city)
%dd= @contact.city
diff --git a/app/views/registrar/bulk_change/_bulk_transfer_form.html.erb b/app/views/registrar/bulk_change/_bulk_transfer_form.html.erb
new file mode 100644
index 000000000..0a953845b
--- /dev/null
+++ b/app/views/registrar/bulk_change/_bulk_transfer_form.html.erb
@@ -0,0 +1,34 @@
+<%= form_tag registrar_domain_transfers_path, multipart: true, class: 'form-horizontal' do %>
+ <%= render 'registrar/domain_transfers/form/api_errors' %>
+
+
+
+
+
+
+<% end %>
diff --git a/app/views/registrar/registrar_nameservers/_form.html.erb b/app/views/registrar/bulk_change/_nameserver_form.html.erb
similarity index 61%
rename from app/views/registrar/registrar_nameservers/_form.html.erb
rename to app/views/registrar/bulk_change/_nameserver_form.html.erb
index 3aca3e0e1..e3f4a0214 100644
--- a/app/views/registrar/registrar_nameservers/_form.html.erb
+++ b/app/views/registrar/bulk_change/_nameserver_form.html.erb
@@ -1,12 +1,13 @@
-<%= form_tag registrar_update_registrar_nameserver_path, method: :put, class: 'form-horizontal' do %>
+<%= form_tag registrar_nameservers_path, method: :patch, class: 'form-horizontal' do %>
+ <%= render 'registrar/domain_transfers/form/api_errors' %>
+
-
+
<%= text_field_tag :new_hostname, params[:new_hostname], required: true,
class: 'form-control' %>
@@ -27,7 +28,7 @@
<%= label_tag :ipv4 %>
-
+
<%= text_area_tag :ipv4, params[:ipv4], class: 'form-control' %>
@@ -37,17 +38,30 @@
<%= label_tag :ipv6 %>