diff options
author | Brett Walker <brett@digitalmoksha.com> | 2017-09-09 15:55:07 +0200 |
---|---|---|
committer | Brett Walker <brett@digitalmoksha.com> | 2017-09-23 15:23:11 +0200 |
commit | cf8a5bcaec99cc197ff556793febb8317e1db220 (patch) | |
tree | 0c709b59f04d02eb572f01aca2caf059336bffeb /app/views/profiles | |
parent | c56208f98028d10f8f2ab315ae52e9fcacc45399 (diff) | |
download | gitlab-ce-cf8a5bcaec99cc197ff556793febb8317e1db220.tar.gz |
add verified/unverified labels to profile emails.
added "Resend confirmation email" for unverified emails
Diffstat (limited to 'app/views/profiles')
-rw-r--r-- | app/views/profiles/emails/index.html.haml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml index f6f5a363194..1b02603543d 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -32,7 +32,7 @@ All email addresses will be used to identify your commits. %ul.well-list %li - = @primary + = render partial: 'shared/email_with_badge', locals: { email: @primary, verified: current_user.confirmed? } %span.pull-right %span.label.label-success Primary email - if @primary === current_user.public_email @@ -41,12 +41,17 @@ %span.label.label-info Notification email - @emails.each do |email| %li - = email.email + = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? } %span.pull-right - if email.email === current_user.public_email %span.label.label-info Public email - if email.email === current_user.notification_email %span.label.label-info Notification email - unless email.confirmed? - %span.label.label-warning Unconfirmed - = link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-warning prepend-left-10' + - confirm_title = "#{email.confirmation_sent_at ? 'Resend' : 'Send'} confirmation email" + = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'btn btn-sm btn-warning prepend-left-10' + + = link_to profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-danger prepend-left-10' do + %span.sr-only Remove + = icon('trash') + |