Show key fingerprint on DeployKeys#indexrs-issue-1741

Also style all key fingerprints consistently across the app.

5 files changed, 16 insertions, 15 deletions

diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index e5590897947..66767cb13cb 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -23,6 +23,13 @@ pre {
   font-family: $monospace_font;
 }
 
+code {
+  &.key-fingerprint {
+    background: $body-bg;
+    color: $text-color;
+  }
+}
+
 /**
  * Wiki typography
  *
diff --git a/app/views/admin/deploy_keys/index.html.haml b/app/views/admin/deploy_keys/index.html.haml
index 367d25cd6a1..6405a69fad3 100644
--- a/app/views/admin/deploy_keys/index.html.haml
+++ b/app/views/admin/deploy_keys/index.html.haml
@@ -19,8 +19,7 @@
               = link_to admin_deploy_key_path(deploy_key) do
                 %strong= deploy_key.title
             %td
-              %span
-                (#{deploy_key.fingerprint})
+              %code.key-fingerprint= deploy_key.fingerprint
             %td
               %span.cgray
                 added #{time_ago_with_tooltip(deploy_key.created_at)}
diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml
index fe5770f45c3..9bbccbc45ea 100644
--- a/app/views/profiles/keys/_key.html.haml
+++ b/app/views/profiles/keys/_key.html.haml
@@ -3,8 +3,7 @@
     = link_to path_to_key(key, is_admin) do
       %strong= key.title
   %td
-    %span
-      (#{key.fingerprint})
+    %code.key-fingerprint= key.fingerprint
   %td
     %span.cgray
       added #{time_ago_with_tooltip(key.created_at)}
diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml
index 8bac22a2e1a..e0ae4d9720f 100644
--- a/app/views/profiles/keys/_key_details.html.haml
+++ b/app/views/profiles/keys/_key_details.html.haml
@@ -15,7 +15,7 @@
   .col-md-8
     %p
       %span.light Fingerprint:
-      %strong= @key.fingerprint
+      %code.key-fingerprint= @key.fingerprint
     %pre.well-pre
       = @key.key
   .pull-right
diff --git a/app/views/projects/deploy_keys/_deploy_key.html.haml b/app/views/projects/deploy_keys/_deploy_key.html.haml
index c577dfa8d55..8d66bae8cdf 100644
--- a/app/views/projects/deploy_keys/_deploy_key.html.haml
+++ b/app/views/projects/deploy_keys/_deploy_key.html.haml
@@ -2,24 +2,20 @@
   .pull-right
     - if @available_keys.include?(deploy_key)
       = link_to enable_namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), class: 'btn btn-sm', method: :put do
-        %i.fa.fa-plus
+        = icon('plus')
         Enable
     - else
       - if deploy_key.destroyed_when_orphaned? && deploy_key.almost_orphaned?
         = link_to 'Remove', disable_namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), data: { confirm: 'You are going to remove deploy key. Are you sure?'}, method: :put, class: "btn btn-remove delete-key btn-sm pull-right"
       - else
         = link_to disable_namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), class: 'btn btn-sm', method: :put do
-          %i.fa.fa-power-off
+          = icon('power-off')
           Disable
 
-  - if project = project_for_deploy_key(deploy_key)
-    = link_to namespace_project_deploy_key_path(project.namespace, project, deploy_key) do
-      %i.fa.fa-key
-      %strong= deploy_key.title
-  - else
-    %i.fa.fa-key
-    %strong= deploy_key.title
-
+  = icon('key')
+  %strong= deploy_key.title
+  %br
+  %code.key-fingerprint= deploy_key.fingerprint
 
   %p.light.prepend-top-10
     - if deploy_key.public?