Commit c4b99058 authored by Phil Hughes's avatar Phil Hughes

Emails settings

Closes #13857
parent 1fa7671f
...@@ -55,6 +55,18 @@ ...@@ -55,6 +55,18 @@
} }
} }
.account-well {
padding: 10px 10px;
background-color: #FAFAFA;
border: 1px solid #E5E5E5;
border-radius: 3px;
ul {
padding-left: 20px;
margin-bottom: 0;
}
}
.calendar-hint { .calendar-hint {
margin-top: -12px; margin-top: -12px;
float: right; float: right;
......
- page_title "Emails" - page_title "Emails"
- header_title page_title, profile_emails_path - header_title page_title, profile_emails_path
.alert.alert-help.prepend-top-default .row.prepend-top-default
.col-lg-3.profile-settings-sidebar
%h4.prepend-top-0
= page_title
%p
Control emails linked to your account
.col-lg-9
%h4 Add email address
= form_for 'email', url: profile_emails_path do |f|
.form-group
= f.label :email, class: 'label-light'
= f.text_field :email, class: 'form-control'
.prepend-top-default
= f.submit 'Add email address', class: 'btn btn-create'
%hr
%h4
Linked emails (#{@emails.count + 1})
.account-well.append-bottom-default
%ul %ul
%li %li
Your Your Primary Email will be used for avatar detection and web based operations, such as edits and merges.
%b Primary Email
will be used for avatar detection and web based operations, such as edits and merges.
%li %li
Your Your Notification Email will be used for account notifications.
%b Notification Email
will be used for account notifications.
%li %li
Your Your Public Email will be displayed on your public profile.
%b Public Email
will be displayed on your public profile.
%li %li
All email addresses will be used to identify your commits. All email addresses will be used to identify your commits.
%ul.well-list
.panel.panel-default
.panel-heading
Emails (#{@emails.count + 1})
%ul.well-list#emails-table
%li %li
%strong= @primary = @primary
%span.pull-right
%span.label.label-success Primary Email %span.label.label-success Primary Email
- if @primary === current_user.public_email - if @primary === current_user.public_email
%span.label.label-info Public Email %span.label.label-info Public Email
...@@ -31,20 +39,10 @@ ...@@ -31,20 +39,10 @@
%span.label.label-info Notification Email %span.label.label-info Notification Email
- @emails.each do |email| - @emails.each do |email|
%li %li
%strong= email.email = email.email
%span.pull-right
- if email.email === current_user.public_email - if email.email === current_user.public_email
%span.label.label-info Public Email %span.label.label-info Public Email
- if email.email === current_user.notification_email - if email.email === current_user.notification_email
%span.label.label-info Notification Email %span.label.label-info Notification Email
%span.cgray
added #{time_ago_with_tooltip(email.created_at)}
= link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-remove pull-right' = link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-remove pull-right'
%h4 Add email address
= form_for 'email', url: profile_emails_path, html: { class: 'form-horizontal' } do |f|
.form-group
= f.label :email, class: 'control-label'
.col-sm-10
= f.text_field :email, class: 'form-control'
.form-actions
= f.submit 'Add email address', class: 'btn btn-create'
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