Merge branch 'registry-765' into registry-623

# Conflicts:
#	app/models/registrar.rb
#	config/locales/en.yml
#	spec/models/registrar_spec.rb
#	test/models/registrar_test.rb

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

@@ -0,0 +1,17 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <%= t '.header' %>
+    </div>
+    <div class="panel-body">
+        <dl class="dl-horizontal">
+            <dt><%= Registrar.human_attribute_name :vat_no %></dt>
+            <dd><%= registrar.vat_no %></dd>
+
+            <dt><%= Registrar.human_attribute_name :accounting_customer_code %></dt>
+            <dd><%= registrar.accounting_customer_code %></dd>
+
+            <dt><%= Registrar.human_attribute_name :billing_email %></dt>
+            <dd><%= registrar.billing_email %></dd>
+        </dl>
+    </div>
+</div>

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

@@ -1,5 +1,6 @@
 <%= form_for([:admin, @registrar], html: { class: 'form-horizontal' }) do |f| %>
-    <%= render 'shared/full_errors', object: @registrar %>
+    <%= render 'form_errors', target: @registrar %>
+
     <div class="row">
         <div class="col-md-8">
             <div class="panel panel-default">
@@ -133,7 +134,9 @@
                             <%= f.label :code %>
                         </div>
                         <div class="col-md-7">
-                            <%= f.text_field :code, required: f.object.new_record?, class: 'form-control', disabled: !f.object.new_record? %>
+                            <%= f.text_field :code, required: f.object.new_record?,
+                                             disabled: f.object.persisted?,
+                                             class: 'form-control' %>
                         </div>
                     </div>
 

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

@@ -1,5 +1,10 @@
-<% content_for :actions do %>
-    <%= link_to(t(:back_to_registrar), [:admin, @registrar], class: 'btn btn-default') %>
-<% end %>
-<%= render 'shared/title', name: "#{t(:edit)}: #{@registrar.name}" %>
+<ol class="breadcrumb">
+    <li><%= link_to t('admin.registrars.index.header'), admin_registrars_path %></li>
+    <li><%= link_to @registrar.name, admin_registrar_path(@registrar) %></li>
+</ol>
+
+<div class="page-header">
+    <h1><%= t '.header' %></h1>
+</div>
+
 <%= render 'form' %>

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

@@ -1,7 +1,15 @@
-<% content_for :actions do %>
-    <%= link_to(t('.new_btn'), new_admin_registrar_path, class: 'btn btn-primary') %>
-<% end %>
-<%= render 'shared/title', name: t(:registrars) %>
+<div class="page-header">
+    <div class="row">
+        <div class="col-sm-10">
+            <h1><%= t '.header' %></h1>
+        </div>
+
+        <div class="col-sm-2 text-right">
+            <%= link_to t('.new_btn'), new_admin_registrar_path, class: 'btn btn-primary' %>
+        </div>
+    </div>
+</div>
+
 <div class="row">
     <div class="col-md-12">
         <div class="table-responsive">

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

@@ -1,2 +1,9 @@
-<%= render 'shared/title', name: t(:new_registrar) %>
+<ol class="breadcrumb">
+    <li><%= link_to t('admin.registrars.index.header'), admin_registrars_path %></li>
+</ol>
+
+<div class="page-header">
+    <h1><%= t '.header' %></h1>
+</div>
+
 <%= render 'form' %>

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

@@ -1,15 +1,31 @@
 <% registrar = RegistrarPresenter.new(registrar: @registrar, view: self) %>
-<% content_for :actions do %>
-    <%= link_to(t(:edit), edit_admin_registrar_path(@registrar), class: 'btn btn-primary') %>
-    <%= link_to(t(:delete), admin_registrar_path(@registrar), method: :delete, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger') %>
-<% end %>
-<% content_for :page_name do %>
-    <%= @registrar.name %>
-    <% if @registrar.test_registrar? %>
-        <span style="color: #c9302c;">(test)</span>
-    <% end %>
-<% end %>
-<%= render 'shared/title', name: @registrar.name %>
+
+<ol class="breadcrumb">
+    <li><%= link_to t('admin.registrars.index.header'), admin_registrars_path %></li>
+</ol>
+
+<div class="page-header">
+    <div class="row">
+        <div class="col-md-6">
+            <h1>
+                <%= @registrar.name %>
+                <% if @registrar.test_registrar? %>
+                    <span class="text-danger"> (test)</span>
+                <% end %>
+            </h1>
+        </div>
+
+        <div class="col-md-6 text-right">
+            <%= link_to t('.edit_btn'), edit_admin_registrar_path(@registrar),
+                        class: 'btn btn-primary' %>
+            <%= link_to t('.delete_btn'), admin_registrar_path(@registrar),
+                        method: :delete,
+                        data: { confirm: t('.delete_btn_confirm') },
+                        class: 'btn btn-default' %>
+        </div>
+    </div>
+</div>
+
 <% if @registrar.errors.any? %>
     <% @registrar.errors.each do |attr, err| %>
         <%= err %>
@@ -41,12 +57,6 @@
                     <dd>
                         <%= @registrar.reg_no %>
                     </dd>
-                    <dt>
-                        <%= t(:vat_no) %>
-                    </dt>
-                    <dd>
-                        <%= @registrar.vat_no %>
-                    </dd>
                     <dt>
                         <%= t(:reference_no) %>
                     </dt>
@@ -71,12 +81,6 @@
                     <dd>
                         <%= @registrar.website %>
                     </dd>
-                    <dt>
-                        <%= Registrar.human_attribute_name :accounting_customer_code %>
-                    </dt>
-                    <dd>
-                        <%= @registrar.accounting_customer_code %>
-                    </dd>
                 </dl>
             </div>
         </div>
@@ -120,21 +124,16 @@
                     <dd>
                         <%= @registrar.billing_address %>
                     </dd>
-                    <dt>
-                        <%= t(:billing_email) %>
-                    </dt>
-                    <dd>
-                        <%= @registrar.billing_email %>
-                    </dd>
                 </dl>
             </div>
         </div>
+        <%= render 'billing', registrar: @registrar %>
         <%= render 'admin/registrars/show/preferences', registrar: registrar %>
     </div>
 </div>
 <div class="row">
     <div class="col-md-12">
-        <div class="panel panel-default" id="epp-users">
+        <div class="panel panel-default">
             <div class="panel-heading clearfix">
                 <div class="pull-left">
                     <%= t('.api_users') %>
@@ -174,7 +173,7 @@
 </div>
 <div class="row">
     <div class="col-md-12">
-        <div class="panel panel-default" id="epp-users">
+        <div class="panel panel-default">
             <div class="panel-heading clearfix">
                 <div class="pull-left">
                     <%= t(:white_ips) %>