From 6406e6116e421334a59f0fd4a5ed4516e12cf9f6 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Thu, 8 Mar 2018 14:25:54 +0200
Subject: [PATCH] Revert "Use standard page header"

This reverts commit 6393e4b
---
 app/views/admin/registrars/edit.html.erb  | 13 +++-----
 app/views/admin/registrars/index.html.erb | 16 +++-------
 app/views/admin/registrars/new.html.erb   |  9 +-----
 app/views/admin/registrars/show.html.erb  | 38 +++++++----------------
 config/locales/admin/registrars.en.yml    | 10 ------
 5 files changed, 20 insertions(+), 66 deletions(-)

diff --git a/app/views/admin/registrars/edit.html.erb b/app/views/admin/registrars/edit.html.erb
index 205ba6b28..71d6bd882 100644
--- a/app/views/admin/registrars/edit.html.erb
+++ b/app/views/admin/registrars/edit.html.erb
@@ -1,10 +1,5 @@
-<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>
-
+<% 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}" %>
 <%= render 'form' %>
diff --git a/app/views/admin/registrars/index.html.erb b/app/views/admin/registrars/index.html.erb
index 49bf7eae8..5533a6f07 100644
--- a/app/views/admin/registrars/index.html.erb
+++ b/app/views/admin/registrars/index.html.erb
@@ -1,15 +1,7 @@
-<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>
-
+<% 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="row">
     <div class="col-md-12">
         <div class="table-responsive">
diff --git a/app/views/admin/registrars/new.html.erb b/app/views/admin/registrars/new.html.erb
index e813bdd57..70154d217 100644
--- a/app/views/admin/registrars/new.html.erb
+++ b/app/views/admin/registrars/new.html.erb
@@ -1,9 +1,2 @@
-<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 'shared/title', name: t(:new_registrar) %>
 <%= render 'form' %>
diff --git a/app/views/admin/registrars/show.html.erb b/app/views/admin/registrars/show.html.erb
index 755143ff4..c09602985 100644
--- a/app/views/admin/registrars/show.html.erb
+++ b/app/views/admin/registrars/show.html.erb
@@ -1,31 +1,15 @@
 <% registrar = RegistrarPresenter.new(registrar: @registrar, view: self) %>
-
-<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>
-
+<% 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 %>
 <% if @registrar.errors.any? %>
     <% @registrar.errors.each do |attr, err| %>
         <%= err %>
diff --git a/config/locales/admin/registrars.en.yml b/config/locales/admin/registrars.en.yml
index 249a3b70a..3d269f64b 100644
--- a/config/locales/admin/registrars.en.yml
+++ b/config/locales/admin/registrars.en.yml
@@ -2,16 +2,9 @@ en:
   admin:
     registrars:
       index:
-        header: Registrars
         new_btn: New registrar
 
-      new:
-        header: New registrar
-
       show:
-        edit_btn: Edit
-        delete_btn: Delete
-        delete_btn_confirm: Are you sure you want delete registrar?
         new_api_use_btn: New API user
         active: Active
         api_users: API users
@@ -19,9 +12,6 @@ en:
         preferences:
           header: Preferences
 
-      edit:
-        header: Edit registrar
-
       create:
         created: Registrar has been successfully created
         not_created: Unable to create registrar