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
7720a73a
Commit
7720a73a
authored
Feb 15, 2021
by
Yogi
Committed by
Jacques Erasmus
Feb 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redesign SSH keys list
parent
2d42057d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
28 deletions
+36
-28
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/_key.html.haml
+31
-28
changelogs/unreleased/btn-icon-gpg.yml
changelogs/unreleased/btn-icon-gpg.yml
+5
-0
No files found.
app/views/profiles/keys/_key.html.haml
View file @
7720a73a
%li
.d-flex.align-items-center.key-list-item
.gl-mr-3
-
if
key
.
valid?
-
if
key
.
expired?
%span
.d-inline-block.has-tooltip
{
title:
s_
(
'Profiles|Your key has expired'
)
}
=
sprite_icon
(
'warning-solid'
,
css_class:
'settings-list-icon d-none d-sm-block'
)
-
else
=
sprite_icon
(
'key'
,
css_class:
'settings-list-icon d-none d-sm-block '
)
-
else
%span
.d-inline-block.has-tooltip
{
title:
key
.
errors
.
full_messages
.
join
(
', '
)
}
=
sprite_icon
(
'warning-solid'
,
css_class:
'settings-list-icon d-none d-sm-block'
)
%li
.key-list-item
.gl-display-flex.gl-align-items-flex-start
.key-list-item-info.gl-w-full.float-none
=
link_to
path_to_key
(
key
,
is_admin
),
class:
"title text-3"
do
=
key
.
title
.key-list-item-info.w-100.float-none
=
link_to
path_to_key
(
key
,
is_admin
),
class:
"title"
do
=
key
.
title
%span
.text-truncate
=
key
.
fingerprint
.gl-display-flex.gl-align-items-center.gl-mt-2
-
if
key
.
valid?
-
if
key
.
expired?
%span
.gl-display-inline-block.has-tooltip
{
title:
s_
(
'Profiles|Your key has expired'
)
}
=
sprite_icon
(
'warning-solid'
,
css_class:
'settings-list-icon gl-display-none gl-sm-display-block'
)
-
else
=
sprite_icon
(
'key'
,
css_class:
'settings-list-icon gl-display-none gl-sm-display-block'
)
-
else
%span
.gl-display-inline-block.has-tooltip
{
title:
key
.
errors
.
full_messages
.
join
(
', '
)
}
=
sprite_icon
(
'warning-solid'
,
css_class:
'settings-list-icon gl-display-none gl-sm-display-block'
)
.key-list-item-dates.d-flex.align-items-start.justify-content-between
%span
.last-used-at.gl-mr-3
=
s_
(
'Profiles|Last used:'
)
=
key
.
last_used_at
?
time_ago_with_tooltip
(
key
.
last_used_at
)
:
_
(
'Never'
)
%span
.expires.gl-mr-3
=
s_
(
'Profiles|Expires:'
)
=
key
.
expires_at
?
key
.
expires_at
.
to_date
:
_
(
'Never'
)
%span
.key-created-at.gl-display-flex.gl-align-items-center
=
s_
(
'Profiles|Created%{time_ago}'
.
html_safe
)
%
{
time_ago:
time_ago_with_tooltip
(
key
.
created_at
,
html_class:
'gl-ml-2'
)}
-
if
key
.
can_delete?
.gl-ml-3
=
render
'shared/ssh_keys/key_delete'
,
html_class:
"btn btn-default gl-button btn-default-tertiary js-confirm-modal-button"
,
button_data:
ssh_key_delete_modal_data
(
key
,
path_to_key
(
key
,
is_admin
))
%span
.gl-text-truncate.gl-sm-ml-3
=
key
.
fingerprint
.gl-mt-3
=
s_
(
'Profiles|Created%{time_ago}'
.
html_safe
)
%
{
time_ago:
time_ago_with_tooltip
(
key
.
created_at
,
html_class:
'gl-ml-2'
)}
.key-list-item-dates
%span
.last-used-at.gl-mr-3
=
s_
(
'Profiles|Last used:'
)
=
key
.
last_used_at
?
time_ago_with_tooltip
(
key
.
last_used_at
)
:
_
(
'Never'
)
%span
.expires.gl-mr-3
=
s_
(
'Profiles|Expires:'
)
=
key
.
expires_at
?
key
.
expires_at
.
to_date
:
_
(
'Never'
)
%span
.key-created-at.gl-display-flex.gl-align-items-center
-
if
key
.
can_delete?
.gl-ml-3
=
render
'shared/ssh_keys/key_delete'
,
html_class:
"btn gl-button btn-icon btn-danger js-confirm-modal-button"
,
button_data:
ssh_key_delete_modal_data
(
key
,
path_to_key
(
key
,
is_admin
))
changelogs/unreleased/btn-icon-gpg.yml
0 → 100644
View file @
7720a73a
---
title
:
Redesign SSH keys list
merge_request
:
53351
author
:
Yogi (@yo)
type
:
changed
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