Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c4b99058
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c4b99058
编写于
2月 29, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Emails settings
Closes #13857
上级
1fa7671f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
56 addition
and
46 deletion
+56
-46
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+12
-0
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+44
-46
未找到文件。
app/assets/stylesheets/pages/profile.scss
浏览文件 @
c4b99058
...
...
@@ -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
{
margin-top
:
-12px
;
float
:
right
;
...
...
app/views/profiles/emails/index.html.haml
浏览文件 @
c4b99058
-
page_title
"Emails"
-
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
%li
Your
%b
Primary Email
will be used for avatar detection and web based operations, such as edits and merges.
Your Primary Email will be used for avatar detection and web based operations, such as edits and merges.
%li
Your
%b
Notification Email
will be used for account notifications.
Your Notification Email will be used for account notifications.
%li
Your
%b
Public Email
will be displayed on your public profile.
Your Public Email will be displayed on your public profile.
%li
All email addresses will be used to identify your commits.
.panel.panel-default
.panel-heading
Emails (
#{
@emails
.
count
+
1
}
)
%ul
.well-list
#emails-table
%ul
.well-list
%li
%strong
=
@primary
=
@primary
%span
.pull-right
%span
.label.label-success
Primary Email
-
if
@primary
===
current_user
.
public_email
%span
.label.label-info
Public Email
...
...
@@ -31,20 +39,10 @@
%span
.label.label-info
Notification Email
-
@emails
.
each
do
|
email
|
%li
%strong
=
email
.
email
=
email
.
email
%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
%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'
%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%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录