From a28a4ebb349ce5169decec6c46e611b92d0138d8 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Mon, 9 Dec 2019 21:56:44 +0200
Subject: [PATCH] Use standard header for registrar API users in admin area

---
 app/views/admin/api_users/edit.html.erb  | 17 ++++++++++---
 app/views/admin/api_users/index.html.erb |  4 ++-
 app/views/admin/api_users/new.html.erb   | 11 ++++++++-
 app/views/admin/api_users/show.html.erb  | 31 ++++++++++++++++++++----
 config/locales/admin/api_users.en.yml    |  9 +++++--
 config/locales/en.yml                    |  1 -
 6 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/app/views/admin/api_users/edit.html.erb b/app/views/admin/api_users/edit.html.erb
index 5fee5b941..d065c885c 100644
--- a/app/views/admin/api_users/edit.html.erb
+++ b/app/views/admin/api_users/edit.html.erb
@@ -1,5 +1,14 @@
-<% content_for :actions do %>
-    <%= link_to(t(:back_to_api_user), admin_registrar_api_user_path(@api_user.registrar, @api_user), class: 'btn btn-default') %>
-<% end %>
-<%= render 'shared/title', name: "#{t(:edit)}: #{@api_user.username}" %>
+<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' %>
diff --git a/app/views/admin/api_users/index.html.erb b/app/views/admin/api_users/index.html.erb
index dacd6398a..20c76e54f 100644
--- a/app/views/admin/api_users/index.html.erb
+++ b/app/views/admin/api_users/index.html.erb
@@ -1,4 +1,6 @@
-<%= render 'shared/title', name: t('.title') %>
+<div class="page-header">
+    <h1><%= t '.header' %></h1>
+</div>
 <div class="row">
     <div class="col-md-12">
         <div class="table-responsive">
diff --git a/app/views/admin/api_users/new.html.erb b/app/views/admin/api_users/new.html.erb
index f9a096937..b3f4580e1 100644
--- a/app/views/admin/api_users/new.html.erb
+++ b/app/views/admin/api_users/new.html.erb
@@ -1,2 +1,11 @@
-<%= render 'shared/title', name: t('.title') %>
+<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' %>
diff --git a/app/views/admin/api_users/show.html.erb b/app/views/admin/api_users/show.html.erb
index ace211f52..7090d777b 100644
--- a/app/views/admin/api_users/show.html.erb
+++ b/app/views/admin/api_users/show.html.erb
@@ -1,8 +1,29 @@
-<% content_for :actions do %>
-    <%= link_to(t(:edit), edit_admin_registrar_api_user_path(@api_user.registrar, @api_user), class: 'btn btn-default') %>
-    <%= link_to(t(:delete), admin_registrar_api_user_path(@api_user.registrar, @api_user), method: :delete, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger') %>
-<% end %>
-<%= render 'shared/title', name: @api_user.username %>
+<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-default' %>
+            <%= link_to t('.delete_btn'), admin_registrar_api_user_path(@api_user.registrar,
+                                                                        @api_user),
+                        method: :delete,
+                        data: { confirm: t(:are_you_sure) },
+                        class: 'btn btn-danger' %>
+        </div>
+    </div>
+</div>
+
 <% if @api_user.errors.any? %>
     <% @api_user.errors.each do |attr, err| %>
         <%= err %>
diff --git a/config/locales/admin/api_users.en.yml b/config/locales/admin/api_users.en.yml
index de4fddb08..245b0e4d7 100644
--- a/config/locales/admin/api_users.en.yml
+++ b/config/locales/admin/api_users.en.yml
@@ -2,15 +2,20 @@ en:
   admin:
     api_users:
       index:
-        title: API users
+        header: API users
         active: Active
 
       show:
         active: Active
         subject: Subject
+        edit_btn: Edit
+        delete_btn: Delete
 
       new:
-        title: New API user
+        header: New API user
+
+      edit:
+        header: Edit API user
 
       form:
         active: Active
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5742398f7..a12385169 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -277,7 +277,6 @@ en:
   certificate_signing_req: 'Certificate signing request'
   csr: 'CSR'
   crt: 'CRT'
-  back_to_api_user: 'Back to API user'
 
   dnskey: 'DNS key'
   dnskeys: 'DNS Keys'