Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1e3ce077
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,发现更多精彩内容 >>
未验证
提交
1e3ce077
编写于
9月 09, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use page title for header title too
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
fa407597
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
47 addition
and
49 deletion
+47
-49
app/assets/stylesheets/generic/blocks.scss
app/assets/stylesheets/generic/blocks.scss
+4
-0
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+1
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+2
-1
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+3
-6
app/views/profiles/applications.html.haml
app/views/profiles/applications.html.haml
+4
-5
app/views/profiles/audit_log.html.haml
app/views/profiles/audit_log.html.haml
+6
-3
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+4
-6
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/index.html.haml
+7
-6
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+4
-4
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+5
-5
app/views/profiles/passwords/new.html.haml
app/views/profiles/passwords/new.html.haml
+1
-1
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+4
-4
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+2
-7
未找到文件。
app/assets/stylesheets/generic/blocks.scss
浏览文件 @
1e3ce077
...
@@ -27,6 +27,10 @@
...
@@ -27,6 +27,10 @@
border-bottom
:
1px
solid
#e7e9ed
;
border-bottom
:
1px
solid
#e7e9ed
;
color
:
$gl-gray
;
color
:
$gl-gray
;
&
.top-block
{
border-top
:
none
;
}
&
.middle-block
{
&
.middle-block
{
margin-top
:
0
;
margin-top
:
0
;
margin-bottom
:
0
;
margin-bottom
:
0
;
...
...
app/views/layouts/nav/_profile.html.haml
浏览文件 @
1e3ce077
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
=
link_to
profile_path
,
title:
'Profile'
,
data:
{
placement:
'right'
}
do
=
link_to
profile_path
,
title:
'Profile'
,
data:
{
placement:
'right'
}
do
=
icon
(
'user fw'
)
=
icon
(
'user fw'
)
%span
%span
Profile
Profile
Settings
=
nav_link
(
controller:
[
:accounts
,
:two_factor_auths
])
do
=
nav_link
(
controller:
[
:accounts
,
:two_factor_auths
])
do
=
link_to
profile_account_path
,
title:
'Account'
,
data:
{
placement:
'right'
}
do
=
link_to
profile_account_path
,
title:
'Account'
,
data:
{
placement:
'right'
}
do
=
icon
(
'gear fw'
)
=
icon
(
'gear fw'
)
...
...
app/views/layouts/profile.html.haml
浏览文件 @
1e3ce077
-
page_title
"Profile Settings"
-
page_title
"Profile Settings"
-
header_title
"Profile Settings"
,
profile_path
-
unless
@header_title
-
header_title
"Profile Settings"
,
profile_path
-
sidebar
"profile"
-
sidebar
"profile"
=
render
template:
"layouts/application"
=
render
template:
"layouts/application"
app/views/profiles/accounts/show.html.haml
浏览文件 @
1e3ce077
-
page_title
"Account"
-
page_title
"Account"
%h3
.page-title
-
header_title
page_title
,
profile_account_path
=
page_title
%p
.light
Change your username and basic account settings.
%hr
-
if
current_user
.
ldap_user?
-
if
current_user
.
ldap_user?
.alert.alert-info
.alert.alert-info
Some options are unavailable for LDAP accounts
Some options are unavailable for LDAP accounts
...
@@ -69,7 +66,7 @@
...
@@ -69,7 +66,7 @@
-
button_based_providers
.
each
do
|
provider
|
-
button_based_providers
.
each
do
|
provider
|
.btn-group
.btn-group
=
link_to
provider_image_tag
(
provider
),
user_omniauth_authorize_path
(
provider
),
method: :post
,
class:
"btn btn-lg
#{
'active'
if
auth_active?
(
provider
)
}
"
,
"data-no-turbolink"
=>
"true"
=
link_to
provider_image_tag
(
provider
),
user_omniauth_authorize_path
(
provider
),
method: :post
,
class:
"btn btn-lg
#{
'active'
if
auth_active?
(
provider
)
}
"
,
"data-no-turbolink"
=>
"true"
-
if
auth_active?
(
provider
)
-
if
auth_active?
(
provider
)
=
link_to
unlink_profile_account_path
(
provider:
provider
),
method: :delete
,
class:
'btn btn-lg'
do
=
link_to
unlink_profile_account_path
(
provider:
provider
),
method: :delete
,
class:
'btn btn-lg'
do
=
icon
(
'close'
)
=
icon
(
'close'
)
...
...
app/views/profiles/applications.html.haml
浏览文件 @
1e3ce077
-
page_title
"Applications"
-
page_title
"Applications"
%h3
.page-title
-
header_title
page_title
,
applications_profile_path
=
page_title
%p
.light
.gray-content-block.top-block
-
if
user_oauth_applications?
-
if
user_oauth_applications?
Manage applications that can use GitLab as an OAuth provider,
Manage applications that can use GitLab as an OAuth provider,
and applications that you've authorized to use your account.
and applications that you've authorized to use your account.
-
else
-
else
Manage applications that you've authorized to use your account.
Manage applications that you've authorized to use your account.
%hr
-
if
user_oauth_applications?
-
if
user_oauth_applications?
.oauth-applications
.oauth-applications
...
...
app/views/profiles/audit_log.html.haml
浏览文件 @
1e3ce077
-
page_title
"Audit Log"
-
page_title
"Audit Log"
%h3
.page-title
Audit Log
-
header_title
page_title
,
audit_log_profile_path
%p
.light
History of authentications
=
render
'event_table'
,
events:
@events
.gray-content-block.top-block
\ No newline at end of file
History of authentications
.prepend-top-default
=
render
'event_table'
,
events:
@events
app/views/profiles/emails/index.html.haml
浏览文件 @
1e3ce077
-
page_title
"Emails"
-
page_title
"Emails"
%h3
.page-title
-
header_title
page_title
,
profile_emails_path
=
page_title
%p
.light
Control emails linked to your account
%hr
.gray-content-block.top-block
Control emails linked to your account
%ul
%ul
.prepend-top-default
%li
%li
Your
Your
%b
Primary Email
%b
Primary Email
...
...
app/views/profiles/keys/index.html.haml
浏览文件 @
1e3ce077
-
page_title
"SSH Keys"
-
page_title
"SSH Keys"
%h3
.page-title
-
header_title
page_title
,
profile_keys_path
=
page_title
.gray-content-block.top-block
.pull-right
.pull-right
=
link_to
"Add SSH Key"
,
new_profile_key_path
,
class:
"btn btn-new"
=
link_to
"Add SSH Key"
,
new_profile_key_path
,
class:
"btn btn-new"
%p
.light
.oneline
Before you can add an SSH key you need to
Before you can add an SSH key you need to
=
link_to
"generate it."
,
help_page_path
(
"ssh"
,
"README"
)
=
link_to
"generate it."
,
help_page_path
(
"ssh"
,
"README"
)
%hr
.prepend-top-default
=
render
'key_table'
=
render
'key_table'
app/views/profiles/notifications/show.html.haml
浏览文件 @
1e3ce077
-
page_title
"Notifications"
-
page_title
"Notifications"
%h3
.page-title
-
header_title
page_title
,
profile_notifications_path
=
page_title
%p
.light
.gray-content-block.top-block
These are your global notification settings.
These are your global notification settings.
%hr
.prepend-top-default
=
form_for
@user
,
url:
profile_notifications_path
,
method: :put
,
html:
{
class:
'update-notifications form-horizontal global-notifications-form'
}
do
|
f
|
=
form_for
@user
,
url:
profile_notifications_path
,
method: :put
,
html:
{
class:
'update-notifications form-horizontal global-notifications-form'
}
do
|
f
|
-
if
@user
.
errors
.
any?
-
if
@user
.
errors
.
any?
%div
.alert.alert-danger
%div
.alert.alert-danger
...
...
app/views/profiles/passwords/edit.html.haml
浏览文件 @
1e3ce077
-
page_title
"Password"
-
page_title
"Password"
%h3
.page-title
-
header_title
page_title
,
edit_profile_password_path
=
page_title
%p
.light
.gray-content-block.top-block
-
if
@user
.
password_automatically_set?
-
if
@user
.
password_automatically_set?
Set your password.
Set your password.
-
else
-
else
Change your password or recover your current one.
Change your password or recover your current one.
%hr
.update-password
.update-password
.prepend-top-default
=
form_for
@user
,
url:
profile_password_path
,
method: :put
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
=
form_for
@user
,
url:
profile_password_path
,
method: :put
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
%div
%div
%p
.slead
%p
.slead
...
...
app/views/profiles/passwords/new.html.haml
浏览文件 @
1e3ce077
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%ul
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
-
unless
@user
.
password_automatically_set?
-
unless
@user
.
password_automatically_set?
.form-group
.form-group
=
f
.
label
:current_password
,
class:
'control-label'
=
f
.
label
:current_password
,
class:
'control-label'
...
...
app/views/profiles/preferences/show.html.haml
浏览文件 @
1e3ce077
-
page_title
'Preferences'
-
page_title
'Preferences'
%h3
.page-title
-
header_title
page_title
,
profile_preferences_path
=
page_title
%p
.light
.gray-content-block.top-block
These settings allow you to customize the appearance and behavior of the site.
These settings allow you to customize the appearance and behavior of the site.
They are saved with your account and will persist to any device you use to
They are saved with your account and will persist to any device you use to
access the site.
access the site.
%hr
.prepend-top-default
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'js-preferences-form form-horizontal'
}
do
|
f
|
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'js-preferences-form form-horizontal'
}
do
|
f
|
.panel.panel-default.application-theme
.panel.panel-default.application-theme
...
...
app/views/profiles/show.html.haml
浏览文件 @
1e3ce077
-
page_title
"Profile"
.gray-content-block.top-block
%h3
.page-title
=
page_title
%p
.light
This information will appear on your profile.
This information will appear on your profile.
-
if
current_user
.
ldap_user?
-
if
current_user
.
ldap_user?
Some options are unavailable for LDAP accounts
Some options are unavailable for LDAP accounts
%hr
.prepend-top-default
=
form_for
@user
,
url:
profile_path
,
method: :put
,
html:
{
multipart:
true
,
class:
"edit_user form-horizontal"
},
authenticity_token:
true
do
|
f
|
=
form_for
@user
,
url:
profile_path
,
method: :put
,
html:
{
multipart:
true
,
class:
"edit_user form-horizontal"
},
authenticity_token:
true
do
|
f
|
-
if
@user
.
errors
.
any?
-
if
@user
.
errors
.
any?
%div
.alert.alert-danger
%div
.alert.alert-danger
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录