Merge branch 'dz-redesign-admin-system-info' into 'master'

Improve admin/system_info page ui

See merge request gitlab-org/gitlab!17829

app/views/admin/system_info/show.html.haml

-- page_title "System Info"
+- page_title _('System Info')
 
 .prepend-top-default
 .row
-  .col-sm-4
-    .card.bg-light.light-well
-      %h4 CPU
+  .col-sm
+    .bg-light.light-well
+      %h4= _('CPU')
       .data
         - if @cpus
-          %h1 #{@cpus.length} cores
+          %h2= _('%{cores} cores') % { cores: @cpus.length }
         - else
           = icon('warning', class: 'text-warning')
-          Unable to collect CPU info
-  .col-sm-4
-    .card.bg-light.light-well
-      %h4 Memory Usage
+          = _('Unable to collect CPU info')
+    .bg-light.light-well.prepend-top-default
+      %h4= _('Memory Usage')
       .data
         - if @memory
-          %h1 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}
+          %h2 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}
         - else
           = icon('warning', class: 'text-warning')
-          Unable to collect memory info
-  .col-sm-4
-    .card.bg-light.light-well
-      %h4 Disk Usage
+          = _('Unable to collect memory info')
+    .bg-light.light-well.prepend-top-default
+      %h4= _('Uptime')
       .data
+        %h2= distance_of_time_in_words_to_now(Rails.application.config.booted_at)
+  .col-sm
+    .bg-light.light-well
+      %h4= _('Disk Usage')
+      .data
+        %ul
           - @disks.each do |disk|
-          %h1 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}
+            %li
+              %h2 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}
               %p= disk[:disk_name]
               %p= disk[:mount_path]
-  .col-sm-4
-    .card.bg-light.light-well
-      %h4 Uptime
-      .data
-        %h1= distance_of_time_in_words_to_now(Rails.application.config.booted_at)

changelogs/unreleased/dz-redesign-admin-system-info.yml

+---
+title: Improve admin/system_info page ui
+merge_request: 17829
+author:
+type: changed

locale/gitlab.pot

@@ -179,6 +179,9 @@ msgstr ""
 msgid "%{commit_author_link} authored %{commit_timeago}"
 msgstr ""
 
+msgid "%{cores} cores"
+msgstr ""
+
 msgid "%{count} LOC/commit"
 msgstr ""
 
@@ -2695,6 +2698,9 @@ msgstr ""
 msgid "CONTRIBUTING"
 msgstr ""
 
+msgid "CPU"
+msgstr ""
+
 msgid "Callback URL"
 msgstr ""
 
@@ -5347,6 +5353,9 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
+msgid "Disk Usage"
+msgstr ""
+
 msgid "Dismiss"
 msgstr ""
 
@@ -9654,6 +9663,9 @@ msgstr ""
 msgid "Members with pending access to %{strong_start}%{group_name}%{strong_end}"
 msgstr ""
 
+msgid "Memory Usage"
+msgstr ""
+
 msgid "Merge"
 msgstr ""
 
@@ -16779,6 +16791,12 @@ msgstr ""
 msgid "Unable to build Slack link."
 msgstr ""
 
+msgid "Unable to collect CPU info"
+msgstr ""
+
+msgid "Unable to collect memory info"
+msgstr ""
+
 msgid "Unable to connect to Prometheus server"
 msgstr ""
 
@@ -17055,6 +17073,9 @@ msgstr ""
 msgid "Upstream"
 msgstr ""
 
+msgid "Uptime"
+msgstr ""
+
 msgid "Upvotes"
 msgstr ""