diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 00:06:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 00:06:41 +0300 |
commit | 08f4ce10c04d705148a7e14556443b9e3aee6821 (patch) | |
tree | ba58b29874803db12ebec690fb4416b6208ee750 /app/views/admin/system_info/show.html.haml | |
parent | b4cdff15ca53312ccbbafe4effac85b1ee4420ae (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/system_info/show.html.haml')
-rw-r--r-- | app/views/admin/system_info/show.html.haml | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml index 948a11646f7..b7648979edd 100644 --- a/app/views/admin/system_info/show.html.haml +++ b/app/views/admin/system_info/show.html.haml @@ -1,35 +1,35 @@ -- 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 - - @disks.each do |disk| - %h1 #{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 + %h2= distance_of_time_in_words_to_now(Rails.application.config.booted_at) + .col-sm + .bg-light.light-well + %h4= _('Disk Usage') .data - %h1= distance_of_time_in_words_to_now(Rails.application.config.booted_at) + %ul + - @disks.each do |disk| + %li + %h2 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])} + %p= disk[:disk_name] + %p= disk[:mount_path] |