diff options
Diffstat (limited to 'app/views/profiles/keys/_key.html.haml')
| -rw-r--r-- | app/views/profiles/keys/_key.html.haml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml index cc2e2a30052..4eb321050ad 100644 --- a/app/views/profiles/keys/_key.html.haml +++ b/app/views/profiles/keys/_key.html.haml @@ -1,3 +1,5 @@ +- icon_classes = 'settings-list-icon gl-display-none gl-sm-display-block' + %li.key-list-item .gl-display-flex.gl-align-items-flex-start .key-list-item-info.gl-w-full.float-none @@ -5,15 +7,11 @@ = key.title .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') + - if key.valid? && !key.expired? + = sprite_icon('key', css_class: icon_classes) - 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') + %span.gl-display-inline-block.has-tooltip{ title: ssh_key_expiration_tooltip(key) } + = sprite_icon('warning-solid', css_class: icon_classes) %span.gl-text-truncate.gl-sm-ml-3 = key.fingerprint @@ -25,7 +23,7 @@ = 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.expired? ? s_('Profiles|Expired:') : 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? |