Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
35439859
Commit
35439859
authored
Jan 18, 2021
by
Yogi
Committed by
Martin Wortschack
Jan 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Icons to headings in system info on admin panel
parent
1622ac99
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
8 deletions
+25
-8
app/views/admin/system_info/show.html.haml
app/views/admin/system_info/show.html.haml
+20
-8
changelogs/unreleased/add-icons.yml
changelogs/unreleased/add-icons.yml
+5
-0
No files found.
app/views/admin/system_info/show.html.haml
View file @
35439859
...
...
@@ -3,29 +3,41 @@
.gl-mt-3
.row
.col-sm
.bg-light.light-well
%h4
=
_
(
'CPU'
)
.bg-light.info-well.p-3
%h4
.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
=
sprite_icon
(
'pod'
,
size:
18
,
css_class:
'pod-icon gl-mr-3'
)
=
_
(
'CPU'
)
.data
-
if
@cpus
%h2
=
_
(
'%{cores} cores'
)
%
{
cores:
@cpus
.
length
}
-
else
=
sprite_icon
(
'warning-solid'
,
css_class:
'text-warning'
)
=
_
(
'Unable to collect CPU info'
)
.bg-light.light-well.gl-mt-3
%h4
=
_
(
'Memory Usage'
)
.bg-light.info-well.p-3.gl-mt-3
%h4
.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
=
sprite_icon
(
'status-health'
,
size:
18
,
css_class:
'pod-icon gl-mr-3'
)
=
_
(
'Memory Usage'
)
.data
-
if
@memory
%h2
#{
number_to_human_size
(
@memory
.
active_bytes
)
}
/
#{
number_to_human_size
(
@memory
.
total_bytes
)
}
-
else
=
sprite_icon
(
'warning-solid'
,
css_class:
'text-warning'
)
=
_
(
'Unable to collect memory info'
)
.bg-light.light-well.gl-mt-3
%h4
=
_
(
'Uptime'
)
.bg-light.info-well.p-3.gl-mt-3
%h4
.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
=
sprite_icon
(
'clock'
,
size:
18
,
css_class:
'pod-icon gl-mr-3'
)
=
_
(
'Uptime'
)
.data
%h2
=
distance_of_time_in_words_to_now
(
Rails
.
application
.
config
.
booted_at
)
.col-sm
.bg-light.light-well
%h4
=
_
(
'Disk Usage'
)
.bg-light.info-well.p-3
%h4
.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
=
sprite_icon
(
'disk'
,
size:
18
,
css_class:
'pod-icon gl-mr-3'
)
=
_
(
'Disk Usage'
)
.data
%ul
-
@disks
.
each
do
|
disk
|
...
...
changelogs/unreleased/add-icons.yml
0 → 100644
View file @
35439859
---
title
:
Add Icons to headings in system info on admin panel
merge_request
:
46618
author
:
Yogi (@yo)
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment