Commit ac209c45 authored by David O'Regan's avatar David O'Regan

Merge branch 'Update-markup-in-accounts/show-haml-file' into 'master'

Update markup in accounts/show.html.haml

See merge request gitlab-org/gitlab!63168
parents 205ea072 ed501ce8
...@@ -2,16 +2,20 @@ ...@@ -2,16 +2,20 @@
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
- if current_user.ldap_user? - if current_user.ldap_user?
.gl-alert.gl-alert-info.gl-my-5 = render 'shared/global_alert',
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') variant: :info,
alert_class: 'gl-my-5',
is_contained: true,
dismissible: false do
.gl-alert-body .gl-alert-body
= s_('Profiles|Some options are unavailable for LDAP accounts') = s_('Profiles|Some options are unavailable for LDAP accounts')
- if params[:two_factor_auth_enabled_successfully] - if params[:two_factor_auth_enabled_successfully]
.gl-alert.gl-alert-success.gl-my-5{ role: 'alert' } = render 'shared/global_alert',
= sprite_icon('check-circle', size: 16, css_class: 'gl-alert-icon gl-alert-icon-no-title') variant: :success,
%button.gl-alert-dismiss.js-close-2fa-enabled-success-alert{ type: 'button', aria: { label: _('Close') } } alert_class: 'gl-my-5',
= sprite_icon('close', size: 16) is_contained: true,
close_button_class: 'js-close-2fa-enabled-success-alert' do
.gl-alert-body .gl-alert-body
= html_escape(_('You have set up 2FA for your account! If you lose access to your 2FA device, you can use your recovery codes to access your account. Alternatively, if you upload an SSH key, you can %{anchorOpen}use that key to generate additional recovery codes%{anchorClose}.')) % { anchorOpen: '<a href="%{href}">'.html_safe % { href: help_page_path('user/profile/account/two_factor_authentication', anchor: 'generate-new-recovery-codes-using-ssh') }, anchorClose: '</a>'.html_safe } = html_escape(_('You have set up 2FA for your account! If you lose access to your 2FA device, you can use your recovery codes to access your account. Alternatively, if you upload an SSH key, you can %{anchorOpen}use that key to generate additional recovery codes%{anchorClose}.')) % { anchorOpen: '<a href="%{href}">'.html_safe % { href: help_page_path('user/profile/account/two_factor_authentication', anchor: 'generate-new-recovery-codes-using-ssh') }, anchorClose: '</a>'.html_safe }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment